525 files changed, 4374 insertions, 5009 deletions
diff --git a/langpacks/belarusian/=CORE=.txt b/langpacks/belarusian/=CORE=.txt
index ade1ace435..6485f0ed74 100644
--- a/langpacks/belarusian/=CORE=.txt
+++ b/langpacks/belarusian/=CORE=.txt
@@ -570,6 +570,55 @@
 Уставіць і адправіць
 [Delete]
 Выдаліць
+;file \src\core\stdpopup\res\resource.rc
+[Popup history]
+Гісторыя ўсплывальных вокнаў
+[Case sensitive]
+Улік рэгістра
+[Default timeout]
+Працягласць па змаўчанні
+[Never timeout]
+Пастаянна
+[Set timeout:]
+Працягласць:
+[Width:]
+Шырыня:
+[Maximum height:]
+Макс. вышыня:
+[Opacity (%):]
+Непразрыстасць (%):
+[Border]
+Рамка
+[Round corners (window)]
+Акругляць куты вакна
+[Preview]
+Прагляд
+[Transparent background]
+Празрысты фон
+[Layout]
+Размяшчэнне
+[Avatar size:]
+Аватар:
+[Disable when]
+Выключыць калі
+[Global hover]
+Агульнае навядзенне
+[Sidebar width:]
+Шырыня ўрэзкі:
+[Text indent:]
+Водступ тэксту:
+[Padding:]
+Прамежак:
+[Round corners (avatar)]
+Акругляць куты аватара
+[Text color:]
+Колер тэксту:
+[Background color:]
+Колер фону:
+[Set timeout]
+Усталяваць затрымку
+[Timeout value (0 = default):]
+Затрымка (0 = па змаўчанні):
 ;file \src\core\stduihist\res\resource.rc
 [Find]
 Знайсці
@@ -1749,6 +1798,88 @@ Miranda не здолела загрузіць убудаваную сістэм
 ;file \src\core\stdmsg\src\msgtimedout.cpp
 [An unknown error has occurred.]
 Невядомая памылка.
+;file \src\core\stdpopup\src\icons.cpp
+[Popups are enabled]
+Вокны ўключаны
+[Popups are disabled]
+Вокны выключаны
+;file \src\core\stdpopup\src\notify_imp.cpp
+;file \src\core\stdpopup\src\options.cpp
+[Example]
+Прыклад
+[The quick brown fox jumped over the lazy dog.]
+
+[Example With a Long Title]
+Прыклад з доўгім загалоўкам
+[Thequickbrownfoxjumpedoverthelazydog.]
+
+[An avatar.]
+З аватарам.
+[Bottom right]
+Унізе справа
+[Bottom left]
+Унізе злева
+[Top right]
+Наверсе справа
+[Top left]
+Наверсе злева
+[Icon on left]
+Абразок злева
+[Icon on right]
+Абразок справа
+[No time]
+Без часу
+[Time on left]
+Час злева
+[Time on right]
+Час справа
+[Time above avatar]
+Час над аватарам
+[No avatar]
+Без аватара
+[Left avatar]
+Аватар злева
+[Right avatar]
+Аватар справа
+[Full-screen app running]
+Поўнаэкраннае прыкладанне
+[No animate]
+Няма анімацыі
+[Horizontal animate]
+Гарызантальна
+[Vertical animate]
+Вертыкальна
+[You cannot set a default timeout of 0.\nValue has been reset.]
+Вы не можаце ўсталяваць затрымку па змаўчанні 0.\nВернута значэнне па змаўчанні.
+[Settings]
+Налады
+[Classes]
+Класы
+;file \src\core\stdpopup\src\services.cpp
+[Disable popups]
+Адключыць усплывальныя вокны
+[Enable popups]
+Уключыць усплывальныя вокны
+;file \src\core\stdpopup\src\yapp.cpp
+[Toggle popups]
+Укл/Выкл Вокны
+[First line]
+Першы радок
+[Second line]
+Другі радок
+[Time]
+Час
+[Sidebar]
+Урэзка
+[Title underline]
+Падкрэсленне загалоўка
+;file \src\core\stdpopup\src\yapp_history_dlg.cpp
+[Copy title to clipboard]
+Капіяваць загаловак у буфер
+[Copy message to clipboard]
+Капіраваць паведамленне ў буфер
+[Copy timestamp to clipboard]
+Капіраваць час у буфер
 ;file \src\core\stdssl\src\netlibssl.cpp
 [Client cannot decode host message. Possible causes: host does not support SSL or requires not existing security package]
 Кліент не можа дэкадаваць паведамлення хаста. Магчымыя прычыны: вузел не падтрымлівае SSL ці патрабуе неіснуючы пакет бяспекі
@@ -2631,8 +2762,6 @@ ID конта
 Юнікод плагін
 [ANSI plugin]
 ANSI плагін
-[Unused]
-
 [Show/Hide]
 Схаваць/паказаць
 [Exit]
@@ -2647,6 +2776,8 @@ ANSI плагін
 Укл.
 [Off]
 Адкл.
+[Unused]
+
 [Frames]
 Фрэймы
 [Add group]
diff --git a/langpacks/belarusian/Plugins/Actman.txt b/langpacks/belarusian/Plugins/Actman.txt
index 3902bd8cc7..c491703107 100644
--- a/langpacks/belarusian/Plugins/Actman.txt
+++ b/langpacks/belarusian/Plugins/Actman.txt
@@ -677,19 +677,19 @@ UTF16+сігнатура
 
 [Empty updater download folder]
 
-[Popup Plus (popup.dll) latest YAPP (yapp.dll)]
+[Popup plus (PopupPlus.dll) latest StdPopup (StdPopup.dll)]
 
-[Enables or disables Popup windows]
+[Enables or disables popup windows]
 
 [Notify]
 Абвестка
-[YAPP or Popup]
+[StdPopup or Popup plus]
 
 [Popup window]
 Усплывальнае вакно
 [Unicode Text]
 
-[Enables or disables Popup windows (maybe deprecated)]
+[Enables or disables popup windows (maybe deprecated)]
 
 [result of protocol service call]
 
diff --git a/langpacks/belarusian/Plugins/ChangeKeyboardLayout.txt b/langpacks/belarusian/Plugins/ChangeKeyboardLayout.txt
index 8bac880c77..741c57363c 100644
--- a/langpacks/belarusian/Plugins/ChangeKeyboardLayout.txt
+++ b/langpacks/belarusian/Plugins/ChangeKeyboardLayout.txt
@@ -82,8 +82,6 @@
 [Popups]
 Усплывальныя вокны
 ;file \plugins\ChangeKeyboardLayout\src\main.cpp
-[Popup]
-Вакно
 ;file \plugins\ChangeKeyboardLayout\src\stdafx.h
 [ChangeKeyboardLayout]
 Змена раскладкі
diff --git a/langpacks/belarusian/Plugins/Clist_modern.txt b/langpacks/belarusian/Plugins/Clist_modern.txt
index f3ee91d396..f512094ad0 100644
--- a/langpacks/belarusian/Plugins/Clist_modern.txt
+++ b/langpacks/belarusian/Plugins/Clist_modern.txt
@@ -747,6 +747,8 @@ Ctrl + Левы клік укл. фільтр па пратаколу, клік
 Імя ўліковага запісу
 [Rate]
 Рэйтынг
+[Last online]
+
 [-Nothing-]
 -Нічога-
 [Hide to tray]
@@ -808,8 +810,6 @@ Ctrl + Левы клік укл. фільтр па пратаколу, клік
 Імёны гуртоў справа
 [Row]
 Радок
-[Row design]
-Дызайн радка
 ;file \plugins\Clist_modern\src\modern_clistsettings.cpp
 [(Unknown contact)]
 (Невядомы кантакт)
@@ -835,21 +835,6 @@ Ctrl + Левы клік укл. фільтр па пратаколу, клік
 Аднавіць апошні стан статусу
 [Show/Hide offline users]
 Паказаць/Скрыць адключаных
-;file \plugins\Clist_modern\src\modern_rowtemplateopt.cpp
-[Empty %s cell]
-Пуста %s клетак
-[column]
-слупок
-[line]
-радок
-[columns]
-слупкоў
-[lines]
-ліній
-[%s, contain %s]
-%s, утрымлівае %s
-[ layered]
-слаіста
 ;file \plugins\Clist_modern\src\modern_skinopt.cpp
 [( unknown )]
 ( невядома )
diff --git a/langpacks/belarusian/Plugins/CloudFile.txt b/langpacks/belarusian/Plugins/CloudFile.txt
index 79efb90f84..c47294b370 100644
--- a/langpacks/belarusian/Plugins/CloudFile.txt
+++ b/langpacks/belarusian/Plugins/CloudFile.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Allows you to transfer files via cloud services.]
 
-;file \plugins\CloudFile\res\resource.rc
+;file \protocols\CloudFile\res\resource.rc
 [Default service]
 
 [General]
@@ -42,7 +42,7 @@
 
 [Revoke access]
 
-;file \plugins\CloudFile\src\icons.cpp
+;file \protocols\CloudFile\src\icons.cpp
 [Upload file(s)]
 Загрузіць файл(ы)
 [Dropbox]
@@ -53,22 +53,22 @@
 
 [Yandex.Disk]
 
-;file \plugins\CloudFile\src\menus.cpp
+;file \protocols\CloudFile\src\menus.cpp
 [Upload to...]
 
 [Upload]
 Загрузіць
-;file \plugins\CloudFile\src\options.cpp
+;file \protocols\CloudFile\src\options.cpp
 [None]
 Няма
 [Services]
 Службы
-;file \plugins\CloudFile\src\srmm.cpp
+;file \protocols\CloudFile\src\srmm.cpp
 [Upload files to...]
 
-;file \plugins\CloudFile\src\Services\dropbox_service.cpp
+;file \protocols\CloudFile\src\Services\dropbox_service.cpp
 [Server does not respond]
 
-;file \plugins\CloudFile\src\Services\google_service.cpp
-;file \plugins\CloudFile\src\Services\microsoft_service.cpp
-;file \plugins\CloudFile\src\Services\yandex_service.cpp
+;file \protocols\CloudFile\src\Services\google_service.cpp
+;file \protocols\CloudFile\src\Services\microsoft_service.cpp
+;file \protocols\CloudFile\src\Services\yandex_service.cpp
diff --git a/langpacks/belarusian/Plugins/CmdLine.txt b/langpacks/belarusian/Plugins/CmdLine.txt
index ae0afcd3bb..41a63813ae 100644
--- a/langpacks/belarusian/Plugins/CmdLine.txt
+++ b/langpacks/belarusian/Plugins/CmdLine.txt
@@ -195,8 +195,3 @@ CallService выклік паспяховы: служба '%S' вярнула %�
 Немагчыма стварыць сервер CommandLine!
 [You can only run one instance of CmdLine plugin.]
 Вы можаце запускаць толькі адну копію плагіна CmdLine.
-;file \plugins\CmdLine\src\utils.cpp
-[Notify]
-Абвестка
-[Warning]
-Увага
diff --git a/langpacks/belarusian/Plugins/ConnectionNotify.txt b/langpacks/belarusian/Plugins/ConnectionNotify.txt
index cb6de08be8..9d453e8593 100644
--- a/langpacks/belarusian/Plugins/ConnectionNotify.txt
+++ b/langpacks/belarusian/Plugins/ConnectionNotify.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Notify with popup if some connection established]
 Паведамляе вакном пра далучэнне
-;file \plugins\ConnectionNotify\res\ConnectionNotify.rc
+;file \protocols\ConnectionNotify\res\ConnectionNotify.rc
 [Set popup colors]
 Колер паведамленняў
 [Popup options]
@@ -56,7 +56,7 @@
 тут даступныя * і ? фільтры (для порта увядзіце нумар або *)
 [Remote IP:Port]
 Аддалены IP: Порт
-;file \plugins\ConnectionNotify\src\ConnectionNotify.cpp
+;file \protocols\ConnectionNotify\src\ConnectionNotify.cpp
 [Show]
 Паказаць
 [Hide]
@@ -79,6 +79,6 @@
 Плагіны
 [New Connection Notification]
 Паведамленне пра новае далучэнне
-;file \plugins\ConnectionNotify\src\filter.cpp
+;file \protocols\ConnectionNotify\src\filter.cpp
 [First close options window]
 Спачатку зачыніць налады
diff --git a/langpacks/belarusian/Plugins/CrashDumper.txt b/langpacks/belarusian/Plugins/CrashDumper.txt
index 8cbe86104c..a2fd8af434 100644
--- a/langpacks/belarusian/Plugins/CrashDumper.txt
+++ b/langpacks/belarusian/Plugins/CrashDumper.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: CrashDumper.dll
 ;  Plugin: Crash dumper
-;  Version: 0.1.0.2
+;  Version: 0.1.0.3
 ;  Authors: borkra
 ;============================================================
 [Crash Dumper and Version Information for Miranda NG.]
diff --git a/langpacks/belarusian/Plugins/CurrencyRates.txt b/langpacks/belarusian/Plugins/CurrencyRates.txt
index 73f466be74..da938b2acf 100644
--- a/langpacks/belarusian/Plugins/CurrencyRates.txt
+++ b/langpacks/belarusian/Plugins/CurrencyRates.txt
@@ -2,12 +2,12 @@
 ;============================================================
 ;  File: CurrencyRates.dll
 ;  Plugin: Currency Rates
-;  Version: 0.1.0.101
+;  Version: 0.2.0.3
 ;  Authors: Dioksin
 ;============================================================
 [Shows currency rates.]
 Дадатак адлюстроўвае курсы валют.
-;file \plugins\CurrencyRates\res\Forex.rc
+;file \protocols\CurrencyRates\res\Forex.rc
 [Variable List]
 Спіс зменных
 [Edit Settings]
@@ -104,14 +104,16 @@
 &Паведамленне статусу:
 [&Tendency:]
 &Тэндэнцыя:
+[&Personal key:]
+
 [&Advanced Settings...]
 Дадатковыя налады...
 [Rate Info]
 Курс валюты
-;file \plugins\CurrencyRates\src\Chart.h
+;file \protocols\CurrencyRates\src\Chart.h
 [There is nothing to show]
 
-;file \plugins\CurrencyRates\src\CommonOptionDlg.cpp
+;file \protocols\CurrencyRates\src\CommonOptionDlg.cpp
 [Seconds]
 Секунд
 [Minutes]
@@ -124,24 +126,15 @@
 
 [Enter text to display in contact list.]
 
-;file \plugins\CurrencyRates\src\CurrencyConverter.cpp
+;file \protocols\CurrencyRates\src\CurrencyConverter.cpp
 [Info provided by]
 Інфармацыя прадстаўлена
 [Enter positive number.]
 Увядзіце станоўчую лічбу.
-;file \plugins\CurrencyRates\src\CurrencyRateInfoDlg.cpp
+;file \protocols\CurrencyRates\src\CurrencyRateInfoDlg.cpp
 [Currency Rate]
 Курс валюты
-;file \plugins\CurrencyRates\src\CurrencyRatesProviderCurrencyConverter.cpp
-[Error occurred during HTML parsing.]
-Памылка падчас парсінгу HTML.
-[Error occurred during site access.]
-Памылка пры доступе да сайта.
-;file \plugins\CurrencyRates\src\CurrencyRatesProviderVisitorFormatSpecificator.cpp
-[Currency Symbol]
-Знак валюты
-[Currency Name]
-Назва валюты
+;file \protocols\CurrencyRates\src\CurrencyRatesProviderBase.cpp
 [Source of Information]
 Крыніца інфармацыі
 [Rate Value]
@@ -160,20 +153,11 @@
 Табуляцыя
 [Left slash (\\)]
 Знак \\
-[Open Price]
-Кошт на адкрыццё
-[Percent Change to After Hours]
-Адсотак змен за апошнюю гадзіну
-[Percent Change to Yesterday Close]
-Адсотак змен з учорашняга зачынення
-[Day's High]
-Максімальнае значэнне за дзень
-[Day's Low]
-Мінімальнае значэнне за дзень
-[Previous Close]
-Значэнне на папярэдняе зачыненне
-[Change]
-Змена
+;file \protocols\CurrencyRates\src\CurrencyRatesProviderCurrencyConverter.cpp
+[Error occurred during HTML parsing.]
+Памылка падчас парсінгу HTML.
+[Error occurred during site access.]
+Памылка пры доступе да сайта.
 [From Currency Full Name]
 Поўная назва зыходнай валюты
 [From Currency Short Name]
@@ -184,7 +168,7 @@
 Кароткая назва мэтавай валюты
 [Short notation for "%f/%i"]
 Кароткае пазначэнне "%f/%i"
-;file \plugins\CurrencyRates\src\Forex.cpp
+;file \protocols\CurrencyRates\src\Forex.cpp
 [Auto Update Enabled]
 Аўтаабнаўленне ўключана
 [Auto Update Disabled]
@@ -215,12 +199,16 @@
 
 [Currency Rates Auto Update Disabled]
 
+[Currency Symbol]
+Знак валюты
 [Network]
 Сеціва
-;file \plugins\CurrencyRates\src\HTTPSession.cpp
+;file \protocols\CurrencyRates\src\HTTPSession.cpp
+[This plugin requires a personal key. Press Yes to obtain it at the site and then enter the result in the Options dialog, otherwise this plugin will fail.]
+
 [CurrencyRates HTTP connections]
 HTTP далучэнне CurrencyRates
-;file \plugins\CurrencyRates\src\IconLib.cpp
+;file \protocols\CurrencyRates\src\IconLib.cpp
 [Protocol icon]
 Абразок конту
 [Currency Rate up]
@@ -237,17 +225,15 @@ HTTP далучэнне CurrencyRates
 Памяняць месцамі
 [Import]
 Імпарт
-;file \plugins\CurrencyRates\src\ImportExport.cpp
+;file \protocols\CurrencyRates\src\ImportExport.cpp
 [XML File (*.xml)]
 Файл XML(*.xml)
 [All files (*.*)]
 Усе файлы (*.*)
-;file \plugins\CurrencyRates\src\ModuleInfo.cpp
-[Miranda could not load CurrencyRates plugin. XML parser is missing.]
-
+;file \protocols\CurrencyRates\src\ModuleInfo.cpp
 [Miranda could not load CurrencyRates plugin. Microsoft HTML parser is missing.]
 
-;file \plugins\CurrencyRates\src\SettingsDlg.cpp
+;file \protocols\CurrencyRates\src\SettingsDlg.cpp
 [Log Files (*.txt,*.log)]
 Лог (*.txt,*.log)
 [Enter integer value]
diff --git a/langpacks/belarusian/Plugins/Db_autobackups.txt b/langpacks/belarusian/Plugins/Db_autobackups.txt
index 474e93abde..138a5a42f8 100644
--- a/langpacks/belarusian/Plugins/Db_autobackups.txt
+++ b/langpacks/belarusian/Plugins/Db_autobackups.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Db_autobackups.dll
 ;  Plugin: Db autobackuper
-;  Version: 0.1.0.2
+;  Version: 0.1.0.3
 ;  Authors: chaos.persei, sje, Kildor, Billy_Bons
 ;============================================================
 [Database autobackuper plugin.]
@@ -34,8 +34,6 @@
 
 [Disable progress bar]
 Адключыць індыкатар выканання
-[Disable popups]
-Адключыць усплывальныя вокны
 [Use CloudFile]
 
 [Backup NOW]
@@ -58,6 +56,10 @@
 [Database back up in process...]
 Рэзерваванне профілю...
 ;file \plugins\Db_autobackups\src\main.cpp
+[Enable &AutoBackups notification]
+
+[Disable &AutoBackups notification]
+
 [Miranda NG databases]
 Базы данных Miranda NG
 [Compressed Miranda NG databases]
@@ -70,6 +72,8 @@
 Рэзерваваць профіль
 [Save profile as...]
 Захаваць профіль як...
+[Popups]
+Усплывальныя вокны
 [Database backups]
 Рэзерваванне профіля
 [Backup folder]
diff --git a/langpacks/belarusian/Plugins/Discord.txt b/langpacks/belarusian/Plugins/Discord.txt
index 16434abe94..c22141509f 100644
--- a/langpacks/belarusian/Plugins/Discord.txt
+++ b/langpacks/belarusian/Plugins/Discord.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Discord.dll
 ;  Plugin: Discord protocol
-;  Version: 0.6.1.1
+;  Version: 0.6.2.1
 ;  Authors: George Hazan
 ;============================================================
 [Discord support for Miranda NG.]
@@ -18,9 +18,11 @@
 Кантакты
 [Default group:]
 Гурт:
+[Enable group chats]
+
 [Do not open chat windows on creation]
 
-[Use subgroups for guild's channels (requires restart)]
+[Use subgroups for server channels (requires restart)]
 
 [Nick:]
 Мянушка:
@@ -58,6 +60,10 @@
 
 [Do you really want to leave the guild?]
 
+[Disable sync]
+
+[Enable sync]
+
 [Join guild]
 
 [Copy my Discord ID]
@@ -68,6 +74,10 @@
 
 [Copy Discord ID]
 
+[Enable guild sync]
+
+[Load server history]
+
 ;file \protocols\Discord\src\options.cpp
 [Network]
 Сеціва
diff --git a/langpacks/belarusian/Plugins/FTPFile.txt b/langpacks/belarusian/Plugins/FTPFile.txt
index 4770fe29af..b332b8f6ad 100644
--- a/langpacks/belarusian/Plugins/FTPFile.txt
+++ b/langpacks/belarusian/Plugins/FTPFile.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: FTPFile.dll
 ;  Plugin: FTP File YM
-;  Version: 0.6.0.4
+;  Version: 0.6.0.5
 ;  Authors: yaho
 ;============================================================
 [FTP a file to a server and send the URL to your friend. Supported automatic zipping before upload and encryption via SFTP and FTPS.]
diff --git a/langpacks/belarusian/Plugins/Facebook.txt b/langpacks/belarusian/Plugins/Facebook.txt
index 0dae816fc1..c058e93382 100644
--- a/langpacks/belarusian/Plugins/Facebook.txt
+++ b/langpacks/belarusian/Plugins/Facebook.txt
@@ -142,14 +142,14 @@ URL:
 
 [This will permanently delete the conversation history]
 
-[Former]
-
 [Myself]
 
 [Friend]
 
 [User]
 Карыстач
+[Former]
+
 [Notifications]
 Абвесткі
 [%s and more (%d)]
diff --git a/langpacks/belarusian/Plugins/GG.txt b/langpacks/belarusian/Plugins/GG.txt
index 839ef93670..4fb3134c0d 100644
--- a/langpacks/belarusian/Plugins/GG.txt
+++ b/langpacks/belarusian/Plugins/GG.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: GG.dll
 ;  Plugin: Gadu-Gadu protocol
-;  Version: 0.11.0.4
+;  Version: 0.95.11.1
 ;  Authors: Bartosz Bialek, Adam Strzelecki
 ;============================================================
 [Gadu-Gadu protocol support for Miranda NG.]
diff --git a/langpacks/belarusian/Plugins/GmailNotifier.txt b/langpacks/belarusian/Plugins/GmailNotifier.txt
index aa6f75a5e3..0041abbf81 100644
--- a/langpacks/belarusian/Plugins/GmailNotifier.txt
+++ b/langpacks/belarusian/Plugins/GmailNotifier.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Check your Gmail inboxes locally.]
 
-;file \plugins\GmailNotifier\res\options.rc
+;file \protocols\GmailNotifier\res\options.rc
 [Gmail account]
 
 [Name:]
@@ -54,7 +54,7 @@
 
 [Log unread threads into database (enable history)]
 
-;file \plugins\GmailNotifier\src\check.cpp
+;file \protocols\GmailNotifier\src\check.cpp
 [Checking...]
 
 [Can't send account data!]
@@ -63,7 +63,7 @@
 
 [Can't get RSS feed!]
 
-;file \plugins\GmailNotifier\src\main.cpp
+;file \protocols\GmailNotifier\src\main.cpp
 [Other]
 Іншае
 [Gmail: New thread(s)]
@@ -74,7 +74,7 @@
 
 [&Check Gmail inbox]
 
-;file \plugins\GmailNotifier\src\options.cpp
+;file \protocols\GmailNotifier\src\options.cpp
 [GmailNotifier]
 
 [Network]
diff --git a/langpacks/belarusian/Plugins/ICQ.txt b/langpacks/belarusian/Plugins/ICQ.txt
index e8eee9c937..8cf0e655f4 100644
--- a/langpacks/belarusian/Plugins/ICQ.txt
+++ b/langpacks/belarusian/Plugins/ICQ.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: ICQ.dll
 ;  Plugin: ICQ-WIM protocol
-;  Version: 0.95.11.1
+;  Version: 0.95.11.4
 ;  Authors: George Hazan
 ;============================================================
 [ICQ protocol support for Miranda NG.]
@@ -16,8 +16,12 @@
 
 [Do not open chat windows on creation]
 
-[Advanced]
-Дадаткова
+[Use tray icon notifications]
+
+[E-mail]
+Пошта
+[Launch mailbox in a browser on click]
+
 [If a contact goes Offline, set this status instead and cache it for given timeout in seconds (0 - disabled)]
 
 [After that, set this status to a contact and move it offline after specified timeout in seconds (0 - disabled)]
@@ -59,6 +63,8 @@
 [Do you really want to remove it from ignore list?]
 
 ;file \protocols\ICQ-WIM\src\main.cpp
+[E-mail notification]
+
 [Ignore]
 Ігнараваць
 [Remove Ignore]
@@ -66,6 +72,15 @@
 ;file \protocols\ICQ-WIM\src\options.cpp
 [Network]
 Сеціва
+[General]
+Агульнае
+[Advanced]
+Дадаткова
+;file \protocols\ICQ-WIM\src\poll.cpp
+[You received e-mail from %s: %s]
+
+[You have %d unread emails]
+
 ;file \protocols\ICQ-WIM\src\proto.cpp
 [%s server connection]
 Далучэнне да сервера %s
diff --git a/langpacks/belarusian/Plugins/Import.txt b/langpacks/belarusian/Plugins/Import.txt
index f72d8aa8dc..ed760986c2 100644
--- a/langpacks/belarusian/Plugins/Import.txt
+++ b/langpacks/belarusian/Plugins/Import.txt
@@ -111,8 +111,6 @@ Miranda знайшла наступныя профілі. Абярыце про�
 Пропуск кантакта, %s не усталяваны.
 [Skipping non-IM contact (%S)]
 Пропуск не-IM кантакта (%s)
-[Skipping %S contact, ID not found]
-Пропуск кантакта %s, не знойдзены ID
 [Skipping duplicate %S contact %s]
 Пропуск паўтора %S кантакт %s
 [Failed to add %S contact %s]
diff --git a/langpacks/belarusian/Plugins/Jabber.txt b/langpacks/belarusian/Plugins/Jabber.txt
index 903863f76c..09387f3557 100644
--- a/langpacks/belarusian/Plugins/Jabber.txt
+++ b/langpacks/belarusian/Plugins/Jabber.txt
@@ -326,6 +326,8 @@ JID / URL:
 JID:
 [Node:]
 Вузел:
+[Filter:]
+
 [Member Information]
 Правы ўдзельніка
 [Role:]
@@ -392,24 +394,10 @@ XML Кансоль
 [Jabber Mood]
 Настрой Jabber
 ;file \protocols\JabberG\src\jabber_adhoc.cpp
-[Error %s %s]
-Памылка %s %s
-[Select Command]
-Выберыце каманду
-[Not supported]
-Не падтрымліваецца
 [Done]
 Выканана
-[In progress. Please Wait...]
-У прагэсе. Пачакайце...
 [Execute]
 Выканаць
-[Requesting command list. Please wait...]
-Запыт спісу каманд. Пачакайце...
-[Jabber Ad-Hoc commands at %s]
-Jabber Ad-Hoc каманды на %s
-[Sending Ad-Hoc command to %s]
-Адправіць Ad-Hoc каманду %s
 ;file \protocols\JabberG\src\jabber_agent.cpp
 [Jabber Agent Registration]
 Рэгістрацыя агента Jabber
@@ -544,32 +532,16 @@ xHTML фармат чат-паведамленняў
 Удзельнік
 [Moderator]
 Мадэратар
-[Visitors]
-Наведвальнікі
-[Participants]
-Удзельнікі
-[Moderators]
-адэратары
 [Owners]
 Уладальнікі
-[User %s is now banned.]
-Кантакт %s быў забанены.
-[User %s changed status to %s with message: %s]
-%s змяніў статус на %s: %s
-[User %s changed status to %s]
-%s змяніў статус на %s.
-[Room configuration was changed.]
-Налады чата зменены.
-[Outcast]
-Выгнаныя
-[Affiliation of %s was changed to '%s'.]
-Прыналежнасць %s змянілася на %s.
+[Moderators]
+адэратары
+[Participants]
+Удзельнікі
+[Visitors]
+Наведвальнікі
 [Role of %s was changed to '%s'.]
 Роля %s змянілася на '%s'.
-[because room is now members-only]
-таму што чат толькі для пастаянных удзельнікаў
-[user banned]
-забанены
 [Change &nickname]
 Змяніць мянушку
 [&Invite a user]
@@ -668,10 +640,6 @@ xHTML фармат чат-паведамленняў
 
 [%s (not on roster)]
 %s (не ў росцеры)
-[%s from\n%s]
-%s з\n%s
-[Real JID not available]
-Сапраўдны JID недасяжны
 [Reason to kick %s]
 Чыннік выспятку %s
 [Reason to ban %s]
@@ -742,26 +710,6 @@ Jabber памылка
 Скапіраваць імя
 [Copy node information]
 Скапіраваць інфармацыю
-;file \protocols\JabberG\src\jabber_disco.h
-[Identities]
-Ідэнтыфікатары
-[category]
-катэгорыя
-[type]
-тып
-[Category]
-Катэгорыя
-[Type]
-Тып
-[Supported features]
-Падтрымоўваныя магчымасці
-[Info request error]
-Памылка запыту інфармацыі
-[Items request error]
-Памылка запыту
-;file \protocols\JabberG\src\jabber_filterlist.cpp
-[Set filter...]
-Фільтр...
 ;file \protocols\JabberG\src\jabber_groupchat.cpp
 [Failed to retrieve room list from server.]
 Памылка запыту спісу чатаў.
@@ -769,8 +717,6 @@ Jabber памылка
 На серверы няма дасяжных чатаў
 [Room list request timed out.]
 Час запроса спісу чатаў
-[<no nick>]
-<без мянушкі>
 [Loading...]
 Загрузка...
 [Please wait for room list to download.]
@@ -781,8 +727,8 @@ Jabber памылка
 Закладкі...
 [Change nickname in <%s>]
 Змяніць мянушку ў <%s>
-[has set the subject to:]
-усталяваў(ла) тэму:
+[Error]
+Памылка
 [Group chat invitation to\n%s]
 Запрашэнне ў канферэнцыю\n%s
 ;file \protocols\JabberG\src\jabber_icolib.cpp
@@ -877,8 +823,8 @@ Jabber памылка
 ;file \protocols\JabberG\src\jabber_iqid.cpp
 [Authentication failed for %s.]
 Аутэнтыфікацыя не прайшла для %s.
-[Jabber Authentication]
-Аутэнтыфікацыя Jabber
+[Authentication]
+
 [Registration successful]
 Рэгістрацыя паспяхова пройдзена
 [Password is successfully changed. Don't forget to update your password in the Jabber protocol option.]
@@ -1469,18 +1415,6 @@ Jabber Рэсурс
 Змены статусу
 [Don't notify history messages]
 Не паказваць абвестак з гісторыі
-[Group]
-Гурт
-[Subscription]
-Падпіска
-[Uploading...]
-Выгрузка...
-[Downloading...]
-Загрузка...
-[XML for MS Excel (UTF-8 encoded)]
-XML для MS Excel (кадзіроўка UTF-8)
-[Connecting...]
-Далучэнне...
 [Network]
 Сеціва
 [Account]
@@ -1514,8 +1448,6 @@ S.ms
 [Some changes will take effect the next time you connect to the Jabber network.]
 Некаторыя змены будуць ужытыя пры наступным уваходзе ў Jabber.
 ;file \protocols\JabberG\src\jabber_password.cpp
-[Set New Password for %s@%S]
-Устаноўка новага пароля для %s@%S
 [New password does not match.]
 Новыя паролі не супадаюць
 [Current password is incorrect.]
@@ -1543,6 +1475,46 @@ S.ms
 Памылка пры ўсталёўцы па змаўчанні
 [Allow]
 Дазволіць
+[List has no rules, empty lists will be deleted then changes applied]
+У спісе няма правіл, пустыя спісы будуць выдаленыя
+[allow ]
+дазволіць\s
+[deny ]
+забараніць\s
+[all.]
+усё.
+[messages]
+паведамленняў
+[ and ]
+ і\s
+[incoming presences]
+уваходная прысутнасць
+[outgoing presences]
+выходная прысутнаст
+[queries]
+запыты
+[Else ]
+Інакш\s
+[If Jabber ID is ']
+Калі JID '
+[ (nickname: ]
+ (мянушка:\s
+[If group is ']
+Калі гурт '
+[If subscription is ']
+Калі падпіска '
+[then ]
+то\s
+[ (act., def.)]
+(актыўна, змаўч.)
+[ (active)]
+ (актыўны)
+[ (default)]
+ (асноўны)
+[Ready.]
+Гатовы.
+[Privacy lists are not saved, discard any changes and exit?]
+Спісы прыватнасці не захаваны, адмяніць змены і выйсці?
 [Simple mode]
 Просты рэжым
 [Advanced mode]
@@ -1587,46 +1559,6 @@ S.ms
 Прысутнасць (ув)
 [Query]
 Запыт
-[List has no rules, empty lists will be deleted then changes applied]
-У спісе няма правіл, пустыя спісы будуць выдаленыя
-[allow ]
-дазволіць\s
-[deny ]
-забараніць\s
-[all.]
-усё.
-[messages]
-паведамленняў
-[ and ]
- і\s
-[incoming presences]
-уваходная прысутнасць
-[outgoing presences]
-выходная прысутнаст
-[queries]
-запыты
-[Else ]
-Інакш\s
-[If Jabber ID is ']
-Калі JID '
-[ (nickname: ]
- (мянушка:\s
-[If group is ']
-Калі гурт '
-[If subscription is ']
-Калі падпіска '
-[then ]
-то\s
-[ (act., def.)]
-(актыўна, змаўч.)
-[ (active)]
- (актыўны)
-[ (default)]
- (асноўны)
-[Ready.]
-Гатовы.
-[Privacy lists are not saved, discard any changes and exit?]
-Спісы прыватнасці не захаваны, адмяніць змены і выйсці?
 [Please save list before activating]
 Перад акцівацыяй захавайце спіс
 [First, save the list]
@@ -1650,80 +1582,22 @@ S.ms
 Конт не далучаны ці няма JID.
 [No valid OMEMO session exists]
 
-;file \protocols\JabberG\src\jabber_rc.cpp
-[Command completed successfully]
-Каманда выканана паспяхова
-[Error occurred during processing command]
-Паўстала памылка падчас выкананні каманды
-[Set status]
-Усталяваць статус
-[Set options]
-Усталяваць налады
-[Forward unread messages]
-Перасылаць непрачытаныя паведамленні
-[Leave group chats]
-Пакінуць чаты
-[Lock workstation]
-Заблакаваць кампутар
-[Quit Miranda NG]
-Зачыніць Miranda
-[Change Status]
-Змяняць статус
-[Choose the status and status message]
-Усталяваць статус і статуснае паведамленне
-[Status]
-Статус
-[Extended away (Not available)]
-Недаступны
-[Invisible]
-Нябачны
-[Offline]
-Адключаны
-[Priority]
-Прыярытэт
-[Status message]
-Паведамленне статусу
-[Change global status]
-Змяніць глабальны статус
-[Set Options]
-Усталяваць налады
-[Set the desired options]
-Усталюйце жаданыя налады
-[Automatically Accept File Transfers]
-Аўтаматычна ўхваляць перадачы файлаў
-[Play sounds]
-Прайграваць гукі
-[Disable remote controlling (check twice what you are doing)]
-Выключыць выдаленае кіраванне (правярайце двойчы, што вы робіце)
-[There is no messages to forward]
-Няма паведамленняў для адпраўкі
-[Forward options]
-Параметры перасылкі
-[%d message(s) to be forwarded]
-%d паведамленні для адпраўкі
-[Mark messages as read]
-пазначыць павеламленні прачытанымі
-[%d message(s) forwarded]
-паведамленняў адпраўлена: %d
-[Workstation successfully locked]
-Кампутар паспяхова заблакаваны
-[Error %d occurred during workstation lock]
-Памылка %d паўстала падчас працэсу блакавання
-[Confirmation needed]
-Неабходна пацвярджэнне
-[Please confirm Miranda NG shutdown]
-Пацвердзіце выключэнне праграмы
-[There is no group chats to leave]
-Няма чатаў для адключэння
-[Choose the group chats you want to leave]
-Абярыце чаты, якія вы хочаце пакінуць
+;file \protocols\JabberG\src\jabber_roster.cpp
+[Group]
+Гурт
+[Subscription]
+Падпіска
+[Uploading...]
+Выгрузка...
+[Downloading...]
+Загрузка...
+[Connecting...]
+Далучэнне...
+[XML for MS Excel (UTF-8 encoded)]
+XML для MS Excel (кадзіроўка UTF-8)
 ;file \protocols\JabberG\src\jabber_search.cpp
-[Error %s %s\r\nPlease select other server]
-Памылка %s %s\r\n Калі ласка абярыце іншы сервер
 [Error: unknown reply received\r\nPlease select other server]
 Памылка, прыняты невядомы адказ\r\n Калі ласка, абярыце іншы сервер
-[Error %s %s\r\nTry to specify more detailed]
-Памылка %s %s\r\n Паспрабуйце паказаць больш дэталяў
 [Search error]
 Памылка пошуку
 [Select/type search service URL above and press <Go>]
@@ -1745,6 +1619,8 @@ S.ms
 адправіў прысутнасць з памылкай
 [sent unknown presence type]
 адправіў невядомы тып прысутнасці
+[Outcast]
+Выгнаныя
 [Nick:]
 Мянушка:
 [Status:]
@@ -1762,31 +1638,23 @@ S.ms
 Памылка: Злучэнне страчана
 [Requesting registration instruction...]
 Запыт рэгістрацыйнай інструкцыі...
-[Authentication failed for %s@%S.]
-Аутэнтыфікацыя не прайшла для %s@%S.
-[Message redirected from: %s\r\n%s]
-Паведамленне пераслана ад %s\r\n%s
+[Registration canceled]
+
 [Sending registration information...]
 Дасылка рэгістрацыйнай інфармацыі...
 ;file \protocols\JabberG\src\jabber_userinfo.cpp
-[Resource]
-Рэсурс
 [<not specified>]
 <не паказана>
+[Resource]
+Рэсурс
 [Software]
 Кліент
 [Version]
 Версія
 [System]
 Сістэма
-[unknown]
-невядома
-[Idle since]
-Прастойвае з
-[Client capabilities]
-Магчымасці кліента
-[Software information]
-Інфармацыя пра ПЗ
+[Last activity]
+
 [Operating system]
 Аперацыйная сістэма
 [Operating system version]
@@ -1801,26 +1669,14 @@ S.ms
 Занятак
 [Tune]
 Мелодыя
-[both]
-у абодва бакі
-[to]
-у
-[from]
-з
-[none]
-няма
 [Last logoff time]
 Адключаны:
 [Uptime]
 Час працы
 [Logoff message]
 Паведамленне адключэння
-[<no information available>]
-<няма інфармацыі>
 [Last active resource]
 Апошні актыўны рэсурс
-[Please switch online to see more details.]
-Далучыцеся для дэтальнай інфармацыі.
 [Copy]
 Капіяваць
 [Copy only this value]
@@ -1870,10 +1726,10 @@ S.ms
 Затрымка выдаленага сервера
 [Unknown error]
 Невядомая памылка
-[Error]
-Памылка
 [Unknown error message]
 Невядомая памылка паведамлення
+[Offline]
+Адключаны
 [Advanced Status]
 Пашыраны статус
 [Set mood...]
diff --git a/langpacks/belarusian/Plugins/LotusNotify.txt b/langpacks/belarusian/Plugins/LotusNotify.txt
index 903a8c972c..255f36181d 100644
--- a/langpacks/belarusian/Plugins/LotusNotify.txt
+++ b/langpacks/belarusian/Plugins/LotusNotify.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Notify about new mail in Lotus Database]
 Паведаміце аб новай пошце ў базе Lotus
-;file \plugins\LotusNotify\res\LotusNotify.rc
+;file \protocols\LotusNotify\res\LotusNotify.rc
 [Lotus connection settings]
 Налады далучэння Lotus
 [Primary server:]
@@ -66,7 +66,7 @@
 Каму / Копія
 [Offline status mean:]
 Аўтаномны статус:
-;file \plugins\LotusNotify\src\LotusNotify.cpp
+;file \protocols\LotusNotify\src\LotusNotify.cpp
 [Unable to load all required Lotus API functions]
 Не ўдалося загрузіць усе неабходныя функцыі Lotus API
 [Lotus Notes Client not detected. Check plugin configuration description at https://miranda-ng.org/p/LotusNotify]
diff --git a/langpacks/belarusian/Plugins/MSN.txt b/langpacks/belarusian/Plugins/MSN.txt
index 61514eae68..6378a5180e 100644
--- a/langpacks/belarusian/Plugins/MSN.txt
+++ b/langpacks/belarusian/Plugins/MSN.txt
@@ -132,8 +132,6 @@
 [&Deop user]
 
 ;file \protocols\MSN\src\msn_commands.cpp
-[%I64u bytes]
-%I64u байт
 [MSN Alert]
 Абвестка MSN
 ;file \protocols\MSN\src\msn_errors.cpp
diff --git a/langpacks/belarusian/Plugins/MenuEx.txt b/langpacks/belarusian/Plugins/MenuEx.txt
index 5a769b8e9c..f5dca128f6 100644
--- a/langpacks/belarusian/Plugins/MenuEx.txt
+++ b/langpacks/belarusian/Plugins/MenuEx.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MenuEx.dll
 ;  Plugin: Menu item ext
-;  Version: 1.3.1.0
+;  Version: 1.3.2.0
 ;  Authors: Heiko Schillinger, Baloo, Billy_Bons, Robert Pösel
 ;============================================================
 [Adds some useful options to a contacts menu.]
@@ -20,8 +20,6 @@
 Ігнараваць
 [Copy to Account (Ctrl+click for move to Account)]
 Капіяваць у конт (Ctrl+клік - перасоўванне)
-[Request Authorization]
-Запытаць аўтарызацыю
 [Browse Received Files]
 Прынятыя файлы
 [Copy IP]
@@ -79,14 +77,8 @@
 Аўтарызацыя
 [Typing Notify]
 Набірае тэкст
-[Please authorize me to add you to my contact list.]
-Дазволіце, калі ласка, дадаць Вас у спіс.
-[Do you want to send authorization request\nto new contact?]
-Ці жадаеце вы паслаць запыт аўтарызацыі\nноваму кантакту?
 [Open ignore settings]
 Адкрыць налады ігнаравання
-[Request authorization]
-Запытаць аўтарызацыю
 [MenuItemEx]
 Дадатковае меню
 ;file \plugins\MenuItemEx\src\options.cpp
diff --git a/langpacks/belarusian/Plugins/MinecraftDynmap.txt b/langpacks/belarusian/Plugins/MinecraftDynmap.txt
index ff5569d9e2..d5a37f83a6 100644
--- a/langpacks/belarusian/Plugins/MinecraftDynmap.txt
+++ b/langpacks/belarusian/Plugins/MinecraftDynmap.txt
@@ -13,8 +13,6 @@
 [Visible name:]
 Бачнае імя:
 ;file \protocols\MinecraftDynmap\src\chat.cpp
-[Server]
-Сервер
 [Admin]
 Адмін
 [Normal]
diff --git a/langpacks/belarusian/Plugins/MirOTR.txt b/langpacks/belarusian/Plugins/MirOTR.txt
index d27697b229..d90e5d02aa 100644
--- a/langpacks/belarusian/Plugins/MirOTR.txt
+++ b/langpacks/belarusian/Plugins/MirOTR.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MirOTR.dll
 ;  Plugin: Miranda OTR
-;  Version: 0.14.1.17
+;  Version: 0.14.2.1
 ;  Authors: ProgAndy & CHEF-KOCH
 ;============================================================
 [OTR (Off-the-Record) plugin for Miranda NG (using some code and ideas from SecureIM, Pidgin-OTR and old Miranda OTR (by SJE)).]
@@ -80,6 +80,17 @@ OTR-статус
 Спыніць& OTR-сесію
 [&Verify Fingerprint]
 &Праверка адбіткаў
+;file \plugins\MirOTR\src\icons.cpp
+[OTR private]
+Прыватны OTR
+[OTR unverified]
+OTR неправераны
+[OTR finished]
+OTR завершаны
+[OTR not secure]
+OTR не з'яўляецца бяспечным
+[Refresh]
+Абнавіць
 ;file \plugins\MirOTR\src\language.h
 [Start OTR]
 Запусціць OTR
@@ -99,8 +110,6 @@ OTR-шыфраванне: неправерана
 OTR-шыфраванне: дзель
 [OTR Encryption: Finished]
 OTR-шыфраванне: завершана
-[&Convert HTML (for Pidgin)]
-Канверсаваць HTML (для Pidgin)
 [OTR encrypted session with '%s' has been terminated]
 Шыфраваная сесія з '%s' была спынена.
 [Requesting OTR encrypted session with '%s']
@@ -131,16 +140,6 @@ OTR Інфармацыя
 Шыфраваная сесія з '%s' зараз выкарыстоўвае ПРАВЕРАНЫ адбітак.
 [OTR encrypted session with '%s' is now using a NOT VERIFIED fingerprint]
 Шыфраваная сесія з '%s' зараз выкарыстоўвае НЕПРАВЕРАНЫ адбітак.
-[OTR unverified]
-OTR неправераны
-[OTR finished]
-OTR завершаны
-[OTR private]
-Прыватны OTR
-[OTR not secure]
-OTR не з'яўляецца бяспечным
-[Refresh]
-Абнавіць
 [Generating new private key for protocol '%s'.\nPlease Wait...]
 Стварэнне новага прыватнага ключа для пратаколу '%s'.\n Пачакайце...
 [General]
@@ -236,6 +235,8 @@ OTR: усталяваны SecureIM
 Меню MirOTR
 [OTR Status]
 OTR Статус
+[&Convert HTML (for Pidgin)]
+Канверсаваць HTML (для Pidgin)
 ;file \plugins\MirOTR\src\options.cpp
 [Private Data]
 Асабістыя дадзеныя
diff --git a/langpacks/belarusian/Plugins/MirandaG15.txt b/langpacks/belarusian/Plugins/MirandaG15.txt
index 08447c3736..c5deace634 100644
--- a/langpacks/belarusian/Plugins/MirandaG15.txt
+++ b/langpacks/belarusian/Plugins/MirandaG15.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MirandaG15.dll
 ;  Plugin: MirandaG15
-;  Version: 0.1.2.0
+;  Version: 0.1.2.1
 ;  Authors: Martin Kleinhans
 ;============================================================
 [Provides an interface to use Miranda from the LCD of various Logitech devices.]
diff --git a/langpacks/belarusian/Plugins/MsgPopup.txt b/langpacks/belarusian/Plugins/MsgPopup.txt
index 908785cdee..8152e6d57b 100644
--- a/langpacks/belarusian/Plugins/MsgPopup.txt
+++ b/langpacks/belarusian/Plugins/MsgPopup.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MsgPopup.dll
 ;  Plugin: Message popup
-;  Version: 0.1.2.1
+;  Version: 0.1.2.2
 ;  Authors: StDenis
 ;============================================================
 [Plugin replaces message boxes (those having only OK button) with popups.]
diff --git a/langpacks/belarusian/Plugins/NewsAggregator.txt b/langpacks/belarusian/Plugins/NewsAggregator.txt
index 30c33dd24f..3bd4cbca3c 100644
--- a/langpacks/belarusian/Plugins/NewsAggregator.txt
+++ b/langpacks/belarusian/Plugins/NewsAggregator.txt
@@ -2,12 +2,12 @@
 ;============================================================
 ;  File: NewsAggregator.dll
 ;  Plugin: News aggregator
-;  Version: 0.1.0.4
+;  Version: 0.1.0.5
 ;  Authors: Mataes, FREAK_THEMIGHTY
 ;============================================================
 [RSS/Atom news aggregator.]
 Каналы навін RSS/Atom.
-;file \plugins\NewsAggregator\Res\Resource.rc
+;file \protocols\NewsAggregator\Res\Resource.rc
 [Add]
 Дадаць
 [Change]
@@ -72,14 +72,14 @@
 Каналы для імпарту:
 [&Import]
 Імпарт
-;file \plugins\NewsAggregator\Src\Authentication.cpp
+;file \protocols\NewsAggregator\Src\Authentication.cpp
 [Enter your username]
 Увядзіце імя карыстача
 [Error]
 Памылка
 [Enter your password]
 Увядзіце пароль
-;file \plugins\NewsAggregator\Src\CheckFeed.cpp
+;file \protocols\NewsAggregator\Src\CheckFeed.cpp
 [%s\nis a valid feed's address.]
 %s\n сапраўды існуе.
 [News Aggregator]
@@ -88,7 +88,7 @@
 %s\nняслушны адрас канала
 [empty]
 пуста
-;file \plugins\NewsAggregator\Src\Icons.cpp
+;file \protocols\NewsAggregator\Src\Icons.cpp
 [Protocol icon]
 Абразок конту
 [Check All Feeds]
@@ -103,13 +103,13 @@
 Аўтаабнаўленне ўключана
 [Auto Update Disabled]
 Аўтаабнаўленне выключана
-;file \plugins\NewsAggregator\Src\Menus.cpp
+;file \protocols\NewsAggregator\Src\Menus.cpp
 [Check feed]
 Праверыць канал
 [Change feed]
 Змяніць канал
-;file \plugins\NewsAggregator\Src\NewsAggregator.cpp
-;file \plugins\NewsAggregator\Src\Options.cpp
+;file \protocols\NewsAggregator\Src\NewsAggregator.cpp
+;file \protocols\NewsAggregator\Src\Options.cpp
 [OPML files]
 Файлы OPML
 [Not valid import file.]
@@ -154,11 +154,11 @@ ID навіны.
 Выдаленне кантакта
 [Network]
 Сеціва
-;file \plugins\NewsAggregator\Src\Services.cpp
+;file \protocols\NewsAggregator\Src\Services.cpp
 [Avatars]
 Аватары
 [Enable/disable auto update]
 
-;file \plugins\NewsAggregator\Src\Utils.cpp
+;file \protocols\NewsAggregator\Src\Utils.cpp
 [NewsAggregator HTTP connections]
 HTTP далучэнне NewsAggregator
diff --git a/langpacks/belarusian/Plugins/NimContact.txt b/langpacks/belarusian/Plugins/NimContact.txt
index e25a33ba98..41aa3fdf8c 100644
--- a/langpacks/belarusian/Plugins/NimContact.txt
+++ b/langpacks/belarusian/Plugins/NimContact.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Non-IM Contact allows you to add 'contacts' that can act as shortcuts to other programs, or links to web pages.\r\nThe contacts name can be read from a text file (includes any ASCII file).\r\nThis plugin is a combination of Favorites and Text Reader plugins both made by me)]
 Не-IM кантакт дазваляе дадаваць спасылкі на іншыя праграмы і вэб-старонкі ў якасці «кантактаў». Імёны гэтых «кантактаў» могуць брацца з тэкставага файла (любога файла ASCII).\r\n Гэты плагін з'яўляецца камбінацыяй плагінаў Favorites і Text Reader, таксама напісаных мной.
-;file \plugins\Non-IM Contact\res\resource.rc
+;file \protocols\Non-IM Contact\res\resource.rc
 [View/Edit Files]
 Прагляд/Змена файлаў
 [Add File]
@@ -108,7 +108,7 @@
 Адзін радок замены на кожны радок у фармаце "арыгінал,новы"
 [EXAMPLE: %fn1,%fn2]
 ПРЫКЛАД: %fn1,%fn2
-;file \plugins\Non-IM Contact\src\contactinfo.cpp
+;file \protocols\Non-IM Contact\src\contactinfo.cpp
 [Select Folder]
 Абраць тэчку
 [Non-IM Contact protocol timer is Disabled]
@@ -117,7 +117,7 @@
 
 [New Non-IM Contact]
 Новы не-IM кантакт
-;file \plugins\Non-IM Contact\src\dialog.cpp
+;file \protocols\Non-IM Contact\src\dialog.cpp
 [String replacing variables...\r\nThe following are all the valid variables that can be used. Refer to the wiki.miranda-ng.org for a proper explanation.\r\n\r\nfile(X)\t\t<- specifies the file to read from. MUST be followed by either start() or end() or wholeline()\r\nfilename(X)\t<- copies the filename of file X.\r\nstart(...)\t\t<- specifies where to start copying from.\r\nend(...)\t\t<- specifies where to stop copying.\r\nwholeline(line(...))\t<- specifies a whole line to copy\r\n\r\nstart() and end() explained\r\n.........................\r\nMUST start with line() followed by a number or a string inside " marks, OR csv(separatorX) variable. The number specifies which character in the line to start/end copying. The string specifies a string in the line to start/end copying.\r\n\r\ncsv(seperatorX) explained...\r\nSeperator is either "tab" or "space" or any SINGLE character. X is the Xth separator to pass before copying, (or to stop before).\r\n\r\nLastly the line(...) variable...\r\nInside the brackets must be either a number (to specify the line number), or a string inside " marks (to use the line with that string), or lastline(X). The X in lastline is the Xth line above the last line, i.e., lastline(1) will use the 2nd last line of the file. If searching for a line with "some words" you may put a + or - X after the closing ), i.e., line("some words")+3 to go 3 lines after the line with "some words".\r\n\r\nSome examples...\r\nfilename(0)    <- will display the filename of the 0th file\r\nfile(0)wholeline(line(0)))    <- will display the whole first line of the 0th file\r\nfile(0)wholeline(line("hello")-1)))    <- the wholeline above the first occurrence of "hello" in the file\r\nfile(0)start(line(lastline(1))csv(tab2))end(line(lastline())csv(tab4)))    <- starts at the 2nd last line of the file, from the 2nd tab variable, until the 4th tab variable in the last line (in the 0th file)\r\nfile(0)start(line("hello")+1"zzzz")end(line(6)17))    <- starts from the first occurrence of zzzz in the line after the first occurrence of hello, until the 17th character in the 6th line (starting from line 0) of the 0th file.\r\n]
 
 [Contacts Display Info]
@@ -130,7 +130,7 @@
 Файлы
 [Edit Non-IM Contact "%s"]
 
-;file \plugins\Non-IM Contact\src\files.cpp
+;file \protocols\Non-IM Contact\src\files.cpp
 [Do you want to overwrite the contents of the file?\r\n\r\nPressing No will append these contacts to the end of the file.]
 
 [File couldn't be opened]
@@ -139,10 +139,10 @@
 
 [line(%-3d) = | %s]
 
-;file \plugins\Non-IM Contact\src\http.cpp
+;file \protocols\Non-IM Contact\src\http.cpp
 [Non-IM Contacts]
 Не-IM кантакты
-;file \plugins\Non-IM Contact\src\main.cpp
+;file \protocols\Non-IM Contact\src\main.cpp
 [Plugins]
 Плагіны
 [Main Icon]
@@ -163,7 +163,7 @@
 Стварыць радок
 [E&dit Contact Settings]
 Змяніць налады кантакту
-;file \plugins\Non-IM Contact\src\namereplacing.cpp
+;file \protocols\Non-IM Contact\src\namereplacing.cpp
 [%s - ERROR: no line specified or line not found (in %s)]
 
 [%s - ERROR: file couldn't be opened (in %s)]
diff --git a/langpacks/belarusian/Plugins/NotesReminders.txt b/langpacks/belarusian/Plugins/NotesReminders.txt
index 9d08d2b72b..c47cc64223 100644
--- a/langpacks/belarusian/Plugins/NotesReminders.txt
+++ b/langpacks/belarusian/Plugins/NotesReminders.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: NotesReminders.dll
 ;  Plugin: Sticky Notes & Reminders
-;  Version: 0.1.0.1
+;  Version: 0.2.0.2
 ;  Authors: Joe Kucera, Lubomir Kolev Ivanov, Georg Fischer
 ;============================================================
 [Sticky Notes & Reminders Implementation for Miranda NG.]
@@ -50,12 +50,12 @@
 Дазваляе розным гукам прайгравацца адначасова (магчымыя нежаданыя наступствы, калі ўсталяваны плагін карыстацкіх гукаў)
 [Add Reminder]
 Дадаць напамінак
-[Trigger On Time && Date:]
-Дата &і час запуску:
 [Date]
 Дата
 [Time]
 Час
+[Repeat each day]
+
 [Reminder Note:]
 Напамінак:
 [None]
@@ -102,8 +102,6 @@
 &Выдаліць напамінак
 [D&elete All Reminders]
 Выдаліць усе напамінкі
-[Context Menu Note Popup]
-Кантэкстнае меню абвестак
 [&Hide Note]
 &Схаваць нататкі
 [&Always On Top]
@@ -152,9 +150,6 @@
 Выдаліць &усе нататкі
 [&Show / Hide Notes]
 &Паказаць / Схаваць нататкі
-;file \plugins\NotesAndReminders\src\globals.h
-[Notes & Reminders]
-Нататкі і напамінкі
 ;file \plugins\NotesAndReminders\src\hotkeys.cpp
 [New Note]
 Новая нататка
@@ -165,10 +160,6 @@
 [New Reminder]
 Новы напамінак
 ;file \plugins\NotesAndReminders\src\main.cpp
-[Are you sure you want to delete all notes?]
-Упэўнены, што жадаеце выдаліць усе нататкі?!
-[Are you sure you want to delete all reminders?]
-Упэўнены, што жадаеце выдаліць усе напамінкі?!
 [Delete All Notes]
 Выдаліць усе нататкі
 [Show/Hide Notes]
@@ -195,20 +186,10 @@
 Прагледзець нататкі
 [Sticky Notes]
 Нататкі
-[Plugins]
-Плагіны
 [Add New Note]
 Дадаць нататку…
 [Add New Reminder]
 Дадаць напамінак…
-[Alerts]
-Абвесткі
-[Reminder triggered]
-Спрацоўванне напамінку
-[Reminder triggered (Alternative 1)]
-Спрацоўванне напамінку (Альтэрнатыва 1)
-[Reminder triggered (Alternative 2)]
-Спрацоўванне напамінку (Альтэрнатыва 2)
 [Notes && Reminders]
 Нататкі &і напамінкі
 [New &Note]
@@ -221,6 +202,14 @@
 &Перамясціць на пярэдні план
 [Miranda could not load the Notes & Reminders plugin, Msftedit.dll is missing. If you are using WINE, please make sure you have Msftedit.dll installed. Press 'Yes' to continue loading Miranda.]
 Міранда не можа загрузіць плагін NotesReminders, няма Msftedit.dll. Калі вы выкарыстоўваеце WINE, пераканайцеся, што вы ўсталявалі бібліятэкі Msftedit.dll. Націсніце кнопку "Так" для працягу загрузкі Міранды.
+[Alerts]
+Абвесткі
+[Reminder triggered]
+Спрацоўванне напамінку
+[Reminder triggered (Alternative 1)]
+Спрацоўванне напамінку (Альтэрнатыва 1)
+[Reminder triggered (Alternative 2)]
+Спрацоўванне напамінку (Альтэрнатыва 2)
 ;file \plugins\NotesAndReminders\src\notes.cpp
 [Black]
 Чорны
@@ -268,6 +257,8 @@
 Нататка
 [Date/Title]
 Дата/загаловак
+[Are you sure you want to delete all notes?]
+Упэўнены, што жадаеце выдаліць усе нататкі?!
 ;file \plugins\NotesAndReminders\src\options.cpp
 [Sticky Note Caption]
 Загаловак
@@ -279,11 +270,17 @@
 Файлы выканання\0*.exe\0Усе файлы\0*.*\0\0
 [Select Executable]
 Абраць праграму…
+[Plugins]
+Плагіны
 ;file \plugins\NotesAndReminders\src\reminders.cpp
 [Minutes]
 Хвілін
 [Hours]
 Гадзін
+[The specified time is invalid due to begin of daylight saving (summer time).]
+Паказаны час несапраўдна з-за пераходу на «летні час»
+[The specified time is invalid.]
+Паказаны час несапраўдна
 [Hour]
 Гадзіна
 [Day]
@@ -292,10 +289,6 @@
 Дзён
 [Week]
 Тыдзень
-[The specified time is invalid due to begin of daylight saving (summer time).]
-Паказаны час несапраўдна з-за пераходу на «летні час»
-[The specified time is invalid.]
-Паказаны час несапраўдна
 [The specified time offset is invalid.]
 Указанае змяшчэнне часу з'яўляецца несапраўдным.
 [&Update Reminder]
@@ -316,5 +309,10 @@
 Напамінак
 [Date of activation]
 Дата актывацыі
+[Are you sure you want to delete all reminders?]
+Упэўнены, што жадаеце выдаліць усе напамінкі?!
 [Are you sure you want to delete this reminder?]
 Упэўнены, што жадаеце выдаліць гэты напамінак?
+;file \plugins\NotesAndReminders\src\stdafx.h
+[Notes & Reminders]
+Нататкі і напамінкі
diff --git a/langpacks/belarusian/Plugins/PasteIt.txt b/langpacks/belarusian/Plugins/PasteIt.txt
index afbc63cc57..167518eed5 100644
--- a/langpacks/belarusian/Plugins/PasteIt.txt
+++ b/langpacks/belarusian/Plugins/PasteIt.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: PasteIt.dll
 ;  Plugin: Paste it
-;  Version: 1.0.0.3
+;  Version: 1.0.0.4
 ;  Authors: Krzysztof Kral
 ;============================================================
 [Uploads the text to web page and sends the URL to your friends.]
@@ -142,12 +142,12 @@ HTTP далучэнне Paste It
 [File '%s' is empty]
 Файл '%s' пусты
 ;file \plugins\PasteIt\src\PasteToWeb1.cpp
-[Error during sending text to web page: %s]
-Памылка пры адпраўцы тэксту на web-старонку: %s
+[Error during sending text to web page: %S]
+Памылка пры адпраўцы тэксту на web-старонку: %S
 [Error during sending text to web page]
 Памылка пры адпраўцы тэксту на web-старонку
-[Error during getting user key from web page: %s]
-Памылка пры атрыманні ключа кантакта ад web-старонкі: %s
+[Error during getting user key from web page: %S]
+Памылка пры атрыманні ключа кантакта ад web-старонкі: %S
 [Paste expire date]
 Уставіць на тэрмін
 [Never]
diff --git a/langpacks/belarusian/Plugins/PluginUpdater.txt b/langpacks/belarusian/Plugins/PluginUpdater.txt
index ef0e1a52c8..1bfd0b1fb1 100644
--- a/langpacks/belarusian/Plugins/PluginUpdater.txt
+++ b/langpacks/belarusian/Plugins/PluginUpdater.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: PluginUpdater.dll
 ;  Plugin: Plugin updater
-;  Version: 0.2.0.2
+;  Version: 0.2.0.3
 ;  Authors: Mataes, George Hazan
 ;============================================================
 [Installs and updates plugins and other Miranda NG components.]
diff --git a/langpacks/belarusian/Plugins/PopupPlus.txt b/langpacks/belarusian/Plugins/PopupPlus.txt
index 6ab8904eb5..70a3ad86c6 100644
--- a/langpacks/belarusian/Plugins/PopupPlus.txt
+++ b/langpacks/belarusian/Plugins/PopupPlus.txt
@@ -1,6 +1,6 @@
 #muuid {26a9125d-7863-4e01-af0e-d14ef95c5054}
 ;============================================================
-;  File: Popup.dll
+;  File: PopupPlus.dll
 ;  Plugin: Popup plus
 ;  Version: 2.1.1.15
 ;  Authors: MPK, Merlin_de (Luca Santarelli, Victor Pavlychko)
@@ -82,7 +82,7 @@ History++ для гісторыі вокнаў
 Прагляд
 [Download more skins]
 Запампаваць скіны
-[Popup History]
+[Popup history]
 Гісторыя успл.вокнаў
 [Desktop]
 Працоўны стол
@@ -263,15 +263,11 @@ History++ для гісторыі вокнаў
 [Avatar border]
 Мяжа аватара
 ;file \plugins\Popup\src\history.cpp
-[Popup History is disabled]
+[Popup history is disabled]
 Гісторыя ўсплывальных вокнаў адключана
-[Popup History message]
+[Popup history message]
 Гісторыя ўсплывальных вокнаў
 ;file \plugins\Popup\src\icons.cpp
-[Popups are enabled]
-Вокны ўключаны
-[Popups are disabled]
-Вокны выключаны
 [With "favorite" overlay]
 З накладаннем "Абраны"
 [With "fullscreen" overlay]
@@ -309,13 +305,13 @@ History++ для гісторыі вокнаў
 Кантакты
 [Advanced]
 Дадаткова
-[Toggle Popups]
-Укл/Выкл Вокны
-[Enable Popups]
-Уключыць Вокны
-[Disable Popups]
-Адключыць Вокны
-[Popup Plus]
+[Toggle popups]
+Укл/Выкл вокны
+[Enable popups]
+Уключыць вокны
+[Disable popups]
+Адключыць вокны
+[Popup plus]
 Вокны
 [Error: I could not register the Popup Window class.\r\nThe plugin will not operate.]
 
diff --git a/langpacks/belarusian/Plugins/ProxySwitch.txt b/langpacks/belarusian/Plugins/ProxySwitch.txt
index f89d27bc12..e551bc0085 100644
--- a/langpacks/belarusian/Plugins/ProxySwitch.txt
+++ b/langpacks/belarusian/Plugins/ProxySwitch.txt
@@ -29,7 +29,7 @@
 [Popup options]
 
 [Enable popups]
-
+Уключыць усплывальныя вокны
 [Text color]
 Колер тэксту
 [Background color]
diff --git a/langpacks/belarusian/Plugins/SkypeWeb.txt b/langpacks/belarusian/Plugins/SkypeWeb.txt
index 001d454489..e97422d872 100644
--- a/langpacks/belarusian/Plugins/SkypeWeb.txt
+++ b/langpacks/belarusian/Plugins/SkypeWeb.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: SkypeWeb.dll
 ;  Plugin: Skype protocol (Web)
-;  Version: 0.12.3.1
+;  Version: 0.12.3.3
 ;  Authors: Miranda NG team
 ;============================================================
 [Skype protocol support for Miranda NG. Based on new Skype for Web.]
diff --git a/langpacks/belarusian/Plugins/SmileyAdd.txt b/langpacks/belarusian/Plugins/SmileyAdd.txt
index efffb50520..b116ffc643 100644
--- a/langpacks/belarusian/Plugins/SmileyAdd.txt
+++ b/langpacks/belarusian/Plugins/SmileyAdd.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: SmileyAdd.dll
 ;  Plugin: SmileyAdd
-;  Version: 0.3.1.0
+;  Version: 0.3.1.1
 ;  Authors: Peacow, nightwish, bid, borkra
 ;============================================================
 [Smiley support for Miranda NG.]
diff --git a/langpacks/belarusian/Plugins/StatusManager.txt b/langpacks/belarusian/Plugins/StatusManager.txt
index 92fe4bd52d..7a42ceb138 100644
--- a/langpacks/belarusian/Plugins/StatusManager.txt
+++ b/langpacks/belarusian/Plugins/StatusManager.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: StatusManager.dll
 ;  Plugin: Status manager
-;  Version: 1.2.0.4
+;  Version: 1.2.0.5
 ;  Authors: P Boon
 ;============================================================
 [A connection checker and auto away module. Also allows you to define the status Miranda should set on startup, configurable per protocol.]
diff --git a/langpacks/belarusian/Plugins/TabSRMM.txt b/langpacks/belarusian/Plugins/TabSRMM.txt
index a765274261..efa5c21ce7 100644
--- a/langpacks/belarusian/Plugins/TabSRMM.txt
+++ b/langpacks/belarusian/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: TabSRMM.dll
 ;  Plugin: TabSRMM
-;  Version: 3.5.0.12
+;  Version: 3.5.0.13
 ;  Authors: The Miranda developers team and contributors
 ;============================================================
 [IM and group chat module for Miranda NG.]
@@ -178,8 +178,6 @@
 Памылкі
 [Use the message log color theme for group chat popups]
 Выкарыстоўваць колеры лога паведамленняў для успл. вокнаў чатаў
-[No compatible popup plugin was found. The event notification\nsystem is not available.]
-Плагін усплывальных вокнаў не знойдзены. Абвесткі недасяжныя.
 [Dialog]
 Гутарка
 [Cancel]
@@ -1697,10 +1695,6 @@ UID: %s (Shift+клік -> капіяваць у буфер)\nКлік - Інф�
 Выключана (выкарыстоўваецца як адбітак)
 [Feature enabled (used as overlay)]
 Уключана (выкарыстоўваецца як адбітак)
-[Enable typing notification]
-
-[Disable typing notification]
-
 ;file \plugins\TabSRMM\src\msgs.h
 [Message windows - IM]
 Вокны паведамленняў - IM
@@ -1984,10 +1978,10 @@ UID: %s (Shift+клік -> капіяваць у буфер)\nКлік - Інф�
 Выключыць абвесткі пра набор тэксту
 [Enable &typing notification]
 Уключыць абвесткі пра набор тэксту
-[...is typing a message.]
-... набірае тэкст.
 [...has stopped typing.]
 ... скончыў(ла) набіраць тэкст.
+[...is typing a message.]
+... набірае тэкст.
 [Contact started typing]
 Кантакт пачаў набор паведамлення
 [Contact stopped typing]
diff --git a/langpacks/belarusian/Plugins/UInfoEx.txt b/langpacks/belarusian/Plugins/UInfoEx.txt
index cf85694c94..300ebb11a8 100644
--- a/langpacks/belarusian/Plugins/UInfoEx.txt
+++ b/langpacks/belarusian/Plugins/UInfoEx.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: UInfoEx.dll
 ;  Plugin: User info ext
-;  Version: 0.8.5.1
+;  Version: 0.8.5.2
 ;  Authors: DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
 ;============================================================
 [Extended UserInfo module for Miranda NG. Provides interface to edit all contact information.]
@@ -1110,12 +1110,10 @@ Web Дызайн
 \[b]%s (%S)...[/b]\n%d кантактаў засталося
 [Abort Refreshing Contact Details]
 Скасаваць абнаўленне дадзеных кантактаў
-[Do you want to cancel the current refresh procedure?]
-Вы сапраўды хочаце скасаваць абнаўленне дадзеных?
 [Miranda must be online for refreshing contact information!]
 Для абнаўлення конты павінны быць далучаныя!
-[The function caused an exception!]
-
+[Do you want to cancel the current refresh procedure?]
+Вы сапраўды хочаце скасаваць абнаўленне дадзеных?
 ;file \plugins\UserInfoEx\src\svc_reminder.cpp
 [%s has %s today.]
 %s святкуе %s сёння.
@@ -1216,16 +1214,8 @@ INI файл "%s"\nнельга адчыніць для чытання.
 ;file \plugins\UserInfoEx\src\ex_import\svc_ExImXML.cpp
 [Can't create xml file!\n%S]
 Немагчыма стварыць XML файл!\n%S
-[Export took %f ms]
-
 [Contact: %s (%S)]
 Кантакт: %s (%S)
-[Importing %s caused error %d]
-Імпарт %s вызваў памылку %d
-[Loading contact %s from xml failed with error %d]
-Памылка %d пры загрузцы кантакта %s з xml
-[Importing Owner caused error %d]
-Імпарт уладальніка вызваў памылку %d
 [Parser is unable to load XMLCard "%s"\nError: %d\nDescription: %s]
 Немагчыма загрузіць XML картку "%s"\nПамылка:%d\nАпісанне:%s
 [The selected file is no valid XMLCard]
@@ -1238,12 +1228,8 @@ INI файл "%s"\nнельга адчыніць для чытання.
 Інфармацыя Уладальніка паспяхова імпартаваная.
 [Selected XMLCard does not contain an owner contact!]
 Абраная XML картка ня мае інфармацыі пра ўладальніка!
-[Import took %f ms]
-Імпарт заняў %f ms
 [added contacts: %u / %u\nadded settings: %u / %u\nadded events %u / %u\nduplicated events: %u]
 Дададзена кантактаў: %u / %u\nДададзена налад: %u / %u\nДададзена падзей: %u / %u\nДубліруючых падзей: %u
-[FATAL: An exception was thrown while importing contacts from xmlCard!]
-Фатальна: Памылка пры імпартаванні кантактаў з xml карткі!
 ;file \plugins\UserInfoEx\src\Flags\svc_flags.cpp
 [Flags (UInfoEx)]
 Сцягі (UInfoEx)
diff --git a/langpacks/belarusian/Plugins/VKontakte.txt b/langpacks/belarusian/Plugins/VKontakte.txt
index 7b6b53f2a5..25571daf67 100644
--- a/langpacks/belarusian/Plugins/VKontakte.txt
+++ b/langpacks/belarusian/Plugins/VKontakte.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: VKontakte.dll
 ;  Plugin: VKontakte protocol
-;  Version: 0.1.8.1
+;  Version: 0.1.9.0
 ;  Authors: Miranda NG team
 ;============================================================
 [VKontakte protocol support for Miranda NG.]
diff --git a/langpacks/belarusian/Plugins/Weather.txt b/langpacks/belarusian/Plugins/Weather.txt
index ef90b92f2f..e956537cb6 100644
--- a/langpacks/belarusian/Plugins/Weather.txt
+++ b/langpacks/belarusian/Plugins/Weather.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Retrieves weather information and displays it in your contact list.]
 Запыт і адлюстраванне інфармацыі пра надвор'е ў вашым спісе кантактаў.
-;file \plugins\Weather\res\resource.rc
+;file \protocols\Weather\res\resource.rc
 [Update]
 Абнавіць
 [Brief Info]
@@ -254,7 +254,7 @@
 Да старых
 [To default]
 Па змаўчанні
-;file \plugins\Weather\src\stdafx.h
+;file \protocols\Weather\src\stdafx.h
 [N/A]
 Недаступны
 [Invalid ID format, missing "/" (10)]
@@ -337,7 +337,7 @@ INI файл надвор'я для гэтай станцыі не знойдз�
 URL поўнага прагнозу надвор'я не ўсталяваны. Вы можаце ўсталяваць яго ў наладах.
 [The URL for weather map has not been set. You can set it from the Edit Settings dialog.]
 Не паказаны URL для карты надвор'я. Вы можаце паказаць яго ў меню Налады.
-;file \plugins\Weather\src\weather.cpp
+;file \protocols\Weather\src\weather.cpp
 [Enable/disable auto update]
 
 [Auto Update Enabled]
@@ -348,7 +348,7 @@ URL поўнага прагнозу надвор'я не ўсталяваны. �
 Надвор'е змянілася
 [Alert Issued]
 Заўвага
-;file \plugins\Weather\src\weather_addstn.cpp
+;file \protocols\Weather\src\weather_addstn.cpp
 [Current weather information for %s.]
 Бягучая інфармацыя пра надвор'е для %s
 [%s is now the default weather station]
@@ -361,7 +361,7 @@ URL поўнага прагнозу надвор'я не ўсталяваны. �
 <Увядзіце назву горада>
 [<Enter station ID here>]
 <Увядзіце ID гарады>
-;file \plugins\Weather\src\weather_contacts.cpp
+;file \protocols\Weather\src\weather_contacts.cpp
 [Weather condition was not logged.]
 Лог надвор'я не вядзецца.
 [Get city name from ID]
@@ -378,7 +378,7 @@ URL поўнага прагнозу надвор'я не ўсталяваны. �
 Тэкставыя файлы
 [All Files]
 Усе файлы
-;file \plugins\Weather\src\weather_conv.cpp
+;file \protocols\Weather\src\weather_conv.cpp
 [mb]
 мбар
 [in]
@@ -391,15 +391,15 @@ URL поўнага прагнозу надвор'я не ўсталяваны. �
 <Памылка>
 [HTTP Error %i]
 Памылка HTTP %i
-;file \plugins\Weather\src\weather_data.cpp
+;file \protocols\Weather\src\weather_data.cpp
 [<Enter city name here>]
 <Увядзіце назву горада>
 [Error when obtaining data: %s]
 Памылка пры атрыманні дадзеных: %s
-;file \plugins\Weather\src\weather_http.cpp
+;file \protocols\Weather\src\weather_http.cpp
 [Weather HTTP connections]
 HTTP далучэнне Weather
-;file \plugins\Weather\src\weather_icons.cpp
+;file \protocols\Weather\src\weather_icons.cpp
 [Protocol icon]
 Абразок конту
 [Update Disabled]
@@ -420,7 +420,7 @@ HTTP далучэнне Weather
 Без вокнаў
 [Edit Settings]
 Змяніць налады
-;file \plugins\Weather\src\weather_info.cpp
+;file \protocols\Weather\src\weather_info.cpp
 [Name]
 Імя
 [Author]
@@ -459,21 +459,21 @@ HTTP далучэнне Weather
 байт
 [Description:]
 Апісанне:
-;file \plugins\Weather\src\weather_ini.cpp
+;file \protocols\Weather\src\weather_ini.cpp
 [All update data has been reloaded.]
 Усе абноўленыя дадзеныя перазагружаны.
 [Invalid ini format for: %s]
 Уласны фармат ini для: %s
 [No update data file is found. Please check your Plugins\\Weather directory.]
 Не знойдзены файл абнаўлення. Калі ласка, праверце тэчку Plugins\\Weather.
-;file \plugins\Weather\src\weather_mwin.cpp
+;file \protocols\Weather\src\weather_mwin.cpp
 [Frame Font]
 Шрыфт фрэйма
 [Frame Title Font]
 Шрыфт загалоўка фрэйма
 [Frame Background]
 Фон фрэйма
-;file \plugins\Weather\src\weather_opt.cpp
+;file \protocols\Weather\src\weather_opt.cpp
 [Weather Protocol Text Preview]
 Прагляд конту надвор'я
 [Network]
@@ -484,8 +484,8 @@ HTTP далучэнне Weather
 Паказваць
 [Popups]
 Усплывальныя вокны
-;file \plugins\Weather\src\weather_popup.cpp
-;file \plugins\Weather\src\weather_svcs.cpp
+;file \protocols\Weather\src\weather_popup.cpp
+;file \protocols\Weather\src\weather_svcs.cpp
 [Station ID]
 ID гарады
 [Disable &weather notification]
@@ -512,10 +512,10 @@ ID гарады
 Напамінак пра надвор'е
 [Display in a frame]
 Паказваць у фрэйме
-;file \plugins\Weather\src\weather_update.cpp
+;file \protocols\Weather\src\weather_update.cpp
 [Unable to retrieve weather information for %s]
 Немагчыма знайсці інфармацыю пра надвор'е для %s
-;file \plugins\Weather\src\weather_userinfo.cpp
+;file \protocols\Weather\src\weather_userinfo.cpp
 [Variable]
 Зменная
 [Information]
diff --git a/langpacks/belarusian/Plugins/WebView.txt b/langpacks/belarusian/Plugins/WebView.txt
index 6580434f2b..73370d2a9f 100644
--- a/langpacks/belarusian/Plugins/WebView.txt
+++ b/langpacks/belarusian/Plugins/WebView.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Adds web pages as contacts to your contact list and can display text and/or issue change alerts from those pages in a window.]
 Дадае сайты ў спіс кантактаў і можа адлюстроўваць тэкст ці/або абвяшчае, калі ёсць змены на гэтых старонках.
-;file \plugins\WebView\res\webview.rc
+;file \protocols\WebView\res\webview.rc
 [Webview]
 
 [Update data every]
@@ -180,7 +180,7 @@
 &Вылучыць усё
 [C&lear all]
 
-;file \plugins\WebView\src\main.cpp
+;file \protocols\WebView\src\main.cpp
 [Alert event]
 
 [Auto update disabled]
@@ -207,14 +207,14 @@
 
 [Stop data processing]
 
-;file \plugins\WebView\src\webview.cpp
+;file \protocols\WebView\src\webview.cpp
 [All Webview sites have been updated.]
 
 [Network]
 Сеціва
 [Popups]
 Усплывальныя вокны
-;file \plugins\WebView\src\webview_alerts.cpp
+;file \protocols\WebView\src\webview_alerts.cpp
 [Cannot write to file]
 
 [Last updated on]
@@ -245,7 +245,7 @@
 
 [Loaded from cache]
 
-;file \plugins\WebView\src\webview_datawnd.cpp
+;file \protocols\WebView\src\webview_datawnd.cpp
 [ERROR: You have two or more Webview contacts with the same URL and contact name.]
 
 [Alert options]
@@ -258,7 +258,7 @@
 
 [Disable stick to the front]
 
-;file \plugins\WebView\src\webview_getdata.cpp
+;file \protocols\WebView\src\webview_getdata.cpp
 [URL not supplied]
 
 [Download in progress, please wait...]
@@ -305,7 +305,7 @@
 
 [Alert test conditions not met; press the refresh button to view content.]
 
-;file \plugins\WebView\src\webview_opts.cpp
+;file \protocols\WebView\src\webview_opts.cpp
 [No whitespace removal]
 
 [Minimal level of whitespace removal]
@@ -342,7 +342,7 @@
 
 [Invalid symbol present in contact name.]
 
-;file \plugins\WebView\src\webview_services.cpp
+;file \protocols\WebView\src\webview_services.cpp
 [Cache folder does not exist.]
 
 [Missing "psite.bat" file.]
diff --git a/langpacks/belarusian/Plugins/WhoUsesMyFiles.txt b/langpacks/belarusian/Plugins/WhoUsesMyFiles.txt
index ba8b11c38c..c8492e98fa 100644
--- a/langpacks/belarusian/Plugins/WhoUsesMyFiles.txt
+++ b/langpacks/belarusian/Plugins/WhoUsesMyFiles.txt
@@ -55,12 +55,10 @@ WUMF: Бягучыя злучэнні
 [Show current connections]
 Паказаць злучэнні
 ;file \plugins\WhoUsesMyFiles\src\options.cpp
-[Popup plugin not found!]
-Popup плагін не знойдзены!
-[Error]
-Памылка
 [Common Dialog Error 0x%lx]
 Памылкаr 0x%lx
+[Error]
+Памылка
 [Not implemented yet...]
 Пакуль не рэалізавана...
 [Who uses my files]
diff --git a/langpacks/belarusian/Plugins/YAMN.txt b/langpacks/belarusian/Plugins/YAMN.txt
index b9549591b8..2e4ce5040d 100644
--- a/langpacks/belarusian/Plugins/YAMN.txt
+++ b/langpacks/belarusian/Plugins/YAMN.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Mail notifier and browser for Miranda NG. Included POP3 protocol.]
 Абвесткі і прагляд новай пошты для Miranda NG. Убудаваны пратакол POP3.
-;file \plugins\YAMN\res\YAMN.rc
+;file \protocols\YAMN\res\YAMN.rc
 [Installed plugins]
 Усталяваныя плагіны
 [Version:]
@@ -156,7 +156,7 @@
 Колер фону
 [Text color]
 Колер тэксту
-;file \plugins\YAMN\src\main.cpp
+;file \protocols\YAMN\src\main.cpp
 [Check &mail (All Account)]
 Праверыць пошту
 [Check &mail (This Account)]
@@ -171,17 +171,17 @@
 Праверыць пошту
 [Connect Fail]
 Абрыў злучэння
-;file \plugins\YAMN\src\main.h
+;file \protocols\YAMN\src\main.h
 [New mail message]
 Новы ліст
 [Connect failed]
 Збой далучэння
-;file \plugins\YAMN\src\services.cpp
+;file \protocols\YAMN\src\services.cpp
 [Nick]
 Мянушка
 [No new mail message]
 Няма новых лістоў
-;file \plugins\YAMN\src\browser\badconnect.cpp
+;file \protocols\YAMN\src\browser\badconnect.cpp
 [%s - connection error]
 %s - памылка злучэння
 [An error occurred. Error code: %d]
@@ -190,7 +190,7 @@
 Невядомая памылка
 [ - connection error]
  - памылка далучэння
-;file \plugins\YAMN\src\browser\mailbrowser.cpp
+;file \protocols\YAMN\src\browser\mailbrowser.cpp
 [%s - %d new mail messages, %d total]
 %s - %d новых лістоў, %d усяго
 [%s : %d new mail message(s), %d total]
@@ -229,15 +229,15 @@
 Выдаліць %d лістоў?
 [Delete confirmation]
 Пацверджанне выдалення
-;file \plugins\YAMN\src\mails\mime.cpp
+;file \protocols\YAMN\src\mails\mime.cpp
 [Translate header error]
 Перавесці памылак загалоўка
 [Part]
 Частка
-;file \plugins\YAMN\src\proto\netlib.cpp
+;file \protocols\YAMN\src\proto\netlib.cpp
 [%s connection]
 Злучэнне %s
-;file \plugins\YAMN\src\proto\pop3\pop3comm.cpp
+;file \protocols\YAMN\src\proto\pop3\pop3comm.cpp
 [Disconnected]
 Адключаны
 [POP3 protocol (internal)]
@@ -314,7 +314,7 @@ OpenSSL не загружаны
 Не магу прачытаць SSL дадзеныя.
 [Error %d-%d-%d-%d:]
 Памылка %d-%d-%d-%d:
-;file \plugins\YAMN\src\proto\pop3\pop3opt.cpp
+;file \protocols\YAMN\src\proto\pop3\pop3opt.cpp
 [Network]
 Сеціва
 [Accounts]
diff --git a/langpacks/belarusian/Untranslated/=CORE=.txt b/langpacks/belarusian/Untranslated/=CORE=.txt
index 463188013d..8a2a61345b 100644
--- a/langpacks/belarusian/Untranslated/=CORE=.txt
+++ b/langpacks/belarusian/Untranslated/=CORE=.txt
@@ -5,6 +5,8 @@
 [Google Maps]
 [Google Translate]
 [This file transfer has been canceled by the other side]
+[The quick brown fox jumped over the lazy dog.]
+[Thequickbrownfoxjumpedoverthelazydog.]
 [Actively searching]
 [It's complicated]
 [In a civil union]
diff --git a/langpacks/belarusian/Untranslated/Actman.txt b/langpacks/belarusian/Untranslated/Actman.txt
index 1ad8a19a6f..c191f58463 100644
--- a/langpacks/belarusian/Untranslated/Actman.txt
+++ b/langpacks/belarusian/Untranslated/Actman.txt
@@ -77,11 +77,11 @@
 [with confirmation]
 [without confirmation]
 [Empty updater download folder]
-[Popup Plus (popup.dll) latest YAPP (yapp.dll)]
-[Enables or disables Popup windows]
-[YAPP or Popup]
+[Popup plus (PopupPlus.dll) latest StdPopup (StdPopup.dll)]
+[Enables or disables popup windows]
+[StdPopup or Popup plus]
 [Unicode Text]
-[Enables or disables Popup windows (maybe deprecated)]
+[Enables or disables popup windows (maybe deprecated)]
 [result of protocol service call]
 [Send a general request through the protocol chain for a contact]
 [str, account name]
diff --git a/langpacks/belarusian/Untranslated/Clist_modern.txt b/langpacks/belarusian/Untranslated/Clist_modern.txt
index 67f51bed89..76824a2eb1 100644
--- a/langpacks/belarusian/Untranslated/Clist_modern.txt
+++ b/langpacks/belarusian/Untranslated/Clist_modern.txt
@@ -8,5 +8,6 @@
 [For different statuses]
 [Cycle period, seconds]
 [Max size (pixels):]
+[Last online]
 [Show avatar]
 [Hide avatar]
diff --git a/langpacks/belarusian/Untranslated/CurrencyRates.txt b/langpacks/belarusian/Untranslated/CurrencyRates.txt
index 71eb07a636..812f30ec85 100644
--- a/langpacks/belarusian/Untranslated/CurrencyRates.txt
+++ b/langpacks/belarusian/Untranslated/CurrencyRates.txt
@@ -1,3 +1,4 @@
+[&Personal key:]
 [There is nothing to show]
 [Enter integer value between 1 and 60.]
 [Enter integer value between 1 and 24.]
@@ -7,6 +8,6 @@
 [Enable/Disable Currency Rates Auto Update]
 [Currency Rates Auto Update Enabled]
 [Currency Rates Auto Update Disabled]
+[This plugin requires a personal key. Press Yes to obtain it at the site and then enter the result in the Options dialog, otherwise this plugin will fail.]
 [Currency Rate Section]
-[Miranda could not load CurrencyRates plugin. XML parser is missing.]
 [Miranda could not load CurrencyRates plugin. Microsoft HTML parser is missing.]
diff --git a/langpacks/belarusian/Untranslated/Db_autobackups.txt b/langpacks/belarusian/Untranslated/Db_autobackups.txt
index 9d54e76eb4..66fe09efae 100644
--- a/langpacks/belarusian/Untranslated/Db_autobackups.txt
+++ b/langpacks/belarusian/Untranslated/Db_autobackups.txt
@@ -2,4 +2,6 @@
 [Backup profile folder]
 [Use CloudFile]
 [Uploading to cloud failed]
+[Enable &AutoBackups notification]
+[Disable &AutoBackups notification]
 [path to folder containing Miranda profiles]
diff --git a/langpacks/belarusian/Untranslated/Discord.txt b/langpacks/belarusian/Untranslated/Discord.txt
index b67e394174..9e2dec3d33 100644
--- a/langpacks/belarusian/Untranslated/Discord.txt
+++ b/langpacks/belarusian/Untranslated/Discord.txt
@@ -1,6 +1,7 @@
 [Discord support for Miranda NG.]
+[Enable group chats]
 [Do not open chat windows on creation]
-[Use subgroups for guild's channels (requires restart)]
+[Use subgroups for server channels (requires restart)]
 [edited at]
 [Channel control]
 [Change &topic]
@@ -13,11 +14,15 @@
 [Enter channel name]
 [Enter invitation code you received]
 [Do you really want to leave the guild?]
+[Disable sync]
+[Enable sync]
 [Join guild]
 [Copy my Discord ID]
 [Leave guild]
 [Create new channel]
 [Copy Discord ID]
+[Enable guild sync]
+[Load server history]
 [%s gateway connection]
 [Protocol is offline or user isn't authorized yet]
 [Attachment]
diff --git a/langpacks/belarusian/Untranslated/Facebook.txt b/langpacks/belarusian/Untranslated/Facebook.txt
index 181ca9738d..7c860e44fd 100644
--- a/langpacks/belarusian/Untranslated/Facebook.txt
+++ b/langpacks/belarusian/Untranslated/Facebook.txt
@@ -26,9 +26,9 @@
 [&Destroy chat session]
 [Delete conversation]
 [This will permanently delete the conversation history]
-[Former]
 [Myself]
 [Friend]
+[Former]
 [%s and more (%d)]
 [You entered too many invalid verification codes. Plugin will disconnect.]
 [You entered wrong verification code. Try it again.]
diff --git a/langpacks/belarusian/Untranslated/ICQ.txt b/langpacks/belarusian/Untranslated/ICQ.txt
index cfa9cbc8c4..db9df32399 100644
--- a/langpacks/belarusian/Untranslated/ICQ.txt
+++ b/langpacks/belarusian/Untranslated/ICQ.txt
@@ -1,6 +1,8 @@
 [UIN/e-mail:]
 [Sign in/sign up using phone]
 [Do not open chat windows on creation]
+[Use tray icon notifications]
+[Launch mailbox in a browser on click]
 [If a contact goes Offline, set this status instead and cache it for given timeout in seconds (0 - disabled)]
 [After that, set this status to a contact and move it offline after specified timeout in seconds (0 - disabled)]
 [Send group chat invitation]
@@ -15,7 +17,10 @@
 [&Invite a user]
 [&Leave/destroy chat]
 [Do you really want to remove it from ignore list?]
+[E-mail notification]
 [Remove Ignore]
+[You received e-mail from %s: %s]
+[You have %d unread emails]
 [Synchronize server groups]
 [Edit ignore list]
 [UIN/e-mail/phone]
diff --git a/langpacks/belarusian/Untranslated/Jabber.txt b/langpacks/belarusian/Untranslated/Jabber.txt
index cb9f337b8c..5515859c27 100644
--- a/langpacks/belarusian/Untranslated/Jabber.txt
+++ b/langpacks/belarusian/Untranslated/Jabber.txt
@@ -1,4 +1,5 @@
 [Use Domain Login]
+[Filter:]
 [Supports chat history retrieving]
 [Supports chat history management]
 [Receives information about OMEMO devices]
@@ -6,6 +7,7 @@
 [Invite Users to\n%s]
 [Outgoing XML parsing error]
 [Please specify group chat directory first.]
+[Authentication]
 [Do you want to create OMEMO session with new device:]
 [OMEMO: New session]
 [Receive conversations from other devices (XEP-0280)]
@@ -17,6 +19,8 @@
 [League Of Legends (Oceania)]
 [League Of Legends (US)]
 [No valid OMEMO session exists]
+[Registration canceled]
+[Last activity]
 [<advanced status slot>]
 [I'm happy Miranda NG user. Get it at https://miranda-ng.org/.]
 [/me slaps %s around a bit with a large trout]
diff --git a/langpacks/belarusian/Untranslated/NotesReminders.txt b/langpacks/belarusian/Untranslated/NotesReminders.txt
index feac0a85d3..109f03bcb0 100644
--- a/langpacks/belarusian/Untranslated/NotesReminders.txt
+++ b/langpacks/belarusian/Untranslated/NotesReminders.txt
@@ -1,3 +1,4 @@
+[Repeat each day]
 [Maroon]
 [Olive]
 [Navy]
diff --git a/langpacks/belarusian/Untranslated/ProxySwitch.txt b/langpacks/belarusian/Untranslated/ProxySwitch.txt
index 708700807f..c9f75bed73 100644
--- a/langpacks/belarusian/Untranslated/ProxySwitch.txt
+++ b/langpacks/belarusian/Untranslated/ProxySwitch.txt
@@ -8,7 +8,6 @@
 [Reconnect if IP address changes]
 [Hide interfaces]
 [Popup options]
-[Enable popups]
 [Use default popup colors]
 [Show proxy status on change]
 [Restart of Miranda NG is required.]
diff --git a/langpacks/belarusian/Untranslated/TabSRMM.txt b/langpacks/belarusian/Untranslated/TabSRMM.txt
index dbb503819f..62ff9afb6d 100644
--- a/langpacks/belarusian/Untranslated/TabSRMM.txt
+++ b/langpacks/belarusian/Untranslated/TabSRMM.txt
@@ -7,8 +7,6 @@
 [will return parsed string %miranda_userdata%\\Logs]
 [Show send menu]
 [Show protocol menu]
-[Enable typing notification]
-[Disable typing notification]
 [Sent OK]
 [Suspended]
 [Message In]
diff --git a/langpacks/belarusian/Untranslated/UInfoEx.txt b/langpacks/belarusian/Untranslated/UInfoEx.txt
index 32dc88a359..5b2e82e948 100644
--- a/langpacks/belarusian/Untranslated/UInfoEx.txt
+++ b/langpacks/belarusian/Untranslated/UInfoEx.txt
@@ -10,10 +10,8 @@
 [In a civil union]
 [E-mail (UInfoEx)]
 [Phone (UInfoEx)]
-[The function caused an exception!]
 [He/she has the following anniversaries:]
 [He has the following anniversaries:]
 [She has the following anniversaries:]
 [%d. %s in %d days]
 [Reminders]
-[Export took %f ms]
diff --git a/langpacks/bulgarian/=CORE=.txt b/langpacks/bulgarian/=CORE=.txt
index 188ebb2287..ebfe46a95d 100644
--- a/langpacks/bulgarian/=CORE=.txt
+++ b/langpacks/bulgarian/=CORE=.txt
@@ -570,6 +570,55 @@ Popup за приставката StdMsg
 Поставяне и изпращане
 [Delete]
 Изтриване
+;file \src\core\stdpopup\res\resource.rc
+[Popup history]
+Рopup история
+[Case sensitive]
+
+[Default timeout]
+Стандартно времетраене
+[Never timeout]
+Безкрайно
+[Set timeout:]
+Задаване (сек):
+[Width:]
+Ширина:
+[Maximum height:]
+Макс. височина:
+[Opacity (%):]
+Плътност (%):
+[Border]
+Рамка
+[Round corners (window)]
+Закръглени ъгли (на прозореца)
+[Preview]
+Образец
+[Transparent background]
+Прозрачен фон
+[Layout]
+Изглед
+[Avatar size:]
+Аватар (размер):
+[Disable when]
+Изключване, когато
+[Global hover]
+
+[Sidebar width:]
+Странична лента:
+[Text indent:]
+Отстъп на текста:
+[Padding:]
+Отстъп:
+[Round corners (avatar)]
+Закръглени ъгли (на аватара)
+[Text color:]
+Цвят на текста:
+[Background color:]
+Цвят на фона:
+[Set timeout]
+Задаване на времетраене
+[Timeout value (0 = default):]
+Времетраене (0=стандарт):
 ;file \src\core\stduihist\res\resource.rc
 [Find]
 Намери
@@ -1749,6 +1798,88 @@ Popups за изобразяване
 ;file \src\core\stdmsg\src\msgtimedout.cpp
 [An unknown error has occurred.]
 Възникна непозната грешка.
+;file \src\core\stdpopup\src\icons.cpp
+[Popups are enabled]
+Popups са включени
+[Popups are disabled]
+Popups са изключени
+;file \src\core\stdpopup\src\notify_imp.cpp
+;file \src\core\stdpopup\src\options.cpp
+[Example]
+Пример
+[The quick brown fox jumped over the lazy dog.]
+Бързата кафява лисица прескочи мързеливото куче.
+[Example With a Long Title]
+Пример с дълго заглавие
+[Thequickbrownfoxjumpedoverthelazydog.]
+Бързата.кафява.лисица.прескочи.мързеливото.куче.
+[An avatar.]
+Аватар.
+[Bottom right]
+Долу вдясно
+[Bottom left]
+Долу вляво
+[Top right]
+Горе вдясно
+[Top left]
+Горе вляво
+[Icon on left]
+Икона вляво
+[Icon on right]
+Икона вдясно
+[No time]
+Без час
+[Time on left]
+Час вляво
+[Time on right]
+Час вдясно
+[Time above avatar]
+Час над аватара
+[No avatar]
+Няма аватар
+[Left avatar]
+Аватар отляво
+[Right avatar]
+Аватар отдясно
+[Full-screen app running]
+Приложение на цял екран
+[No animate]
+Без анимиране
+[Horizontal animate]
+Хоризонтално анимиране
+[Vertical animate]
+Вертикално анимиране
+[You cannot set a default timeout of 0.\nValue has been reset.]
+Времетраенето не може да бъде 0.\nСтойността е нулирана.
+[Settings]
+Настройки
+[Classes]
+Класове
+;file \src\core\stdpopup\src\services.cpp
+[Disable popups]
+Изключване на Popups
+[Enable popups]
+Включване на Popups
+;file \src\core\stdpopup\src\yapp.cpp
+[Toggle popups]
+Вкл./Изкл. на Popups
+[First line]
+Първи ред
+[Second line]
+Втори ред
+[Time]
+Час
+[Sidebar]
+Странична лента
+[Title underline]
+Подчертаване на заглавието
+;file \src\core\stdpopup\src\yapp_history_dlg.cpp
+[Copy title to clipboard]
+Копиране на заглавието в клипборда
+[Copy message to clipboard]
+Копиране на съобщението в клипборда
+[Copy timestamp to clipboard]
+Копиране на времевата марка в клипборда
 ;file \src\core\stdssl\src\netlibssl.cpp
 [Client cannot decode host message. Possible causes: host does not support SSL or requires not existing security package]
 
@@ -2631,8 +2762,6 @@ URL
 Unicode приставка
 [ANSI plugin]
 ANSI приставка
-[Unused]
-
 [Show/Hide]
 Показване/Скриване
 [Exit]
@@ -2647,6 +2776,8 @@ ANSI приставка
 Включено
 [Off]
 Изкл.
+[Unused]
+
 [Frames]
 Рамки
 [Add group]
diff --git a/langpacks/bulgarian/Plugins/Actman.txt b/langpacks/bulgarian/Plugins/Actman.txt
index e729e90d1a..a7ce26e95a 100644
--- a/langpacks/bulgarian/Plugins/Actman.txt
+++ b/langpacks/bulgarian/Plugins/Actman.txt
@@ -677,20 +677,20 @@ Ansi текст
 без потвърждение
 [Empty updater download folder]
 Изпразване папката за сваляния на Updater
-[Popup Plus (popup.dll) latest YAPP (yapp.dll)]
-Popup Plus (popup.dll) посл. YAPP (yapp.dll)
-[Enables or disables Popup windows]
-Включва или изключва Popup прозорците
+[Popup plus (PopupPlus.dll) latest StdPopup (StdPopup.dll)]
+Popup plus (PopupPlus.dll) посл. StdPopup (StdPopup.dll)
+[Enables or disables popup windows]
+Включва или изключва popup прозорците
 [Notify]
 Уведомяване
-[YAPP or Popup]
-YAPP или Popup
+[StdPopup or Popup plus]
+StdPopup или Popup plus
 [Popup window]
 Рopup прозорец
 [Unicode Text]
 Unicode текст
-[Enables or disables Popup windows (maybe deprecated)]
-Включва или изключва Popup прозорците (стар метод)
+[Enables or disables popup windows (maybe deprecated)]
+Включва или изключва popup прозорците (стар метод)
 [result of protocol service call]
 
 [Send a general request through the protocol chain for a contact]
diff --git a/langpacks/bulgarian/Plugins/ChangeKeyboardLayout.txt b/langpacks/bulgarian/Plugins/ChangeKeyboardLayout.txt
index a2f60ec412..977c37e655 100644
--- a/langpacks/bulgarian/Plugins/ChangeKeyboardLayout.txt
+++ b/langpacks/bulgarian/Plugins/ChangeKeyboardLayout.txt
@@ -82,8 +82,6 @@
 [Popups]
 Рopups
 ;file \plugins\ChangeKeyboardLayout\src\main.cpp
-[Popup]
-Рopup
 ;file \plugins\ChangeKeyboardLayout\src\stdafx.h
 [ChangeKeyboardLayout]
 ChangeKeyboardLayout
diff --git a/langpacks/bulgarian/Plugins/Clist_modern.txt b/langpacks/bulgarian/Plugins/Clist_modern.txt
index 2bc2502ffd..8b95a40750 100644
--- a/langpacks/bulgarian/Plugins/Clist_modern.txt
+++ b/langpacks/bulgarian/Plugins/Clist_modern.txt
@@ -747,6 +747,8 @@ Modern contact list
 Име на акаунта
 [Rate]
 Оценка
+[Last online]
+
 [-Nothing-]
 -Нищо-
 [Hide to tray]
@@ -808,8 +810,6 @@ Modern contact list
 Имената на групите вдясно
 [Row]
 Ред
-[Row design]
-
 ;file \plugins\Clist_modern\src\modern_clistsettings.cpp
 [(Unknown contact)]
 (Непознат контакт)
@@ -835,21 +835,6 @@ Modern contact list
 Възстановя предишното състояние
 [Show/Hide offline users]
 Показване/Скриване на потребителите "Извън линия"
-;file \plugins\Clist_modern\src\modern_rowtemplateopt.cpp
-[Empty %s cell]
-
-[column]
-колона
-[line]
-линия
-[columns]
-колони
-[lines]
-линии
-[%s, contain %s]
-
-[ layered]
-
 ;file \plugins\Clist_modern\src\modern_skinopt.cpp
 [( unknown )]
 (неизвестно)
diff --git a/langpacks/bulgarian/Plugins/CloudFile.txt b/langpacks/bulgarian/Plugins/CloudFile.txt
index e96d90f1eb..7ef2bc9455 100644
--- a/langpacks/bulgarian/Plugins/CloudFile.txt
+++ b/langpacks/bulgarian/Plugins/CloudFile.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Allows you to transfer files via cloud services.]
 
-;file \plugins\CloudFile\res\resource.rc
+;file \protocols\CloudFile\res\resource.rc
 [Default service]
 
 [General]
@@ -42,7 +42,7 @@
 
 [Revoke access]
 
-;file \plugins\CloudFile\src\icons.cpp
+;file \protocols\CloudFile\src\icons.cpp
 [Upload file(s)]
 Качване на файл(ове)
 [Dropbox]
@@ -53,22 +53,22 @@
 
 [Yandex.Disk]
 
-;file \plugins\CloudFile\src\menus.cpp
+;file \protocols\CloudFile\src\menus.cpp
 [Upload to...]
 
 [Upload]
 Качване
-;file \plugins\CloudFile\src\options.cpp
+;file \protocols\CloudFile\src\options.cpp
 [None]
 Няма
 [Services]
 Услуги
-;file \plugins\CloudFile\src\srmm.cpp
+;file \protocols\CloudFile\src\srmm.cpp
 [Upload files to...]
 
-;file \plugins\CloudFile\src\Services\dropbox_service.cpp
+;file \protocols\CloudFile\src\Services\dropbox_service.cpp
 [Server does not respond]
 
-;file \plugins\CloudFile\src\Services\google_service.cpp
-;file \plugins\CloudFile\src\Services\microsoft_service.cpp
-;file \plugins\CloudFile\src\Services\yandex_service.cpp
+;file \protocols\CloudFile\src\Services\google_service.cpp
+;file \protocols\CloudFile\src\Services\microsoft_service.cpp
+;file \protocols\CloudFile\src\Services\yandex_service.cpp
diff --git a/langpacks/bulgarian/Plugins/CmdLine.txt b/langpacks/bulgarian/Plugins/CmdLine.txt
index 477e58a457..0db1ebf19c 100644
--- a/langpacks/bulgarian/Plugins/CmdLine.txt
+++ b/langpacks/bulgarian/Plugins/CmdLine.txt
@@ -195,8 +195,3 @@ wide string
 
 [You can only run one instance of CmdLine plugin.]
 Може да стартирате приставката CmdLine само веднъж.
-;file \plugins\CmdLine\src\utils.cpp
-[Notify]
-Уведомяване
-[Warning]
-Предупреждение
diff --git a/langpacks/bulgarian/Plugins/ConnectionNotify.txt b/langpacks/bulgarian/Plugins/ConnectionNotify.txt
index dd11282b25..20ef8b5f77 100644
--- a/langpacks/bulgarian/Plugins/ConnectionNotify.txt
+++ b/langpacks/bulgarian/Plugins/ConnectionNotify.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Notify with popup if some connection established]
 Уведомяване с Popup при установяване на връзка
-;file \plugins\ConnectionNotify\res\ConnectionNotify.rc
+;file \protocols\ConnectionNotify\res\ConnectionNotify.rc
 [Set popup colors]
 Избор на цветове
 [Popup options]
@@ -56,7 +56,7 @@ Popup настройки
 
 [Remote IP:Port]
 Отдалечен IP:Порт
-;file \plugins\ConnectionNotify\src\ConnectionNotify.cpp
+;file \protocols\ConnectionNotify\src\ConnectionNotify.cpp
 [Show]
 Показване
 [Hide]
@@ -79,6 +79,6 @@ Popup настройки
 Приставки
 [New Connection Notification]
 Известие за нова връзка
-;file \plugins\ConnectionNotify\src\filter.cpp
+;file \protocols\ConnectionNotify\src\filter.cpp
 [First close options window]
 Първо затворете прозореца с настройки
diff --git a/langpacks/bulgarian/Plugins/CrashDumper.txt b/langpacks/bulgarian/Plugins/CrashDumper.txt
index 3807cf04d4..d4c2ea56e7 100644
--- a/langpacks/bulgarian/Plugins/CrashDumper.txt
+++ b/langpacks/bulgarian/Plugins/CrashDumper.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: CrashDumper.dll
 ;  Plugin: Crash dumper
-;  Version: 0.1.0.2
+;  Version: 0.1.0.3
 ;  Authors: borkra
 ;============================================================
 [Crash Dumper and Version Information for Miranda NG.]
diff --git a/langpacks/bulgarian/Plugins/CurrencyRates.txt b/langpacks/bulgarian/Plugins/CurrencyRates.txt
index be80eca618..e0155dd13b 100644
--- a/langpacks/bulgarian/Plugins/CurrencyRates.txt
+++ b/langpacks/bulgarian/Plugins/CurrencyRates.txt
@@ -2,12 +2,12 @@
 ;============================================================
 ;  File: CurrencyRates.dll
 ;  Plugin: Currency Rates
-;  Version: 0.1.0.101
+;  Version: 0.2.0.3
 ;  Authors: Dioksin
 ;============================================================
 [Shows currency rates.]
 
-;file \plugins\CurrencyRates\res\Forex.rc
+;file \protocols\CurrencyRates\res\Forex.rc
 [Variable List]
 Списък с променливи
 [Edit Settings]
@@ -104,14 +104,16 @@ Popup настройки...
 Текст за състояние:
 [&Tendency:]
 Тенденция:
+[&Personal key:]
+
 [&Advanced Settings...]
 Допълнителни настройки...
 [Rate Info]
 Инф. за курса
-;file \plugins\CurrencyRates\src\Chart.h
+;file \protocols\CurrencyRates\src\Chart.h
 [There is nothing to show]
 Няма за изобразяване
-;file \plugins\CurrencyRates\src\CommonOptionDlg.cpp
+;file \protocols\CurrencyRates\src\CommonOptionDlg.cpp
 [Seconds]
 Секунди
 [Minutes]
@@ -124,24 +126,15 @@ Popup настройки...
 Въведете цяла стойност между 1 и 24.
 [Enter text to display in contact list.]
 Въведете текст за изобразяване в списъка с контакти.
-;file \plugins\CurrencyRates\src\CurrencyConverter.cpp
+;file \protocols\CurrencyRates\src\CurrencyConverter.cpp
 [Info provided by]
 Източник
 [Enter positive number.]
 Въведете положително число.
-;file \plugins\CurrencyRates\src\CurrencyRateInfoDlg.cpp
+;file \protocols\CurrencyRates\src\CurrencyRateInfoDlg.cpp
 [Currency Rate]
 
-;file \plugins\CurrencyRates\src\CurrencyRatesProviderCurrencyConverter.cpp
-[Error occurred during HTML parsing.]
-
-[Error occurred during site access.]
-
-;file \plugins\CurrencyRates\src\CurrencyRatesProviderVisitorFormatSpecificator.cpp
-[Currency Symbol]
-
-[Currency Name]
-
+;file \protocols\CurrencyRates\src\CurrencyRatesProviderBase.cpp
 [Source of Information]
 Източник на информация
 [Rate Value]
@@ -160,20 +153,11 @@ Popup настройки...
 
 [Left slash (\\)]
 Черта наклонена наляво
-[Open Price]
-Цена при отваряне
-[Percent Change to After Hours]
+;file \protocols\CurrencyRates\src\CurrencyRatesProviderCurrencyConverter.cpp
+[Error occurred during HTML parsing.]
+
+[Error occurred during site access.]
 
-[Percent Change to Yesterday Close]
-Промяна в % от затварянето вчера
-[Day's High]
-Макс. за деня
-[Day's Low]
-Мин. за деня
-[Previous Close]
-Цена при предходното затваряне
-[Change]
-Промяна
 [From Currency Full Name]
 От валута (цялото име)
 [From Currency Short Name]
@@ -184,7 +168,7 @@ Popup настройки...
 Във валута (кратко име)
 [Short notation for "%f/%i"]
 Кратко означаване на "%f/%i"
-;file \plugins\CurrencyRates\src\Forex.cpp
+;file \protocols\CurrencyRates\src\Forex.cpp
 [Auto Update Enabled]
 Автообновяването е включено
 [Auto Update Disabled]
@@ -215,12 +199,16 @@ Popup настройки...
 
 [Currency Rates Auto Update Disabled]
 
+[Currency Symbol]
+
 [Network]
 Мрежа
-;file \plugins\CurrencyRates\src\HTTPSession.cpp
+;file \protocols\CurrencyRates\src\HTTPSession.cpp
+[This plugin requires a personal key. Press Yes to obtain it at the site and then enter the result in the Options dialog, otherwise this plugin will fail.]
+
 [CurrencyRates HTTP connections]
 HTTP връзки на CurrencyRates
-;file \plugins\CurrencyRates\src\IconLib.cpp
+;file \protocols\CurrencyRates\src\IconLib.cpp
 [Protocol icon]
 Икона на протокола
 [Currency Rate up]
@@ -237,17 +225,15 @@ HTTP връзки на CurrencyRates
 Бутон за размяна
 [Import]
 Внос
-;file \plugins\CurrencyRates\src\ImportExport.cpp
+;file \protocols\CurrencyRates\src\ImportExport.cpp
 [XML File (*.xml)]
 XML файлове (*.xml)
 [All files (*.*)]
 Всички файлове (*.*)
-;file \plugins\CurrencyRates\src\ModuleInfo.cpp
-[Miranda could not load CurrencyRates plugin. XML parser is missing.]
-Зареждането на приставката CurrencyRates е невъзможно. Липсва Microsoft XML parser.
+;file \protocols\CurrencyRates\src\ModuleInfo.cpp
 [Miranda could not load CurrencyRates plugin. Microsoft HTML parser is missing.]
 Зареждането на приставката CurrencyRates е невъзможно. Липсва Microsoft HTML parser.
-;file \plugins\CurrencyRates\src\SettingsDlg.cpp
+;file \protocols\CurrencyRates\src\SettingsDlg.cpp
 [Log Files (*.txt,*.log)]
 
 [Enter integer value]
diff --git a/langpacks/bulgarian/Plugins/Db_autobackups.txt b/langpacks/bulgarian/Plugins/Db_autobackups.txt
index 7f2f294c72..9f97eb17cd 100644
--- a/langpacks/bulgarian/Plugins/Db_autobackups.txt
+++ b/langpacks/bulgarian/Plugins/Db_autobackups.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Db_autobackups.dll
 ;  Plugin: Db autobackuper
-;  Version: 0.1.0.2
+;  Version: 0.1.0.3
 ;  Authors: chaos.persei, sje, Kildor, Billy_Bons
 ;============================================================
 [Database autobackuper plugin.]
@@ -34,8 +34,6 @@
 
 [Disable progress bar]
 Изключване на лентата за напредък
-[Disable popups]
-Изключване на Popups
 [Use CloudFile]
 
 [Backup NOW]
@@ -58,6 +56,10 @@
 [Database back up in process...]
 Създава се резервно копие...
 ;file \plugins\Db_autobackups\src\main.cpp
+[Enable &AutoBackups notification]
+
+[Disable &AutoBackups notification]
+
 [Miranda NG databases]
 База данни на Miranda NG
 [Compressed Miranda NG databases]
@@ -70,6 +72,8 @@
 Създаване резервно копие на профила
 [Save profile as...]
 Запис на профила като...
+[Popups]
+Рopups
 [Database backups]
 
 [Backup folder]
diff --git a/langpacks/bulgarian/Plugins/Discord.txt b/langpacks/bulgarian/Plugins/Discord.txt
index 14ab8992a9..2bab0490a2 100644
--- a/langpacks/bulgarian/Plugins/Discord.txt
+++ b/langpacks/bulgarian/Plugins/Discord.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Discord.dll
 ;  Plugin: Discord protocol
-;  Version: 0.6.1.1
+;  Version: 0.6.2.1
 ;  Authors: George Hazan
 ;============================================================
 [Discord support for Miranda NG.]
@@ -18,9 +18,11 @@
 Контакти
 [Default group:]
 Стандартна група
+[Enable group chats]
+
 [Do not open chat windows on creation]
 
-[Use subgroups for guild's channels (requires restart)]
+[Use subgroups for server channels (requires restart)]
 
 [Nick:]
 Прякор:
@@ -58,6 +60,10 @@
 
 [Do you really want to leave the guild?]
 
+[Disable sync]
+
+[Enable sync]
+
 [Join guild]
 
 [Copy my Discord ID]
@@ -68,6 +74,10 @@
 
 [Copy Discord ID]
 
+[Enable guild sync]
+
+[Load server history]
+
 ;file \protocols\Discord\src\options.cpp
 [Network]
 Мрежа
diff --git a/langpacks/bulgarian/Plugins/FTPFile.txt b/langpacks/bulgarian/Plugins/FTPFile.txt
index 1fe9ddf5a8..e8727d88df 100644
--- a/langpacks/bulgarian/Plugins/FTPFile.txt
+++ b/langpacks/bulgarian/Plugins/FTPFile.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: FTPFile.dll
 ;  Plugin: FTP File YM
-;  Version: 0.6.0.4
+;  Version: 0.6.0.5
 ;  Authors: yaho
 ;============================================================
 [FTP a file to a server and send the URL to your friend. Supported automatic zipping before upload and encryption via SFTP and FTPS.]
diff --git a/langpacks/bulgarian/Plugins/Facebook.txt b/langpacks/bulgarian/Plugins/Facebook.txt
index 9d271f5271..2566ab0d56 100644
--- a/langpacks/bulgarian/Plugins/Facebook.txt
+++ b/langpacks/bulgarian/Plugins/Facebook.txt
@@ -142,14 +142,14 @@ URL:
 
 [This will permanently delete the conversation history]
 
-[Former]
-
 [Myself]
 Аз
 [Friend]
 Приятел
 [User]
 Потребител
+[Former]
+
 [Notifications]
 Уведомявания
 [%s and more (%d)]
diff --git a/langpacks/bulgarian/Plugins/GG.txt b/langpacks/bulgarian/Plugins/GG.txt
index 0695158f7d..225d806bed 100644
--- a/langpacks/bulgarian/Plugins/GG.txt
+++ b/langpacks/bulgarian/Plugins/GG.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: GG.dll
 ;  Plugin: Gadu-Gadu protocol
-;  Version: 0.11.0.4
+;  Version: 0.95.11.1
 ;  Authors: Bartosz Bialek, Adam Strzelecki
 ;============================================================
 [Gadu-Gadu protocol support for Miranda NG.]
diff --git a/langpacks/bulgarian/Plugins/GmailNotifier.txt b/langpacks/bulgarian/Plugins/GmailNotifier.txt
index 0efe15df01..a27e56ed56 100644
--- a/langpacks/bulgarian/Plugins/GmailNotifier.txt
+++ b/langpacks/bulgarian/Plugins/GmailNotifier.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Check your Gmail inboxes locally.]
 Проверявайте вашата входящата кутия в Gmail.
-;file \plugins\GmailNotifier\res\options.rc
+;file \protocols\GmailNotifier\res\options.rc
 [Gmail account]
 Gmail акаунт
 [Name:]
@@ -54,7 +54,7 @@ Popup приставка
 
 [Log unread threads into database (enable history)]
 
-;file \plugins\GmailNotifier\src\check.cpp
+;file \protocols\GmailNotifier\src\check.cpp
 [Checking...]
 Проверяване...
 [Can't send account data!]
@@ -63,7 +63,7 @@ Popup приставка
 Грешно име или парола!
 [Can't get RSS feed!]
 
-;file \plugins\GmailNotifier\src\main.cpp
+;file \protocols\GmailNotifier\src\main.cpp
 [Other]
 Друго
 [Gmail: New thread(s)]
@@ -74,7 +74,7 @@ Gmail: Нови писма
 Проверка на всички кутии
 [&Check Gmail inbox]
 Проверка на Gmail кутията
-;file \plugins\GmailNotifier\src\options.cpp
+;file \protocols\GmailNotifier\src\options.cpp
 [GmailNotifier]
 
 [Network]
diff --git a/langpacks/bulgarian/Plugins/ICQ.txt b/langpacks/bulgarian/Plugins/ICQ.txt
index 406910d773..c37f1df42c 100644
--- a/langpacks/bulgarian/Plugins/ICQ.txt
+++ b/langpacks/bulgarian/Plugins/ICQ.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: ICQ.dll
 ;  Plugin: ICQ-WIM protocol
-;  Version: 0.95.11.1
+;  Version: 0.95.11.4
 ;  Authors: George Hazan
 ;============================================================
 [ICQ protocol support for Miranda NG.]
@@ -16,8 +16,12 @@
 
 [Do not open chat windows on creation]
 
-[Advanced]
-Разширени
+[Use tray icon notifications]
+
+[E-mail]
+Имейл
+[Launch mailbox in a browser on click]
+
 [If a contact goes Offline, set this status instead and cache it for given timeout in seconds (0 - disabled)]
 
 [After that, set this status to a contact and move it offline after specified timeout in seconds (0 - disabled)]
@@ -59,6 +63,8 @@
 [Do you really want to remove it from ignore list?]
 
 ;file \protocols\ICQ-WIM\src\main.cpp
+[E-mail notification]
+
 [Ignore]
 Игнориране
 [Remove Ignore]
@@ -66,6 +72,15 @@
 ;file \protocols\ICQ-WIM\src\options.cpp
 [Network]
 Мрежа
+[General]
+Основни
+[Advanced]
+Разширени
+;file \protocols\ICQ-WIM\src\poll.cpp
+[You received e-mail from %s: %s]
+
+[You have %d unread emails]
+
 ;file \protocols\ICQ-WIM\src\proto.cpp
 [%s server connection]
 %s връзка със сървъра
diff --git a/langpacks/bulgarian/Plugins/Import.txt b/langpacks/bulgarian/Plugins/Import.txt
index 73175e9538..244d3dd409 100644
--- a/langpacks/bulgarian/Plugins/Import.txt
+++ b/langpacks/bulgarian/Plugins/Import.txt
@@ -111,8 +111,6 @@
 
 [Skipping non-IM contact (%S)]
 
-[Skipping %S contact, ID not found]
-
 [Skipping duplicate %S contact %s]
 
 [Failed to add %S contact %s]
diff --git a/langpacks/bulgarian/Plugins/Jabber.txt b/langpacks/bulgarian/Plugins/Jabber.txt
index 0276154410..296f20c2b8 100644
--- a/langpacks/bulgarian/Plugins/Jabber.txt
+++ b/langpacks/bulgarian/Plugins/Jabber.txt
@@ -326,6 +326,8 @@ JID на стаята/URL:
 JID:
 [Node:]
 Възел:
+[Filter:]
+
 [Member Information]
 Информация за потребителя
 [Role:]
@@ -392,24 +394,10 @@ Jabber дейност
 [Jabber Mood]
 Jabber настроение
 ;file \protocols\JabberG\src\jabber_adhoc.cpp
-[Error %s %s]
-Грешка %s %s
-[Select Command]
-Изберете команда
-[Not supported]
-Не се поддържа
 [Done]
 Направено
-[In progress. Please Wait...]
-Напредък. Моля, изчакайте...
 [Execute]
 Изпълнение
-[Requesting command list. Please wait...]
-Изтегляне на списъка с команди. Моля, изчакайте...
-[Jabber Ad-Hoc commands at %s]
-
-[Sending Ad-Hoc command to %s]
-
 ;file \protocols\JabberG\src\jabber_agent.cpp
 [Jabber Agent Registration]
 Регистрация на Jabber агент
@@ -544,32 +532,16 @@ Jabber настроение
 Участник
 [Moderator]
 Модератор
-[Visitors]
-Посетители
-[Participants]
-Участници
-[Moderators]
-Модератори
 [Owners]
 Собственици
-[User %s is now banned.]
-Потребителят %s е баннат.
-[User %s changed status to %s with message: %s]
-Потребителя %s промени състоянието си на "%s" със следното съобщение: %s
-[User %s changed status to %s]
-Потребителя %s промени състоянието си на "%s"
-[Room configuration was changed.]
-Настройките на стаята бяха променени.
-[Outcast]
-
-[Affiliation of %s was changed to '%s'.]
-Рангът на %s бе променена на '%s'.
+[Moderators]
+Модератори
+[Participants]
+Участници
+[Visitors]
+Посетители
 [Role of %s was changed to '%s'.]
 Ролята на %s е променена на "%s".
-[because room is now members-only]
-защото стаята е вече само за членове.
-[user banned]
-баннат потребител
 [Change &nickname]
 Промяна на прякора
 [&Invite a user]
@@ -668,10 +640,6 @@ Jabber настроение
 
 [%s (not on roster)]
 %s (не е в списъка с хора)
-[%s from\n%s]
-
-[Real JID not available]
-Истинският JID не е наличен
 [Reason to kick %s]
 Причина за изгонването на %s
 [Reason to ban %s]
@@ -742,26 +710,6 @@ Jabber грешка
 Копиране името на възела
 [Copy node information]
 Копиране информацията за възела
-;file \protocols\JabberG\src\jabber_disco.h
-[Identities]
-Идентичности
-[category]
-категория
-[type]
-тип
-[Category]
-Категория
-[Type]
-Тип
-[Supported features]
-Поддържани функции
-[Info request error]
-
-[Items request error]
-
-;file \protocols\JabberG\src\jabber_filterlist.cpp
-[Set filter...]
-Задаване на филтър...
 ;file \protocols\JabberG\src\jabber_groupchat.cpp
 [Failed to retrieve room list from server.]
 Списъкът със стаи от сървъра не бе извлечен.
@@ -769,8 +717,6 @@ Jabber грешка
 Няма налични стаи на сървъра.
 [Room list request timed out.]
 
-[<no nick>]
-<няма прякор>
 [Loading...]
 Зареждане...
 [Please wait for room list to download.]
@@ -781,8 +727,8 @@ Jabber грешка
 Отметки...
 [Change nickname in <%s>]
 Промяна на прякор в <%s>
-[has set the subject to:]
-зададе темата:
+[Error]
+Грешка
 [Group chat invitation to\n%s]
 
 ;file \protocols\JabberG\src\jabber_icolib.cpp
@@ -877,8 +823,8 @@ RSS услуга
 ;file \protocols\JabberG\src\jabber_iqid.cpp
 [Authentication failed for %s.]
 Неуспешно удостоверяване за %s.
-[Jabber Authentication]
-Jabber удостоверяване
+[Authentication]
+
 [Registration successful]
 Успешно регистриране
 [Password is successfully changed. Don't forget to update your password in the Jabber protocol option.]
@@ -1469,18 +1415,6 @@ Jabber източник
 Промяна на състояние
 [Don't notify history messages]
 Без уведомяване за съобщения от историята
-[Group]
-Група
-[Subscription]
-Пълномощно
-[Uploading...]
-Качване...
-[Downloading...]
-Сваляне...
-[XML for MS Excel (UTF-8 encoded)]
-XML за MS Excel (кодиран с UTF-8)
-[Connecting...]
-Свързване...
 [Network]
 Мрежа
 [Account]
@@ -1514,8 +1448,6 @@ S.ms
 [Some changes will take effect the next time you connect to the Jabber network.]
 Някои промени ще бъдат осъществени при следващо свързване към мрежата Jabber.
 ;file \protocols\JabberG\src\jabber_password.cpp
-[Set New Password for %s@%S]
-Задаване на нова парола за %s@%S
 [New password does not match.]
 Новата парола не съвпада
 [Current password is incorrect.]
@@ -1543,6 +1475,46 @@ S.ms
 Възникна грешка при задаването на стандартен списък
 [Allow]
 Позволи
+[List has no rules, empty lists will be deleted then changes applied]
+Списъкът няма правила. Празните списъци ще бъдат изтривани, а промените ще се прилагат след това
+[allow ]
+позволяване\s
+[deny ]
+отхвърляне\s
+[all.]
+всичко.
+[messages]
+съобщения
+[ and ]
+	и\s
+[incoming presences]
+входящи присъствия
+[outgoing presences]
+изходящи присъствия
+[queries]
+запитвания
+[Else ]
+Или\s
+[If Jabber ID is ']
+Ако Jabber ID е '
+[ (nickname: ]
+	(прякор:\s
+[If group is ']
+Ако групата е '
+[If subscription is ']
+Ако пълномощното е '
+[then ]
+тогава\s
+[ (act., def.)]
+	(активен, стандартен)
+[ (active)]
+	(активен)
+[ (default)]
+	(стандартен)
+[Ready.]
+Готово.
+[Privacy lists are not saved, discard any changes and exit?]
+Списъците за поверителност не бяха запаметени. Желаете ли промените да бъдат съхранени?
 [Simple mode]
 Прост режим
 [Advanced mode]
@@ -1587,46 +1559,6 @@ S.ms
 Присъствие (изход)
 [Query]
 Търсене
-[List has no rules, empty lists will be deleted then changes applied]
-Списъкът няма правила. Празните списъци ще бъдат изтривани, а промените ще се прилагат след това
-[allow ]
-позволяване\s
-[deny ]
-отхвърляне\s
-[all.]
-всичко.
-[messages]
-съобщения
-[ and ]
-	и\s
-[incoming presences]
-входящи присъствия
-[outgoing presences]
-изходящи присъствия
-[queries]
-запитвания
-[Else ]
-Или\s
-[If Jabber ID is ']
-Ако Jabber ID е '
-[ (nickname: ]
-	(прякор:\s
-[If group is ']
-Ако групата е '
-[If subscription is ']
-Ако пълномощното е '
-[then ]
-тогава\s
-[ (act., def.)]
-	(активен, стандартен)
-[ (active)]
-	(активен)
-[ (default)]
-	(стандартен)
-[Ready.]
-Готово.
-[Privacy lists are not saved, discard any changes and exit?]
-Списъците за поверителност не бяха запаметени. Желаете ли промените да бъдат съхранени?
 [Please save list before activating]
 Запишете списъка преди да активирате
 [First, save the list]
@@ -1650,80 +1582,22 @@ S.ms
 Протоколът е "Извън линия" или няма JID
 [No valid OMEMO session exists]
 
-;file \protocols\JabberG\src\jabber_rc.cpp
-[Command completed successfully]
-Успешно завършена команда
-[Error occurred during processing command]
-Възникна грешка при изпълнението на командата
-[Set status]
-Избор на състояние
-[Set options]
-Конфигуриране
-[Forward unread messages]
-Препращане на непрочетените съобщения
-[Leave group chats]
-Излизане от груповите чатове
-[Lock workstation]
-Заключване на работната станция
-[Quit Miranda NG]
-Изход от Miranda NG
-[Change Status]
-Промяна на състояние
-[Choose the status and status message]
-Изберете състояние и текст
-[Status]
-Състояние
-[Extended away (Not available)]
-
-[Invisible]
-Невидим
-[Offline]
-Извън линия
-[Priority]
-Предимство
-[Status message]
-Текст за състояние
-[Change global status]
-Промяна на общото състояние
-[Set Options]
-Конфигуриране
-[Set the desired options]
-Задайте желаната опция
-[Automatically Accept File Transfers]
-Автоприемане на файлови трансфери
-[Play sounds]
-
-[Disable remote controlling (check twice what you are doing)]
-Изключване на дистанционно управление (уверете се, че знаете какво правите)
-[There is no messages to forward]
-Няма съобщения за препращане
-[Forward options]
-Настройки за препращане
-[%d message(s) to be forwarded]
-ще бъдат препратени %d съобщения
-[Mark messages as read]
-Маркиране на съобщенията като прочетени
-[%d message(s) forwarded]
-%d съобщения бяха препратени
-[Workstation successfully locked]
-
-[Error %d occurred during workstation lock]
-
-[Confirmation needed]
-Необходимо е потвърждаване
-[Please confirm Miranda NG shutdown]
-Моля, потвърдете изключването на Miranda NG
-[There is no group chats to leave]
-Няма групови чатове, от които да излезете
-[Choose the group chats you want to leave]
-Изберете груповите чатове, от които желаете да излезете
+;file \protocols\JabberG\src\jabber_roster.cpp
+[Group]
+Група
+[Subscription]
+Пълномощно
+[Uploading...]
+Качване...
+[Downloading...]
+Сваляне...
+[Connecting...]
+Свързване...
+[XML for MS Excel (UTF-8 encoded)]
+XML за MS Excel (кодиран с UTF-8)
 ;file \protocols\JabberG\src\jabber_search.cpp
-[Error %s %s\r\nPlease select other server]
-Грешка %s %s\r\nМоля, изберете друг сървър
 [Error: unknown reply received\r\nPlease select other server]
 Грешка: получен е непознат отговор\r\nМоля, изберете друг сървър
-[Error %s %s\r\nTry to specify more detailed]
-
 [Search error]
 Грешка при търсенето
 [Select/type search service URL above and press <Go>]
@@ -1745,6 +1619,8 @@ S.ms
 
 [sent unknown presence type]
 
+[Outcast]
+
 [Nick:]
 Прякор:
 [Status:]
@@ -1762,31 +1638,23 @@ S.ms
 Грешка: Връзката е изгубена
 [Requesting registration instruction...]
 Изтегляне на инструкции за регистрация...
-[Authentication failed for %s@%S.]
-Неуспешно удостоверяване за %s@%S.
-[Message redirected from: %s\r\n%s]
-Пренасочено съобщение от: %s\r\n%s
+[Registration canceled]
+
 [Sending registration information...]
 Изпращане на регистрационната информация...
 ;file \protocols\JabberG\src\jabber_userinfo.cpp
-[Resource]
-Източник
 [<not specified>]
 <неуточнено>
+[Resource]
+Източник
 [Software]
 Софтуер
 [Version]
 Версия
 [System]
 Система
-[unknown]
-неизвестен
-[Idle since]
-Бездейства от
-[Client capabilities]
-Възможности на клиента
-[Software information]
-Информация за софтуера
+[Last activity]
+
 [Operating system]
 Операционна система
 [Operating system version]
@@ -1801,26 +1669,14 @@ S.ms
 Дейност
 [Tune]
 
-[both]
-и двамата
-[to]
-до
-[from]
-от
-[none]
-няма
 [Last logoff time]
 Последно отписване на
 [Uptime]
 Работи от
 [Logoff message]
 Текст при отписването
-[<no information available>]
-<няма налична информация>
 [Last active resource]
 Последно активен източник
-[Please switch online to see more details.]
-Моля, преминете на линия за повече подробности.
 [Copy]
 Копиране
 [Copy only this value]
@@ -1870,10 +1726,10 @@ S.ms
 
 [Unknown error]
 Непозната грешка
-[Error]
-Грешка
 [Unknown error message]
 Непознато съобщение за грешка
+[Offline]
+Извън линия
 [Advanced Status]
 Разширено състояние
 [Set mood...]
diff --git a/langpacks/bulgarian/Plugins/LotusNotify.txt b/langpacks/bulgarian/Plugins/LotusNotify.txt
index fddb7a8797..59996a7654 100644
--- a/langpacks/bulgarian/Plugins/LotusNotify.txt
+++ b/langpacks/bulgarian/Plugins/LotusNotify.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Notify about new mail in Lotus Database]
 
-;file \plugins\LotusNotify\res\LotusNotify.rc
+;file \protocols\LotusNotify\res\LotusNotify.rc
 [Lotus connection settings]
 
 [Primary server:]
@@ -66,7 +66,7 @@
 
 [Offline status mean:]
 
-;file \plugins\LotusNotify\src\LotusNotify.cpp
+;file \protocols\LotusNotify\src\LotusNotify.cpp
 [Unable to load all required Lotus API functions]
 
 [Lotus Notes Client not detected. Check plugin configuration description at https://miranda-ng.org/p/LotusNotify]
diff --git a/langpacks/bulgarian/Plugins/MSN.txt b/langpacks/bulgarian/Plugins/MSN.txt
index 7f65f61517..4b4a747d54 100644
--- a/langpacks/bulgarian/Plugins/MSN.txt
+++ b/langpacks/bulgarian/Plugins/MSN.txt
@@ -132,8 +132,6 @@ Live ID
 [&Deop user]
 
 ;file \protocols\MSN\src\msn_commands.cpp
-[%I64u bytes]
-
 [MSN Alert]
 MSN уведовяване
 ;file \protocols\MSN\src\msn_errors.cpp
diff --git a/langpacks/bulgarian/Plugins/MenuEx.txt b/langpacks/bulgarian/Plugins/MenuEx.txt
index 5e471668ee..3e5ffc6083 100644
--- a/langpacks/bulgarian/Plugins/MenuEx.txt
+++ b/langpacks/bulgarian/Plugins/MenuEx.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MenuEx.dll
 ;  Plugin: Menu item ext
-;  Version: 1.3.1.0
+;  Version: 1.3.2.0
 ;  Authors: Heiko Schillinger, Baloo, Billy_Bons, Robert Pösel
 ;============================================================
 [Adds some useful options to a contacts menu.]
@@ -20,8 +20,6 @@
 Игнориране
 [Copy to Account (Ctrl+click for move to Account)]
 Копиране на акаунта (Ctrl+ляв бутон за преместване в Акаунт)
-[Request Authorization]
-Молба за упълномощаване
 [Browse Received Files]
 Разглеждане на получените файлове
 [Copy IP]
@@ -79,14 +77,8 @@ xСъстояние
 Упълномощаване
 [Typing Notify]
 Уведомяване при писане
-[Please authorize me to add you to my contact list.]
-Моля, упълномощете ме да ви добавя в списъка си с контакти.
-[Do you want to send authorization request\nto new contact?]
-Желаете ли да бъде изпратена молба за упълномощаване до\nновия контакт?
 [Open ignore settings]
 Отваряне настройките за игнориране
-[Request authorization]
-Молба за упълномощаване
 [MenuItemEx]
 
 ;file \plugins\MenuItemEx\src\options.cpp
diff --git a/langpacks/bulgarian/Plugins/MinecraftDynmap.txt b/langpacks/bulgarian/Plugins/MinecraftDynmap.txt
index 1d868a170e..416e6b7064 100644
--- a/langpacks/bulgarian/Plugins/MinecraftDynmap.txt
+++ b/langpacks/bulgarian/Plugins/MinecraftDynmap.txt
@@ -13,8 +13,6 @@
 [Visible name:]
 
 ;file \protocols\MinecraftDynmap\src\chat.cpp
-[Server]
-Сървър
 [Admin]
 Администратор
 [Normal]
diff --git a/langpacks/bulgarian/Plugins/MirOTR.txt b/langpacks/bulgarian/Plugins/MirOTR.txt
index 4c62260c26..facb814d01 100644
--- a/langpacks/bulgarian/Plugins/MirOTR.txt
+++ b/langpacks/bulgarian/Plugins/MirOTR.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MirOTR.dll
 ;  Plugin: Miranda OTR
-;  Version: 0.14.1.17
+;  Version: 0.14.2.1
 ;  Authors: ProgAndy & CHEF-KOCH
 ;============================================================
 [OTR (Off-the-Record) plugin for Miranda NG (using some code and ideas from SecureIM, Pidgin-OTR and old Miranda OTR (by SJE)).]
@@ -80,6 +80,17 @@ OTR състояние
 Прекратяване на OTR сесията
 [&Verify Fingerprint]
 Проверяване на отпечатъка
+;file \plugins\MirOTR\src\icons.cpp
+[OTR private]
+OTR частно
+[OTR unverified]
+OTR НЕПОТВЪРДЕНО
+[OTR finished]
+ОТР приключено
+[OTR not secure]
+OTR ненадеждно
+[Refresh]
+Обновяване
 ;file \plugins\MirOTR\src\language.h
 [Start OTR]
 Включване на OTR шифроването
@@ -99,8 +110,6 @@ OTR шифроване: НЕПОТВЪРДЕНО
 OTR шифроване: Частно
 [OTR Encryption: Finished]
 OTR шифроване: Приключено
-[&Convert HTML (for Pidgin)]
-Конвертиране на HTML код (за Pidgin)
 [OTR encrypted session with '%s' has been terminated]
 Шифрована OTR сесия с "%s" бе прекратена
 [Requesting OTR encrypted session with '%s']
@@ -131,16 +140,6 @@ OTR информация
 Сега се използва ПОТВЪРДЕН отпечатък за OTR шифрованата сесия с "%s"
 [OTR encrypted session with '%s' is now using a NOT VERIFIED fingerprint]
 Сега се използва НЕПОТВЪРДЕН отпечатък за OTR шифрованата сесия с "%s"
-[OTR unverified]
-OTR НЕПОТВЪРДЕНО
-[OTR finished]
-ОТР приключено
-[OTR private]
-OTR частно
-[OTR not secure]
-OTR ненадеждно
-[Refresh]
-Обновяване
 [Generating new private key for protocol '%s'.\nPlease Wait...]
 Създаване на нов частен ключ за протокол "%s".\nМоля, изчакайте...
 [General]
@@ -236,6 +235,8 @@ OTR: Инсталирана е приставката SecureIM
 Меню на MirOTR
 [OTR Status]
 OTR състояние
+[&Convert HTML (for Pidgin)]
+Конвертиране на HTML код (за Pidgin)
 ;file \plugins\MirOTR\src\options.cpp
 [Private Data]
 
diff --git a/langpacks/bulgarian/Plugins/MirandaG15.txt b/langpacks/bulgarian/Plugins/MirandaG15.txt
index d33f3e7796..3dd1de8ed8 100644
--- a/langpacks/bulgarian/Plugins/MirandaG15.txt
+++ b/langpacks/bulgarian/Plugins/MirandaG15.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MirandaG15.dll
 ;  Plugin: MirandaG15
-;  Version: 0.1.2.0
+;  Version: 0.1.2.1
 ;  Authors: Martin Kleinhans
 ;============================================================
 [Provides an interface to use Miranda from the LCD of various Logitech devices.]
diff --git a/langpacks/bulgarian/Plugins/MsgPopup.txt b/langpacks/bulgarian/Plugins/MsgPopup.txt
index 7d7aff964d..aadff716a5 100644
--- a/langpacks/bulgarian/Plugins/MsgPopup.txt
+++ b/langpacks/bulgarian/Plugins/MsgPopup.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MsgPopup.dll
 ;  Plugin: Message popup
-;  Version: 0.1.2.1
+;  Version: 0.1.2.2
 ;  Authors: StDenis
 ;============================================================
 [Plugin replaces message boxes (those having only OK button) with popups.]
diff --git a/langpacks/bulgarian/Plugins/NewsAggregator.txt b/langpacks/bulgarian/Plugins/NewsAggregator.txt
index 48869b9b40..4b77662c0d 100644
--- a/langpacks/bulgarian/Plugins/NewsAggregator.txt
+++ b/langpacks/bulgarian/Plugins/NewsAggregator.txt
@@ -2,12 +2,12 @@
 ;============================================================
 ;  File: NewsAggregator.dll
 ;  Plugin: News aggregator
-;  Version: 0.1.0.4
+;  Version: 0.1.0.5
 ;  Authors: Mataes, FREAK_THEMIGHTY
 ;============================================================
 [RSS/Atom news aggregator.]
 Четец за RSS/Atom новини.
-;file \plugins\NewsAggregator\Res\Resource.rc
+;file \protocols\NewsAggregator\Res\Resource.rc
 [Add]
 Добавяне
 [Change]
@@ -72,14 +72,14 @@ URL
 Емисии за внасяне:
 [&Import]
 Внос
-;file \plugins\NewsAggregator\Src\Authentication.cpp
+;file \protocols\NewsAggregator\Src\Authentication.cpp
 [Enter your username]
 Въведете потребител
 [Error]
 Грешка
 [Enter your password]
 Въведете парола
-;file \plugins\NewsAggregator\Src\CheckFeed.cpp
+;file \protocols\NewsAggregator\Src\CheckFeed.cpp
 [%s\nis a valid feed's address.]
 %s\nе валиден адрес на емисия.
 [News Aggregator]
@@ -88,7 +88,7 @@ URL
 %s\nне е валиден адрес на емисия.
 [empty]
 празно
-;file \plugins\NewsAggregator\Src\Icons.cpp
+;file \protocols\NewsAggregator\Src\Icons.cpp
 [Protocol icon]
 Икона на протокола
 [Check All Feeds]
@@ -103,13 +103,13 @@ URL
 Автообновяването е включено
 [Auto Update Disabled]
 Автообновяването е изключено
-;file \plugins\NewsAggregator\Src\Menus.cpp
+;file \protocols\NewsAggregator\Src\Menus.cpp
 [Check feed]
 Проверка за новини
 [Change feed]
 Редактиране на емисията
-;file \plugins\NewsAggregator\Src\NewsAggregator.cpp
-;file \plugins\NewsAggregator\Src\Options.cpp
+;file \protocols\NewsAggregator\Src\NewsAggregator.cpp
+;file \protocols\NewsAggregator\Src\Options.cpp
 [OPML files]
 OPML файлове
 [Not valid import file.]
@@ -154,11 +154,11 @@ URL адрес на страницата за коментари към нови
 Изтриване на контакт
 [Network]
 Мрежа
-;file \plugins\NewsAggregator\Src\Services.cpp
+;file \protocols\NewsAggregator\Src\Services.cpp
 [Avatars]
 Аватари
 [Enable/disable auto update]
 Вкл / Изкл на автоматично обновяване
-;file \plugins\NewsAggregator\Src\Utils.cpp
+;file \protocols\NewsAggregator\Src\Utils.cpp
 [NewsAggregator HTTP connections]
 HTTP връзки на NewsAggregator
diff --git a/langpacks/bulgarian/Plugins/NimContact.txt b/langpacks/bulgarian/Plugins/NimContact.txt
index 297e59932a..3b76aaa158 100644
--- a/langpacks/bulgarian/Plugins/NimContact.txt
+++ b/langpacks/bulgarian/Plugins/NimContact.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Non-IM Contact allows you to add 'contacts' that can act as shortcuts to other programs, or links to web pages.\r\nThe contacts name can be read from a text file (includes any ASCII file).\r\nThis plugin is a combination of Favorites and Text Reader plugins both made by me)]
 
-;file \plugins\Non-IM Contact\res\resource.rc
+;file \protocols\Non-IM Contact\res\resource.rc
 [View/Edit Files]
 
 [Add File]
@@ -108,7 +108,7 @@ URL
 
 [EXAMPLE: %fn1,%fn2]
 
-;file \plugins\Non-IM Contact\src\contactinfo.cpp
+;file \protocols\Non-IM Contact\src\contactinfo.cpp
 [Select Folder]
 Избор на папка
 [Non-IM Contact protocol timer is Disabled]
@@ -117,7 +117,7 @@ URL
 
 [New Non-IM Contact]
 
-;file \plugins\Non-IM Contact\src\dialog.cpp
+;file \protocols\Non-IM Contact\src\dialog.cpp
 [String replacing variables...\r\nThe following are all the valid variables that can be used. Refer to the wiki.miranda-ng.org for a proper explanation.\r\n\r\nfile(X)\t\t<- specifies the file to read from. MUST be followed by either start() or end() or wholeline()\r\nfilename(X)\t<- copies the filename of file X.\r\nstart(...)\t\t<- specifies where to start copying from.\r\nend(...)\t\t<- specifies where to stop copying.\r\nwholeline(line(...))\t<- specifies a whole line to copy\r\n\r\nstart() and end() explained\r\n.........................\r\nMUST start with line() followed by a number or a string inside " marks, OR csv(separatorX) variable. The number specifies which character in the line to start/end copying. The string specifies a string in the line to start/end copying.\r\n\r\ncsv(seperatorX) explained...\r\nSeperator is either "tab" or "space" or any SINGLE character. X is the Xth separator to pass before copying, (or to stop before).\r\n\r\nLastly the line(...) variable...\r\nInside the brackets must be either a number (to specify the line number), or a string inside " marks (to use the line with that string), or lastline(X). The X in lastline is the Xth line above the last line, i.e., lastline(1) will use the 2nd last line of the file. If searching for a line with "some words" you may put a + or - X after the closing ), i.e., line("some words")+3 to go 3 lines after the line with "some words".\r\n\r\nSome examples...\r\nfilename(0)    <- will display the filename of the 0th file\r\nfile(0)wholeline(line(0)))    <- will display the whole first line of the 0th file\r\nfile(0)wholeline(line("hello")-1)))    <- the wholeline above the first occurrence of "hello" in the file\r\nfile(0)start(line(lastline(1))csv(tab2))end(line(lastline())csv(tab4)))    <- starts at the 2nd last line of the file, from the 2nd tab variable, until the 4th tab variable in the last line (in the 0th file)\r\nfile(0)start(line("hello")+1"zzzz")end(line(6)17))    <- starts from the first occurrence of zzzz in the line after the first occurrence of hello, until the 17th character in the 6th line (starting from line 0) of the 0th file.\r\n]
 
 [Contacts Display Info]
@@ -130,7 +130,7 @@ URL
 Файлове
 [Edit Non-IM Contact "%s"]
 
-;file \plugins\Non-IM Contact\src\files.cpp
+;file \protocols\Non-IM Contact\src\files.cpp
 [Do you want to overwrite the contents of the file?\r\n\r\nPressing No will append these contacts to the end of the file.]
 
 [File couldn't be opened]
@@ -139,10 +139,10 @@ URL
 
 [line(%-3d) = | %s]
 
-;file \plugins\Non-IM Contact\src\http.cpp
+;file \protocols\Non-IM Contact\src\http.cpp
 [Non-IM Contacts]
 
-;file \plugins\Non-IM Contact\src\main.cpp
+;file \protocols\Non-IM Contact\src\main.cpp
 [Plugins]
 Приставки
 [Main Icon]
@@ -163,7 +163,7 @@ URL
 
 [E&dit Contact Settings]
 
-;file \plugins\Non-IM Contact\src\namereplacing.cpp
+;file \protocols\Non-IM Contact\src\namereplacing.cpp
 [%s - ERROR: no line specified or line not found (in %s)]
 
 [%s - ERROR: file couldn't be opened (in %s)]
diff --git a/langpacks/bulgarian/Plugins/NotesReminders.txt b/langpacks/bulgarian/Plugins/NotesReminders.txt
index cd70b1accf..ff1619e684 100644
--- a/langpacks/bulgarian/Plugins/NotesReminders.txt
+++ b/langpacks/bulgarian/Plugins/NotesReminders.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: NotesReminders.dll
 ;  Plugin: Sticky Notes & Reminders
-;  Version: 0.1.0.1
+;  Version: 0.2.0.2
 ;  Authors: Joe Kucera, Lubomir Kolev Ivanov, Georg Fischer
 ;============================================================
 [Sticky Notes & Reminders Implementation for Miranda NG.]
@@ -50,12 +50,12 @@
 
 [Add Reminder]
 
-[Trigger On Time && Date:]
-
 [Date]
 Дата
 [Time]
 Час
+[Repeat each day]
+
 [Reminder Note:]
 
 [None]
@@ -102,8 +102,6 @@
 
 [D&elete All Reminders]
 
-[Context Menu Note Popup]
-
 [&Hide Note]
 
 [&Always On Top]
@@ -152,9 +150,6 @@
 
 [&Show / Hide Notes]
 
-;file \plugins\NotesAndReminders\src\globals.h
-[Notes & Reminders]
-
 ;file \plugins\NotesAndReminders\src\hotkeys.cpp
 [New Note]
 
@@ -165,10 +160,6 @@
 [New Reminder]
 
 ;file \plugins\NotesAndReminders\src\main.cpp
-[Are you sure you want to delete all notes?]
-
-[Are you sure you want to delete all reminders?]
-
 [Delete All Notes]
 
 [Show/Hide Notes]
@@ -195,20 +186,10 @@
 
 [Sticky Notes]
 
-[Plugins]
-Приставки
 [Add New Note]
 
 [Add New Reminder]
 
-[Alerts]
-Уведомявания
-[Reminder triggered]
-
-[Reminder triggered (Alternative 1)]
-
-[Reminder triggered (Alternative 2)]
-
 [Notes && Reminders]
 
 [New &Note]
@@ -221,6 +202,14 @@
 
 [Miranda could not load the Notes & Reminders plugin, Msftedit.dll is missing. If you are using WINE, please make sure you have Msftedit.dll installed. Press 'Yes' to continue loading Miranda.]
 
+[Alerts]
+Уведомявания
+[Reminder triggered]
+
+[Reminder triggered (Alternative 1)]
+
+[Reminder triggered (Alternative 2)]
+
 ;file \plugins\NotesAndReminders\src\notes.cpp
 [Black]
 Черен
@@ -268,6 +257,8 @@
 Бележки (текст)
 [Date/Title]
 
+[Are you sure you want to delete all notes?]
+
 ;file \plugins\NotesAndReminders\src\options.cpp
 [Sticky Note Caption]
 
@@ -279,11 +270,17 @@
 
 [Select Executable]
 
+[Plugins]
+Приставки
 ;file \plugins\NotesAndReminders\src\reminders.cpp
 [Minutes]
 Минути
 [Hours]
 Часове
+[The specified time is invalid due to begin of daylight saving (summer time).]
+
+[The specified time is invalid.]
+
 [Hour]
 час
 [Day]
@@ -292,10 +289,6 @@
 Дни
 [Week]
 Седмица
-[The specified time is invalid due to begin of daylight saving (summer time).]
-
-[The specified time is invalid.]
-
 [The specified time offset is invalid.]
 
 [&Update Reminder]
@@ -316,5 +309,10 @@
 
 [Date of activation]
 
+[Are you sure you want to delete all reminders?]
+
 [Are you sure you want to delete this reminder?]
 
+;file \plugins\NotesAndReminders\src\stdafx.h
+[Notes & Reminders]
+
diff --git a/langpacks/bulgarian/Plugins/PasteIt.txt b/langpacks/bulgarian/Plugins/PasteIt.txt
index 96d4bdac54..56e9389e89 100644
--- a/langpacks/bulgarian/Plugins/PasteIt.txt
+++ b/langpacks/bulgarian/Plugins/PasteIt.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: PasteIt.dll
 ;  Plugin: Paste it
-;  Version: 1.0.0.3
+;  Version: 1.0.0.4
 ;  Authors: Krzysztof Kral
 ;============================================================
 [Uploads the text to web page and sends the URL to your friends.]
@@ -142,12 +142,12 @@ HTTP връзки на Paste It
 [File '%s' is empty]
 Файлът "%s" е празен
 ;file \plugins\PasteIt\src\PasteToWeb1.cpp
-[Error during sending text to web page: %s]
-Грешка при качването на файла в уеб страницата "%s"
+[Error during sending text to web page: %S]
+Грешка при качването на файла в уеб страницата "%S"
 [Error during sending text to web page]
 Грешка при качването на файла в уеб страницата
-[Error during getting user key from web page: %s]
-Грешка при получаването на потребителския ключ от уеб страницата "%s"
+[Error during getting user key from web page: %S]
+Грешка при получаването на потребителския ключ от уеб страницата "%S"
 [Paste expire date]
 Изтичане валидността на текста
 [Never]
diff --git a/langpacks/bulgarian/Plugins/PluginUpdater.txt b/langpacks/bulgarian/Plugins/PluginUpdater.txt
index d0d8d8618a..4d08e108a7 100644
--- a/langpacks/bulgarian/Plugins/PluginUpdater.txt
+++ b/langpacks/bulgarian/Plugins/PluginUpdater.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: PluginUpdater.dll
 ;  Plugin: Plugin updater
-;  Version: 0.2.0.2
+;  Version: 0.2.0.3
 ;  Authors: Mataes, George Hazan
 ;============================================================
 [Installs and updates plugins and other Miranda NG components.]
diff --git a/langpacks/bulgarian/Plugins/PopupPlus.txt b/langpacks/bulgarian/Plugins/PopupPlus.txt
index f14001d959..1a47559d10 100644
--- a/langpacks/bulgarian/Plugins/PopupPlus.txt
+++ b/langpacks/bulgarian/Plugins/PopupPlus.txt
@@ -1,6 +1,6 @@
 #muuid {26a9125d-7863-4e01-af0e-d14ef95c5054}
 ;============================================================
-;  File: Popup.dll
+;  File: PopupPlus.dll
 ;  Plugin: Popup plus
 ;  Version: 2.1.1.15
 ;  Authors: MPK, Merlin_de (Luca Santarelli, Victor Pavlychko)
@@ -82,7 +82,7 @@ ms
 Образец
 [Download more skins]
 Сваляне на още облици
-[Popup History]
+[Popup history]
 Popup история
 [Desktop]
 Работен плот
@@ -263,15 +263,11 @@ Popup действията са малките бутони под текста.
 [Avatar border]
 Рамка на аватара
 ;file \plugins\Popup\src\history.cpp
-[Popup History is disabled]
+[Popup history is disabled]
 Popup историята е изклюена
-[Popup History message]
+[Popup history message]
 Popup история на съобщенията
 ;file \plugins\Popup\src\icons.cpp
-[Popups are enabled]
-Popups са включени
-[Popups are disabled]
-Popups са изключени
 [With "favorite" overlay]
 
 [With "fullscreen" overlay]
@@ -309,14 +305,14 @@ Popup група
 Контакти
 [Advanced]
 Разширени
-[Toggle Popups]
-Вкл./Изкл. на Popups
-[Enable Popups]
-Включване на Popups
-[Disable Popups]
-Изключване на Popups
-[Popup Plus]
-Popup Plus
+[Toggle popups]
+Вкл./Изкл. на popups
+[Enable popups]
+Включване на popups
+[Disable popups]
+Изключване на popups
+[Popup plus]
+Popup plus
 [Error: I could not register the Popup Window class.\r\nThe plugin will not operate.]
 Грешка: Неуспешно регистриране на Popup Window class.\r\nПриставката няма да може да работи.
 ;file \plugins\Popup\src\opt_adv.cpp
diff --git a/langpacks/bulgarian/Plugins/SkypeWeb.txt b/langpacks/bulgarian/Plugins/SkypeWeb.txt
index 7372688099..0047e903b9 100644
--- a/langpacks/bulgarian/Plugins/SkypeWeb.txt
+++ b/langpacks/bulgarian/Plugins/SkypeWeb.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: SkypeWeb.dll
 ;  Plugin: Skype protocol (Web)
-;  Version: 0.12.3.1
+;  Version: 0.12.3.3
 ;  Authors: Miranda NG team
 ;============================================================
 [Skype protocol support for Miranda NG. Based on new Skype for Web.]
diff --git a/langpacks/bulgarian/Plugins/SmileyAdd.txt b/langpacks/bulgarian/Plugins/SmileyAdd.txt
index 5e44a3a835..3044ef8a37 100644
--- a/langpacks/bulgarian/Plugins/SmileyAdd.txt
+++ b/langpacks/bulgarian/Plugins/SmileyAdd.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: SmileyAdd.dll
 ;  Plugin: SmileyAdd
-;  Version: 0.3.1.0
+;  Version: 0.3.1.1
 ;  Authors: Peacow, nightwish, bid, borkra
 ;============================================================
 [Smiley support for Miranda NG.]
diff --git a/langpacks/bulgarian/Plugins/StatusManager.txt b/langpacks/bulgarian/Plugins/StatusManager.txt
index 73dba5b728..b6bf105e70 100644
--- a/langpacks/bulgarian/Plugins/StatusManager.txt
+++ b/langpacks/bulgarian/Plugins/StatusManager.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: StatusManager.dll
 ;  Plugin: Status manager
-;  Version: 1.2.0.4
+;  Version: 1.2.0.5
 ;  Authors: P Boon
 ;============================================================
 [A connection checker and auto away module. Also allows you to define the status Miranda should set on startup, configurable per protocol.]
diff --git a/langpacks/bulgarian/Plugins/TabSRMM.txt b/langpacks/bulgarian/Plugins/TabSRMM.txt
index 7dad5d56cc..ce4d82610a 100644
--- a/langpacks/bulgarian/Plugins/TabSRMM.txt
+++ b/langpacks/bulgarian/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: TabSRMM.dll
 ;  Plugin: TabSRMM
-;  Version: 3.5.0.12
+;  Version: 3.5.0.13
 ;  Authors: The Miranda developers team and contributors
 ;============================================================
 [IM and group chat module for Miranda NG.]
@@ -178,8 +178,6 @@ Popup настройки
 Грешки
 [Use the message log color theme for group chat popups]
 Ползване цветовете на дневника и за popups относно групови чатове
-[No compatible popup plugin was found. The event notification\nsystem is not available.]
-Системата за уведомяване е неактивна, защото не е открита съвместима Popup приставка.
 [Dialog]
 Прозорец
 [Cancel]
@@ -1697,10 +1695,6 @@ Latin I
 Изключена функция (насложена икона)
 [Feature enabled (used as overlay)]
 Включена функция (насложена икона)
-[Enable typing notification]
-
-[Disable typing notification]
-
 ;file \plugins\TabSRMM\src\msgs.h
 [Message windows - IM]
 Прозорци за съобщения - IM
@@ -1984,10 +1978,10 @@ TabSRMM изисква Windows версия 2000 или по-нова.
 Изключване на уведомяванията при писане
 [Enable &typing notification]
 Включване на уведомяванията при писане
-[...is typing a message.]
-...пише съобщение.
 [...has stopped typing.]
 ...спря да пише.
+[...is typing a message.]
+...пише съобщение.
 [Contact started typing]
 Контакт започна да пише
 [Contact stopped typing]
diff --git a/langpacks/bulgarian/Plugins/UInfoEx.txt b/langpacks/bulgarian/Plugins/UInfoEx.txt
index 9b62c55248..9bb083fb78 100644
--- a/langpacks/bulgarian/Plugins/UInfoEx.txt
+++ b/langpacks/bulgarian/Plugins/UInfoEx.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: UInfoEx.dll
 ;  Plugin: User info ext
-;  Version: 0.8.5.1
+;  Version: 0.8.5.2
 ;  Authors: DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
 ;============================================================
 [Extended UserInfo module for Miranda NG. Provides interface to edit all contact information.]
@@ -1110,12 +1110,10 @@ Web дизайн
 [b]%s (%S)...[/b]\n%d оставащи контакта
 [Abort Refreshing Contact Details]
 Прекратяване обновяването на подробностите за контакта
-[Do you want to cancel the current refresh procedure?]
-Желаете ли процедурата по обновяване да бъде отказана?
 [Miranda must be online for refreshing contact information!]
 За да бъде обновена информацията е необходимо да сте на линия!
-[The function caused an exception!]
-
+[Do you want to cancel the current refresh procedure?]
+Желаете ли процедурата по обновяване да бъде отказана?
 ;file \plugins\UserInfoEx\src\svc_reminder.cpp
 [%s has %s today.]
 %s има %s днес.
@@ -1216,16 +1214,8 @@ Web дизайн
 ;file \plugins\UserInfoEx\src\ex_import\svc_ExImXML.cpp
 [Can't create xml file!\n%S]
 Създаването на xml файл е невъзможно!\n%S
-[Export took %f ms]
-Износа отне %f ms
 [Contact: %s (%S)]
 Контакт: %s (%S)
-[Importing %s caused error %d]
-Внасянето на %s доведе до грешка %d
-[Loading contact %s from xml failed with error %d]
-
-[Importing Owner caused error %d]
-
 [Parser is unable to load XMLCard "%s"\nError: %d\nDescription: %s]
 
 [The selected file is no valid XMLCard]
@@ -1238,12 +1228,8 @@ Web дизайн
 
 [Selected XMLCard does not contain an owner contact!]
 
-[Import took %f ms]
-Внасянето отне %f ms
 [added contacts: %u / %u\nadded settings: %u / %u\nadded events %u / %u\nduplicated events: %u]
 %u добавени контакта / %u\n%u добавени настройки / %u\n%u добавени събития / %u\n%u повтарящи се събития
-[FATAL: An exception was thrown while importing contacts from xmlCard!]
-
 ;file \plugins\UserInfoEx\src\Flags\svc_flags.cpp
 [Flags (UInfoEx)]
 Знамена (UInfoEx)
diff --git a/langpacks/bulgarian/Plugins/VKontakte.txt b/langpacks/bulgarian/Plugins/VKontakte.txt
index 5be71d78ca..7c5697e10f 100644
--- a/langpacks/bulgarian/Plugins/VKontakte.txt
+++ b/langpacks/bulgarian/Plugins/VKontakte.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: VKontakte.dll
 ;  Plugin: VKontakte protocol
-;  Version: 0.1.8.1
+;  Version: 0.1.9.0
 ;  Authors: Miranda NG team
 ;============================================================
 [VKontakte protocol support for Miranda NG.]
diff --git a/langpacks/bulgarian/Plugins/Weather.txt b/langpacks/bulgarian/Plugins/Weather.txt
index 8f5c2665c7..a985e9a67e 100644
--- a/langpacks/bulgarian/Plugins/Weather.txt
+++ b/langpacks/bulgarian/Plugins/Weather.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Retrieves weather information and displays it in your contact list.]
 Извлича метеорологична информация и я представя в списъка с контакти.
-;file \plugins\Weather\res\resource.rc
+;file \protocols\Weather\res\resource.rc
 [Update]
 Обнови
 [Brief Info]
@@ -254,7 +254,7 @@ Popup заглавие
 Към старите настройки
 [To default]
 Стандарт
-;file \plugins\Weather\src\stdafx.h
+;file \protocols\Weather\src\stdafx.h
 [N/A]
 НД
 [Invalid ID format, missing "/" (10)]
@@ -337,7 +337,7 @@ HTTP грешка: Gateway timeout (504)
 Не е зададен адрес за пълната прогноза. Можете да го зададете от менюто на контактите>"Редактиране на настройките".
 [The URL for weather map has not been set. You can set it from the Edit Settings dialog.]
 Не е зададен URL адрес за метеокартата. Можете да го зададете от менюто на контактите>"Редактиране на настройките".
-;file \plugins\Weather\src\weather.cpp
+;file \protocols\Weather\src\weather.cpp
 [Enable/disable auto update]
 Вкл / Изкл на автоматично обновяване
 [Auto Update Enabled]
@@ -348,7 +348,7 @@ HTTP грешка: Gateway timeout (504)
 Промяна на метеорологичните условия
 [Alert Issued]
 
-;file \plugins\Weather\src\weather_addstn.cpp
+;file \protocols\Weather\src\weather_addstn.cpp
 [Current weather information for %s.]
 Текуща атмосферна информация за %s.
 [%s is now the default weather station]
@@ -361,7 +361,7 @@ Weather Protocol
 <Въведете име на станцията>
 [<Enter station ID here>]
 <Въведете ID на станцията тук>
-;file \plugins\Weather\src\weather_contacts.cpp
+;file \protocols\Weather\src\weather_contacts.cpp
 [Weather condition was not logged.]
 
 [Get city name from ID]
@@ -378,7 +378,7 @@ Weather Protocol
 Текстови файлове
 [All Files]
 Всички файлове
-;file \plugins\Weather\src\weather_conv.cpp
+;file \protocols\Weather\src\weather_conv.cpp
 [mb]
 МБ
 [in]
@@ -391,15 +391,15 @@ mm
 <Грешка>
 [HTTP Error %i]
 HTTP грешка: %i
-;file \plugins\Weather\src\weather_data.cpp
+;file \protocols\Weather\src\weather_data.cpp
 [<Enter city name here>]
 <Въведете името на града тук>
 [Error when obtaining data: %s]
 Грешка при добиването на информация: %s
-;file \plugins\Weather\src\weather_http.cpp
+;file \protocols\Weather\src\weather_http.cpp
 [Weather HTTP connections]
 HTTP връзки на метео протокола
-;file \plugins\Weather\src\weather_icons.cpp
+;file \protocols\Weather\src\weather_icons.cpp
 [Protocol icon]
 Икона на протокола
 [Update Disabled]
@@ -420,7 +420,7 @@ HTTP връзки на метео протокола
 Без Popup
 [Edit Settings]
 Редактиране на настройките
-;file \plugins\Weather\src\weather_info.cpp
+;file \protocols\Weather\src\weather_info.cpp
 [Name]
 Име
 [Author]
@@ -459,21 +459,21 @@ INI версия
 байта
 [Description:]
 Описание:
-;file \plugins\Weather\src\weather_ini.cpp
+;file \protocols\Weather\src\weather_ini.cpp
 [All update data has been reloaded.]
 Всички обновени данни са заредени.
 [Invalid ini format for: %s]
 Невалиден .INI формат за: %s
 [No update data file is found. Please check your Plugins\\Weather directory.]
 Не е открит файл с данни. Моля, проверете директорията Plugins\\Weather
-;file \plugins\Weather\src\weather_mwin.cpp
+;file \protocols\Weather\src\weather_mwin.cpp
 [Frame Font]
 Шрифт за рамката
 [Frame Title Font]
 Шрифт за заглавие на рамките
 [Frame Background]
 Фон на рамката
-;file \plugins\Weather\src\weather_opt.cpp
+;file \protocols\Weather\src\weather_opt.cpp
 [Weather Protocol Text Preview]
 Преглед на текст от протокола Weather
 [Network]
@@ -484,8 +484,8 @@ INI версия
 Изобразяване
 [Popups]
 Рopups
-;file \plugins\Weather\src\weather_popup.cpp
-;file \plugins\Weather\src\weather_svcs.cpp
+;file \protocols\Weather\src\weather_popup.cpp
+;file \protocols\Weather\src\weather_svcs.cpp
 [Station ID]
 ID на станцията
 [Disable &weather notification]
@@ -512,10 +512,10 @@ Weather
 Метеоуведомяване
 [Display in a frame]
 Изобразяване в рамка
-;file \plugins\Weather\src\weather_update.cpp
+;file \protocols\Weather\src\weather_update.cpp
 [Unable to retrieve weather information for %s]
 Извличането на атмосферни данни за %s е невъзможно
-;file \plugins\Weather\src\weather_userinfo.cpp
+;file \protocols\Weather\src\weather_userinfo.cpp
 [Variable]
 Променливо
 [Information]
diff --git a/langpacks/bulgarian/Plugins/WebView.txt b/langpacks/bulgarian/Plugins/WebView.txt
index 59d1018a62..915e71c608 100644
--- a/langpacks/bulgarian/Plugins/WebView.txt
+++ b/langpacks/bulgarian/Plugins/WebView.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Adds web pages as contacts to your contact list and can display text and/or issue change alerts from those pages in a window.]
 
-;file \plugins\WebView\res\webview.rc
+;file \protocols\WebView\res\webview.rc
 [Webview]
 
 [Update data every]
@@ -180,7 +180,7 @@ Popup времетраене
 
 [C&lear all]
 
-;file \plugins\WebView\src\main.cpp
+;file \protocols\WebView\src\main.cpp
 [Alert event]
 
 [Auto update disabled]
@@ -207,14 +207,14 @@ Popup времетраене
 
 [Stop data processing]
 
-;file \plugins\WebView\src\webview.cpp
+;file \protocols\WebView\src\webview.cpp
 [All Webview sites have been updated.]
 
 [Network]
 Мрежа
 [Popups]
 Рopups
-;file \plugins\WebView\src\webview_alerts.cpp
+;file \protocols\WebView\src\webview_alerts.cpp
 [Cannot write to file]
 
 [Last updated on]
@@ -245,7 +245,7 @@ Popup времетраене
 
 [Loaded from cache]
 
-;file \plugins\WebView\src\webview_datawnd.cpp
+;file \protocols\WebView\src\webview_datawnd.cpp
 [ERROR: You have two or more Webview contacts with the same URL and contact name.]
 
 [Alert options]
@@ -258,7 +258,7 @@ Popup времетраене
 
 [Disable stick to the front]
 
-;file \plugins\WebView\src\webview_getdata.cpp
+;file \protocols\WebView\src\webview_getdata.cpp
 [URL not supplied]
 
 [Download in progress, please wait...]
@@ -305,7 +305,7 @@ Popup времетраене
 
 [Alert test conditions not met; press the refresh button to view content.]
 
-;file \plugins\WebView\src\webview_opts.cpp
+;file \protocols\WebView\src\webview_opts.cpp
 [No whitespace removal]
 
 [Minimal level of whitespace removal]
@@ -342,7 +342,7 @@ Popup приставка
 
 [Invalid symbol present in contact name.]
 
-;file \plugins\WebView\src\webview_services.cpp
+;file \protocols\WebView\src\webview_services.cpp
 [Cache folder does not exist.]
 
 [Missing "psite.bat" file.]
diff --git a/langpacks/bulgarian/Plugins/WhoUsesMyFiles.txt b/langpacks/bulgarian/Plugins/WhoUsesMyFiles.txt
index 213944670a..faad3db14b 100644
--- a/langpacks/bulgarian/Plugins/WhoUsesMyFiles.txt
+++ b/langpacks/bulgarian/Plugins/WhoUsesMyFiles.txt
@@ -55,12 +55,10 @@
 [Show current connections]
 
 ;file \plugins\WhoUsesMyFiles\src\options.cpp
-[Popup plugin not found!]
+[Common Dialog Error 0x%lx]
 
 [Error]
 Грешка
-[Common Dialog Error 0x%lx]
-
 [Not implemented yet...]
 
 [Who uses my files]
diff --git a/langpacks/bulgarian/Plugins/YAMN.txt b/langpacks/bulgarian/Plugins/YAMN.txt
index 106d2d7b96..1bc126d7e4 100644
--- a/langpacks/bulgarian/Plugins/YAMN.txt
+++ b/langpacks/bulgarian/Plugins/YAMN.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Mail notifier and browser for Miranda NG. Included POP3 protocol.]
 
-;file \plugins\YAMN\res\YAMN.rc
+;file \protocols\YAMN\res\YAMN.rc
 [Installed plugins]
 
 [Version:]
@@ -156,7 +156,7 @@ Copyright:
 Цвят на фона
 [Text color]
 Цвят на текста
-;file \plugins\YAMN\src\main.cpp
+;file \protocols\YAMN\src\main.cpp
 [Check &mail (All Account)]
 
 [Check &mail (This Account)]
@@ -171,17 +171,17 @@ Copyright:
 
 [Connect Fail]
 
-;file \plugins\YAMN\src\main.h
+;file \protocols\YAMN\src\main.h
 [New mail message]
 
 [Connect failed]
 
-;file \plugins\YAMN\src\services.cpp
+;file \protocols\YAMN\src\services.cpp
 [Nick]
 Прякор
 [No new mail message]
 
-;file \plugins\YAMN\src\browser\badconnect.cpp
+;file \protocols\YAMN\src\browser\badconnect.cpp
 [%s - connection error]
 
 [An error occurred. Error code: %d]
@@ -190,7 +190,7 @@ Copyright:
 Непозната грешка
 [ - connection error]
 
-;file \plugins\YAMN\src\browser\mailbrowser.cpp
+;file \protocols\YAMN\src\browser\mailbrowser.cpp
 [%s - %d new mail messages, %d total]
 
 [%s : %d new mail message(s), %d total]
@@ -229,15 +229,15 @@ Copyright:
 
 [Delete confirmation]
 
-;file \plugins\YAMN\src\mails\mime.cpp
+;file \protocols\YAMN\src\mails\mime.cpp
 [Translate header error]
 
 [Part]
 
-;file \plugins\YAMN\src\proto\netlib.cpp
+;file \protocols\YAMN\src\proto\netlib.cpp
 [%s connection]
 %s връзка
-;file \plugins\YAMN\src\proto\pop3\pop3comm.cpp
+;file \protocols\YAMN\src\proto\pop3\pop3comm.cpp
 [Disconnected]
 
 [POP3 protocol (internal)]
@@ -314,7 +314,7 @@ Copyright:
 
 [Error %d-%d-%d-%d:]
 
-;file \plugins\YAMN\src\proto\pop3\pop3opt.cpp
+;file \protocols\YAMN\src\proto\pop3\pop3opt.cpp
 [Network]
 Мрежа
 [Accounts]
diff --git a/langpacks/bulgarian/Untranslated/=CORE=.txt b/langpacks/bulgarian/Untranslated/=CORE=.txt
index 7c795d7948..aff1b97ae4 100644
--- a/langpacks/bulgarian/Untranslated/=CORE=.txt
+++ b/langpacks/bulgarian/Untranslated/=CORE=.txt
@@ -2,6 +2,8 @@
 [Tool style main window]
 [Show formatting]
 [(Setting timeout to 0 means default setting and -1 means indefinite time)]
+[Case sensitive]
+[Global hover]
 [Open contact's chat window]
 [The import has completed from]
 [&Recycle]
diff --git a/langpacks/bulgarian/Untranslated/Clist_modern.txt b/langpacks/bulgarian/Untranslated/Clist_modern.txt
index 128a17f3d2..e0b6996423 100644
--- a/langpacks/bulgarian/Untranslated/Clist_modern.txt
+++ b/langpacks/bulgarian/Untranslated/Clist_modern.txt
@@ -22,11 +22,8 @@
 [Status bar background]
 [Frames title bar background]
 [3rd party frames transparent back color]
+[Last online]
 [Event area background]
-[Row design]
-[Empty %s cell]
-[%s, contain %s]
-[ layered]
 [Inside library]
 [%Default Skin%]
 [Toolbar background]
diff --git a/langpacks/bulgarian/Untranslated/CurrencyRates.txt b/langpacks/bulgarian/Untranslated/CurrencyRates.txt
index 388165f984..fbede80033 100644
--- a/langpacks/bulgarian/Untranslated/CurrencyRates.txt
+++ b/langpacks/bulgarian/Untranslated/CurrencyRates.txt
@@ -1,15 +1,15 @@
 [Shows currency rates.]
 [From popup plugin]
+[&Personal key:]
 [Currency Rate]
+[Tabulation]
 [Error occurred during HTML parsing.]
 [Error occurred during site access.]
-[Currency Symbol]
-[Currency Name]
-[Tabulation]
-[Percent Change to After Hours]
 [Enable/Disable Currency Rates Auto Update]
 [Currency Rates Auto Update Enabled]
 [Currency Rates Auto Update Disabled]
+[Currency Symbol]
+[This plugin requires a personal key. Press Yes to obtain it at the site and then enter the result in the Options dialog, otherwise this plugin will fail.]
 [Currency Rate Section]
 [Log Files (*.txt,*.log)]
 [Enter integer value]
diff --git a/langpacks/bulgarian/Untranslated/Db_autobackups.txt b/langpacks/bulgarian/Untranslated/Db_autobackups.txt
index 7351884d6f..aa6801fbd8 100644
--- a/langpacks/bulgarian/Untranslated/Db_autobackups.txt
+++ b/langpacks/bulgarian/Untranslated/Db_autobackups.txt
@@ -3,6 +3,8 @@
 [Backup profile folder]
 [Use CloudFile]
 [Uploading to cloud failed]
+[Enable &AutoBackups notification]
+[Disable &AutoBackups notification]
 [Database backups]
 [Backup folder]
 [will return parsed string %miranda_profilesdir%\\%miranda_profilename%]
diff --git a/langpacks/bulgarian/Untranslated/Discord.txt b/langpacks/bulgarian/Untranslated/Discord.txt
index e821ce8547..4f09443d94 100644
--- a/langpacks/bulgarian/Untranslated/Discord.txt
+++ b/langpacks/bulgarian/Untranslated/Discord.txt
@@ -1,6 +1,7 @@
 [Discord support for Miranda NG.]
+[Enable group chats]
 [Do not open chat windows on creation]
-[Use subgroups for guild's channels (requires restart)]
+[Use subgroups for server channels (requires restart)]
 [edited at]
 [Channel control]
 [Change &topic]
@@ -13,11 +14,15 @@
 [Enter channel name]
 [Enter invitation code you received]
 [Do you really want to leave the guild?]
+[Disable sync]
+[Enable sync]
 [Join guild]
 [Copy my Discord ID]
 [Leave guild]
 [Create new channel]
 [Copy Discord ID]
+[Enable guild sync]
+[Load server history]
 [%s gateway connection]
 [User ID]
 [Protocol is offline or user isn't authorized yet]
diff --git a/langpacks/bulgarian/Untranslated/ICQ.txt b/langpacks/bulgarian/Untranslated/ICQ.txt
index 4e112e99fb..dfd7d94c42 100644
--- a/langpacks/bulgarian/Untranslated/ICQ.txt
+++ b/langpacks/bulgarian/Untranslated/ICQ.txt
@@ -1,6 +1,8 @@
 [UIN/e-mail:]
 [Sign in/sign up using phone]
 [Do not open chat windows on creation]
+[Use tray icon notifications]
+[Launch mailbox in a browser on click]
 [If a contact goes Offline, set this status instead and cache it for given timeout in seconds (0 - disabled)]
 [After that, set this status to a contact and move it offline after specified timeout in seconds (0 - disabled)]
 [Send group chat invitation]
@@ -17,7 +19,10 @@
 [&Invite a user]
 [&Leave/destroy chat]
 [Do you really want to remove it from ignore list?]
+[E-mail notification]
 [Remove Ignore]
+[You received e-mail from %s: %s]
+[You have %d unread emails]
 [Synchronize server groups]
 [Edit ignore list]
 [UIN/e-mail/phone]
diff --git a/langpacks/bulgarian/Untranslated/Import.txt b/langpacks/bulgarian/Untranslated/Import.txt
index 0a7371177d..1068ff2459 100644
--- a/langpacks/bulgarian/Untranslated/Import.txt
+++ b/langpacks/bulgarian/Untranslated/Import.txt
@@ -13,7 +13,6 @@
 [Skipping contact, account %S cannot be mapped.]
 [Skipping contact, %S not installed.]
 [Skipping non-IM contact (%S)]
-[Skipping %S contact, ID not found]
 [Skipping duplicate %S contact %s]
 [Failed to add %S contact %s]
 [Added %S contact %s, '%s']
diff --git a/langpacks/bulgarian/Untranslated/Jabber.txt b/langpacks/bulgarian/Untranslated/Jabber.txt
index 8065aca65d..caeca61db0 100644
--- a/langpacks/bulgarian/Untranslated/Jabber.txt
+++ b/langpacks/bulgarian/Untranslated/Jabber.txt
@@ -2,9 +2,8 @@
 [Allow file sending through bytestream proxy server:]
 [Send group chat invitation]
 [Incoming group chat invitation]
+[Filter:]
 [The transaction identifier is:]
-[Jabber Ad-Hoc commands at %s]
-[Sending Ad-Hoc command to %s]
 [Supports Service Discovery items list]
 [Can request and respond to events relating to the delivery, display, and composition of messages]
 [Can request advanced processing of message stanzas]
@@ -16,18 +15,15 @@
 [Supports Miranda NG notes extension]
 [Receives information about OMEMO devices]
 [Supports message carbons (XEP-0280)]
-[Outcast]
 [Invite Users to\n%s]
-[%s from\n%s]
 [Outgoing XML parsing error]
 [request timeout.]
 [Add search directory]
-[Info request error]
-[Items request error]
 [Room list request timed out.]
 [Please specify group chat directory first.]
 [Group chat invitation to\n%s]
 [Open]
+[Authentication]
 [Jabber Bookmarks Error]
 [Voice List]
 [Do you want to create OMEMO session with new device:]
@@ -84,14 +80,12 @@
 [League Of Legends (US)]
 [Odnoklassniki]
 [No valid OMEMO session exists]
-[Extended away (Not available)]
-[Play sounds]
-[Workstation successfully locked]
-[Error %d occurred during workstation lock]
-[Error %s %s\r\nTry to specify more detailed]
 [Select/type search service URL above and press <Go>]
 [sent error presence]
 [sent unknown presence type]
+[Outcast]
+[Registration canceled]
+[Last activity]
 [Tune]
 [Redirect]
 [Payment required]
diff --git a/langpacks/bulgarian/Untranslated/MSN.txt b/langpacks/bulgarian/Untranslated/MSN.txt
index 0a97e938ce..7d40c74b47 100644
--- a/langpacks/bulgarian/Untranslated/MSN.txt
+++ b/langpacks/bulgarian/Untranslated/MSN.txt
@@ -4,7 +4,6 @@
 [&Kick user]
 [&Op user]
 [&Deop user]
-[%I64u bytes]
 [IID_IOleObject failed.]
 [IID_IOleInPlaceObject failed.]
 [Failed to Advise]
diff --git a/langpacks/bulgarian/Untranslated/NotesReminders.txt b/langpacks/bulgarian/Untranslated/NotesReminders.txt
index 68f50cb4d6..f17203d92b 100644
--- a/langpacks/bulgarian/Untranslated/NotesReminders.txt
+++ b/langpacks/bulgarian/Untranslated/NotesReminders.txt
@@ -19,7 +19,7 @@
 [Open links with this program instead:]
 [(Using MCI allows different sounds to be played simultaneously, may not be needed or desired when a custom sound plugin is installed.)]
 [Add Reminder]
-[Trigger On Time && Date:]
+[Repeat each day]
 [Reminder Note:]
 [Repeat Alert Sound]
 [Use Sound]
@@ -37,7 +37,6 @@
 [New &Reminder]
 [&Delete Reminder]
 [D&elete All Reminders]
-[Context Menu Note Popup]
 [&Hide Note]
 [&Always On Top]
 [&New Note]
@@ -52,13 +51,10 @@
 [Always &On Top]
 [Delete &All Notes]
 [&Show / Hide Notes]
-[Notes & Reminders]
 [New Note]
 [Toggle Notes Visibility]
 [Bring All Notes to Front]
 [New Reminder]
-[Are you sure you want to delete all notes?]
-[Are you sure you want to delete all reminders?]
 [Delete All Notes]
 [Show/Hide Notes]
 [On Top Caption Icon]
@@ -74,15 +70,15 @@
 [Sticky Notes]
 [Add New Note]
 [Add New Reminder]
-[Reminder triggered]
-[Reminder triggered (Alternative 1)]
-[Reminder triggered (Alternative 2)]
 [Notes && Reminders]
 [New &Note]
 [Vie&w Notes]
 [&Delete All Notes]
 [&Bring All to Front]
 [Miranda could not load the Notes & Reminders plugin, Msftedit.dll is missing. If you are using WINE, please make sure you have Msftedit.dll installed. Press 'Yes' to continue loading Miranda.]
+[Reminder triggered]
+[Reminder triggered (Alternative 1)]
+[Reminder triggered (Alternative 2)]
 [Maroon]
 [Olive]
 [Navy]
@@ -93,6 +89,7 @@
 [Aqua]
 [Are you sure you want to delete this note?]
 [Date/Title]
+[Are you sure you want to delete all notes?]
 [Sticky Note Caption]
 [Sticky Note Background Color]
 [Sticky Note Body]
@@ -106,4 +103,6 @@
 [Alternative 2]
 [Reminder text]
 [Date of activation]
+[Are you sure you want to delete all reminders?]
 [Are you sure you want to delete this reminder?]
+[Notes & Reminders]
diff --git a/langpacks/bulgarian/Untranslated/TabSRMM.txt b/langpacks/bulgarian/Untranslated/TabSRMM.txt
index 9513b45318..f14816aac5 100644
--- a/langpacks/bulgarian/Untranslated/TabSRMM.txt
+++ b/langpacks/bulgarian/Untranslated/TabSRMM.txt
@@ -37,8 +37,6 @@
 [Do you want to also read message templates from the theme?\nCaution: This will overwrite the stored template set which may affect the look of your message window significantly.\nSelect Cancel to not load anything at all.]
 [Window layout tweaks]
 [Image tag]
-[Enable typing notification]
-[Disable typing notification]
 [Deferred]
 [Message window warning]
 [Message In]
diff --git a/langpacks/bulgarian/Untranslated/UInfoEx.txt b/langpacks/bulgarian/Untranslated/UInfoEx.txt
index 6111d47275..f889987501 100644
--- a/langpacks/bulgarian/Untranslated/UInfoEx.txt
+++ b/langpacks/bulgarian/Untranslated/UInfoEx.txt
@@ -29,7 +29,6 @@
 [TmplPast Work Place]
 [TmplPast Organization]
 [In a civil union]
-[The function caused an exception!]
 [Reminders]
 [The contact %s(%s) has no unique ID in the vCard,\nbut there is a contact in your contact list with the same nick and protocol.\nDo you wish to use this contact?]
 [Importing a new meta subcontact failed!]
@@ -39,9 +38,6 @@
 [The ini-file "%s"\nfor saving contact information could not be opened.]
 [The ini-file "%s"\nfor reading contact information could not be opened.]
 [Select a destination file...]
-[Loading contact %s from xml failed with error %d]
-[Importing Owner caused error %d]
 [Parser is unable to load XMLCard "%s"\nError: %d\nDescription: %s]
 [Owner contact successfully imported.]
 [Selected XMLCard does not contain an owner contact!]
-[FATAL: An exception was thrown while importing contacts from xmlCard!]
diff --git a/langpacks/bulgarian/Untranslated/WhoUsesMyFiles.txt b/langpacks/bulgarian/Untranslated/WhoUsesMyFiles.txt
index 972233d2e8..6e5fc23906 100644
--- a/langpacks/bulgarian/Untranslated/WhoUsesMyFiles.txt
+++ b/langpacks/bulgarian/Untranslated/WhoUsesMyFiles.txt
@@ -18,7 +18,6 @@
 [Alert computer name with username]
 [Disabled options will be available in the next version]
 [Show current connections]
-[Popup plugin not found!]
 [Common Dialog Error 0x%lx]
 [Not implemented yet...]
 [Who uses my files]
diff --git a/langpacks/croatian/=CORE=.txt b/langpacks/croatian/=CORE=.txt
index 6f73b147f9..ce85a3fab7 100644
--- a/langpacks/croatian/=CORE=.txt
+++ b/langpacks/croatian/=CORE=.txt
@@ -570,6 +570,55 @@ Otvori na o&voj poziciji
 
 [Delete]
 
+;file \src\core\stdpopup\res\resource.rc
+[Popup history]
+
+[Case sensitive]
+
+[Default timeout]
+
+[Never timeout]
+
+[Set timeout:]
+
+[Width:]
+
+[Maximum height:]
+
+[Opacity (%):]
+
+[Border]
+
+[Round corners (window)]
+
+[Preview]
+
+[Transparent background]
+
+[Layout]
+
+[Avatar size:]
+
+[Disable when]
+
+[Global hover]
+
+[Sidebar width:]
+
+[Text indent:]
+
+[Padding:]
+
+[Round corners (avatar)]
+
+[Text color:]
+
+[Background color:]
+
+[Set timeout]
+
+[Timeout value (0 = default):]
+
 ;file \src\core\stduihist\res\resource.rc
 [Find]
 
@@ -1749,6 +1798,88 @@ Prika&ži/sakrij popis nadimaka
 ;file \src\core\stdmsg\src\msgtimedout.cpp
 [An unknown error has occurred.]
 
+;file \src\core\stdpopup\src\icons.cpp
+[Popups are enabled]
+
+[Popups are disabled]
+
+;file \src\core\stdpopup\src\notify_imp.cpp
+;file \src\core\stdpopup\src\options.cpp
+[Example]
+
+[The quick brown fox jumped over the lazy dog.]
+
+[Example With a Long Title]
+
+[Thequickbrownfoxjumpedoverthelazydog.]
+
+[An avatar.]
+
+[Bottom right]
+
+[Bottom left]
+
+[Top right]
+
+[Top left]
+
+[Icon on left]
+
+[Icon on right]
+
+[No time]
+
+[Time on left]
+
+[Time on right]
+
+[Time above avatar]
+
+[No avatar]
+
+[Left avatar]
+
+[Right avatar]
+
+[Full-screen app running]
+
+[No animate]
+
+[Horizontal animate]
+
+[Vertical animate]
+
+[You cannot set a default timeout of 0.\nValue has been reset.]
+
+[Settings]
+
+[Classes]
+
+;file \src\core\stdpopup\src\services.cpp
+[Disable popups]
+
+[Enable popups]
+
+;file \src\core\stdpopup\src\yapp.cpp
+[Toggle popups]
+
+[First line]
+
+[Second line]
+
+[Time]
+
+[Sidebar]
+
+[Title underline]
+
+;file \src\core\stdpopup\src\yapp_history_dlg.cpp
+[Copy title to clipboard]
+
+[Copy message to clipboard]
+
+[Copy timestamp to clipboard]
+
 ;file \src\core\stdssl\src\netlibssl.cpp
 [Client cannot decode host message. Possible causes: host does not support SSL or requires not existing security package]
 
@@ -2631,8 +2762,6 @@ prazni blob
 unicode kodirani dodatak
 [ANSI plugin]
 Dodatak u kodiranju ansi
-[Unused]
-
 [Show/Hide]
 Prikaži / Sakrij
 [Exit]
@@ -2647,6 +2776,8 @@ Premjesti na grupu
 Uključen
 [Off]
 isključen
+[Unused]
+
 [Frames]
 Okviri
 [Add group]
diff --git a/langpacks/croatian/Plugins/Actman.txt b/langpacks/croatian/Plugins/Actman.txt
index 5fff30b4c4..81c5145050 100644
--- a/langpacks/croatian/Plugins/Actman.txt
+++ b/langpacks/croatian/Plugins/Actman.txt
@@ -677,19 +677,19 @@ lista kontakata
 
 [Empty updater download folder]
 
-[Popup Plus (popup.dll) latest YAPP (yapp.dll)]
+[Popup plus (PopupPlus.dll) latest StdPopup (StdPopup.dll)]
 
-[Enables or disables Popup windows]
+[Enables or disables popup windows]
 
 [Notify]
 
-[YAPP or Popup]
+[StdPopup or Popup plus]
 
 [Popup window]
 
 [Unicode Text]
 
-[Enables or disables Popup windows (maybe deprecated)]
+[Enables or disables popup windows (maybe deprecated)]
 
 [result of protocol service call]
 
diff --git a/langpacks/croatian/Plugins/ChangeKeyboardLayout.txt b/langpacks/croatian/Plugins/ChangeKeyboardLayout.txt
index 55cfd364cd..dbf3d1aa15 100644
--- a/langpacks/croatian/Plugins/ChangeKeyboardLayout.txt
+++ b/langpacks/croatian/Plugins/ChangeKeyboardLayout.txt
@@ -82,8 +82,6 @@ tekst
 [Popups]
 
 ;file \plugins\ChangeKeyboardLayout\src\main.cpp
-[Popup]
-
 ;file \plugins\ChangeKeyboardLayout\src\stdafx.h
 [ChangeKeyboardLayout]
 
diff --git a/langpacks/croatian/Plugins/Clist_modern.txt b/langpacks/croatian/Plugins/Clist_modern.txt
index ae2c26a202..e339c103a5 100644
--- a/langpacks/croatian/Plugins/Clist_modern.txt
+++ b/langpacks/croatian/Plugins/Clist_modern.txt
@@ -747,6 +747,8 @@ Pozadina
 
 [Rate]
 
+[Last online]
+
 [-Nothing-]
 
 [Hide to tray]
@@ -808,8 +810,6 @@ tekst
 
 [Row]
 
-[Row design]
-
 ;file \plugins\Clist_modern\src\modern_clistsettings.cpp
 [(Unknown contact)]
 
@@ -835,21 +835,6 @@ tekst
 
 [Show/Hide offline users]
 
-;file \plugins\Clist_modern\src\modern_rowtemplateopt.cpp
-[Empty %s cell]
-
-[column]
-
-[line]
-
-[columns]
-
-[lines]
-
-[%s, contain %s]
-
-[ layered]
-
 ;file \plugins\Clist_modern\src\modern_skinopt.cpp
 [( unknown )]
 
diff --git a/langpacks/croatian/Plugins/CloudFile.txt b/langpacks/croatian/Plugins/CloudFile.txt
index a0766abbf4..b5072aeedc 100644
--- a/langpacks/croatian/Plugins/CloudFile.txt
+++ b/langpacks/croatian/Plugins/CloudFile.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Allows you to transfer files via cloud services.]
 
-;file \plugins\CloudFile\res\resource.rc
+;file \protocols\CloudFile\res\resource.rc
 [Default service]
 
 [General]
@@ -42,7 +42,7 @@
 
 [Revoke access]
 
-;file \plugins\CloudFile\src\icons.cpp
+;file \protocols\CloudFile\src\icons.cpp
 [Upload file(s)]
 
 [Dropbox]
@@ -53,22 +53,22 @@
 
 [Yandex.Disk]
 
-;file \plugins\CloudFile\src\menus.cpp
+;file \protocols\CloudFile\src\menus.cpp
 [Upload to...]
 
 [Upload]
 
-;file \plugins\CloudFile\src\options.cpp
+;file \protocols\CloudFile\src\options.cpp
 [None]
 
 [Services]
 
-;file \plugins\CloudFile\src\srmm.cpp
+;file \protocols\CloudFile\src\srmm.cpp
 [Upload files to...]
 
-;file \plugins\CloudFile\src\Services\dropbox_service.cpp
+;file \protocols\CloudFile\src\Services\dropbox_service.cpp
 [Server does not respond]
 
-;file \plugins\CloudFile\src\Services\google_service.cpp
-;file \plugins\CloudFile\src\Services\microsoft_service.cpp
-;file \plugins\CloudFile\src\Services\yandex_service.cpp
+;file \protocols\CloudFile\src\Services\google_service.cpp
+;file \protocols\CloudFile\src\Services\microsoft_service.cpp
+;file \protocols\CloudFile\src\Services\yandex_service.cpp
diff --git a/langpacks/croatian/Plugins/CmdLine.txt b/langpacks/croatian/Plugins/CmdLine.txt
index 44fa478468..b544ed6eb2 100644
--- a/langpacks/croatian/Plugins/CmdLine.txt
+++ b/langpacks/croatian/Plugins/CmdLine.txt
@@ -195,8 +195,3 @@
 
 [You can only run one instance of CmdLine plugin.]
 
-;file \plugins\CmdLine\src\utils.cpp
-[Notify]
-
-[Warning]
-Upozorenje
diff --git a/langpacks/croatian/Plugins/ConnectionNotify.txt b/langpacks/croatian/Plugins/ConnectionNotify.txt
index 36287c98ee..18e7a5b09b 100644
--- a/langpacks/croatian/Plugins/ConnectionNotify.txt
+++ b/langpacks/croatian/Plugins/ConnectionNotify.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Notify with popup if some connection established]
 
-;file \plugins\ConnectionNotify\res\ConnectionNotify.rc
+;file \protocols\ConnectionNotify\res\ConnectionNotify.rc
 [Set popup colors]
 
 [Popup options]
@@ -56,7 +56,7 @@ tekst
 
 [Remote IP:Port]
 
-;file \plugins\ConnectionNotify\src\ConnectionNotify.cpp
+;file \protocols\ConnectionNotify\src\ConnectionNotify.cpp
 [Show]
 prikaži
 [Hide]
@@ -79,6 +79,6 @@ prikaži
 
 [New Connection Notification]
 
-;file \plugins\ConnectionNotify\src\filter.cpp
+;file \protocols\ConnectionNotify\src\filter.cpp
 [First close options window]
 
diff --git a/langpacks/croatian/Plugins/CrashDumper.txt b/langpacks/croatian/Plugins/CrashDumper.txt
index 7818a83344..4c64a201d7 100644
--- a/langpacks/croatian/Plugins/CrashDumper.txt
+++ b/langpacks/croatian/Plugins/CrashDumper.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: CrashDumper.dll
 ;  Plugin: Crash dumper
-;  Version: 0.1.0.2
+;  Version: 0.1.0.3
 ;  Authors: borkra
 ;============================================================
 [Crash Dumper and Version Information for Miranda NG.]
diff --git a/langpacks/croatian/Plugins/CurrencyRates.txt b/langpacks/croatian/Plugins/CurrencyRates.txt
index 46306dfb7c..c487cb03bd 100644
--- a/langpacks/croatian/Plugins/CurrencyRates.txt
+++ b/langpacks/croatian/Plugins/CurrencyRates.txt
@@ -2,12 +2,12 @@
 ;============================================================
 ;  File: CurrencyRates.dll
 ;  Plugin: Currency Rates
-;  Version: 0.1.0.101
+;  Version: 0.2.0.3
 ;  Authors: Dioksin
 ;============================================================
 [Shows currency rates.]
 
-;file \plugins\CurrencyRates\res\Forex.rc
+;file \protocols\CurrencyRates\res\Forex.rc
 [Variable List]
 
 [Edit Settings]
@@ -104,14 +104,16 @@ koristi zadane boje
 
 [&Tendency:]
 
+[&Personal key:]
+
 [&Advanced Settings...]
 
 [Rate Info]
 
-;file \plugins\CurrencyRates\src\Chart.h
+;file \protocols\CurrencyRates\src\Chart.h
 [There is nothing to show]
 
-;file \plugins\CurrencyRates\src\CommonOptionDlg.cpp
+;file \protocols\CurrencyRates\src\CommonOptionDlg.cpp
 [Seconds]
 sekundi
 [Minutes]
@@ -124,24 +126,15 @@ sekundi
 
 [Enter text to display in contact list.]
 
-;file \plugins\CurrencyRates\src\CurrencyConverter.cpp
+;file \protocols\CurrencyRates\src\CurrencyConverter.cpp
 [Info provided by]
 
 [Enter positive number.]
 
-;file \plugins\CurrencyRates\src\CurrencyRateInfoDlg.cpp
+;file \protocols\CurrencyRates\src\CurrencyRateInfoDlg.cpp
 [Currency Rate]
 
-;file \plugins\CurrencyRates\src\CurrencyRatesProviderCurrencyConverter.cpp
-[Error occurred during HTML parsing.]
-
-[Error occurred during site access.]
-
-;file \plugins\CurrencyRates\src\CurrencyRatesProviderVisitorFormatSpecificator.cpp
-[Currency Symbol]
-
-[Currency Name]
-
+;file \protocols\CurrencyRates\src\CurrencyRatesProviderBase.cpp
 [Source of Information]
 
 [Rate Value]
@@ -160,19 +153,10 @@ sekundi
 
 [Left slash (\\)]
 
-[Open Price]
-
-[Percent Change to After Hours]
-
-[Percent Change to Yesterday Close]
-
-[Day's High]
-
-[Day's Low]
-
-[Previous Close]
+;file \protocols\CurrencyRates\src\CurrencyRatesProviderCurrencyConverter.cpp
+[Error occurred during HTML parsing.]
 
-[Change]
+[Error occurred during site access.]
 
 [From Currency Full Name]
 
@@ -184,7 +168,7 @@ sekundi
 
 [Short notation for "%f/%i"]
 
-;file \plugins\CurrencyRates\src\Forex.cpp
+;file \protocols\CurrencyRates\src\Forex.cpp
 [Auto Update Enabled]
 
 [Auto Update Disabled]
@@ -215,12 +199,16 @@ sekundi
 
 [Currency Rates Auto Update Disabled]
 
+[Currency Symbol]
+
 [Network]
 
-;file \plugins\CurrencyRates\src\HTTPSession.cpp
+;file \protocols\CurrencyRates\src\HTTPSession.cpp
+[This plugin requires a personal key. Press Yes to obtain it at the site and then enter the result in the Options dialog, otherwise this plugin will fail.]
+
 [CurrencyRates HTTP connections]
 
-;file \plugins\CurrencyRates\src\IconLib.cpp
+;file \protocols\CurrencyRates\src\IconLib.cpp
 [Protocol icon]
 
 [Currency Rate up]
@@ -237,17 +225,15 @@ sekundi
 
 [Import]
 
-;file \plugins\CurrencyRates\src\ImportExport.cpp
+;file \protocols\CurrencyRates\src\ImportExport.cpp
 [XML File (*.xml)]
 
 [All files (*.*)]
 
-;file \plugins\CurrencyRates\src\ModuleInfo.cpp
-[Miranda could not load CurrencyRates plugin. XML parser is missing.]
-
+;file \protocols\CurrencyRates\src\ModuleInfo.cpp
 [Miranda could not load CurrencyRates plugin. Microsoft HTML parser is missing.]
 
-;file \plugins\CurrencyRates\src\SettingsDlg.cpp
+;file \protocols\CurrencyRates\src\SettingsDlg.cpp
 [Log Files (*.txt,*.log)]
 
 [Enter integer value]
diff --git a/langpacks/croatian/Plugins/Db_autobackups.txt b/langpacks/croatian/Plugins/Db_autobackups.txt
index 3d56b4074e..9ba091724d 100644
--- a/langpacks/croatian/Plugins/Db_autobackups.txt
+++ b/langpacks/croatian/Plugins/Db_autobackups.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Db_autobackups.dll
 ;  Plugin: Db autobackuper
-;  Version: 0.1.0.2
+;  Version: 0.1.0.3
 ;  Authors: chaos.persei, sje, Kildor, Billy_Bons
 ;============================================================
 [Database autobackuper plugin.]
@@ -34,8 +34,6 @@
 
 [Disable progress bar]
 
-[Disable popups]
-
 [Use CloudFile]
 
 [Backup NOW]
@@ -58,6 +56,10 @@
 [Database back up in process...]
 
 ;file \plugins\Db_autobackups\src\main.cpp
+[Enable &AutoBackups notification]
+
+[Disable &AutoBackups notification]
+
 [Miranda NG databases]
 
 [Compressed Miranda NG databases]
@@ -70,6 +72,8 @@ sve datoteke
 
 [Save profile as...]
 
+[Popups]
+
 [Database backups]
 
 [Backup folder]
diff --git a/langpacks/croatian/Plugins/Discord.txt b/langpacks/croatian/Plugins/Discord.txt
index 3846efbd4d..c5c224dec7 100644
--- a/langpacks/croatian/Plugins/Discord.txt
+++ b/langpacks/croatian/Plugins/Discord.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Discord.dll
 ;  Plugin: Discord protocol
-;  Version: 0.6.1.1
+;  Version: 0.6.2.1
 ;  Authors: George Hazan
 ;============================================================
 [Discord support for Miranda NG.]
@@ -18,9 +18,11 @@ Pojedinosti o korisniku
 
 [Default group:]
 
+[Enable group chats]
+
 [Do not open chat windows on creation]
 
-[Use subgroups for guild's channels (requires restart)]
+[Use subgroups for server channels (requires restart)]
 
 [Nick:]
 
@@ -58,6 +60,10 @@ Pojedinosti o korisniku
 
 [Do you really want to leave the guild?]
 
+[Disable sync]
+
+[Enable sync]
+
 [Join guild]
 
 [Copy my Discord ID]
@@ -68,6 +74,10 @@ Pojedinosti o korisniku
 
 [Copy Discord ID]
 
+[Enable guild sync]
+
+[Load server history]
+
 ;file \protocols\Discord\src\options.cpp
 [Network]
 
diff --git a/langpacks/croatian/Plugins/FTPFile.txt b/langpacks/croatian/Plugins/FTPFile.txt
index e6f13c429c..7410cbf9b2 100644
--- a/langpacks/croatian/Plugins/FTPFile.txt
+++ b/langpacks/croatian/Plugins/FTPFile.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: FTPFile.dll
 ;  Plugin: FTP File YM
-;  Version: 0.6.0.4
+;  Version: 0.6.0.5
 ;  Authors: yaho
 ;============================================================
 [FTP a file to a server and send the URL to your friend. Supported automatic zipping before upload and encryption via SFTP and FTPS.]
diff --git a/langpacks/croatian/Plugins/Facebook.txt b/langpacks/croatian/Plugins/Facebook.txt
index a3417122e3..211925423d 100644
--- a/langpacks/croatian/Plugins/Facebook.txt
+++ b/langpacks/croatian/Plugins/Facebook.txt
@@ -142,14 +142,14 @@ Detalji o &Korisniku
 
 [This will permanently delete the conversation history]
 
-[Former]
-
 [Myself]
 
 [Friend]
 
 [User]
 
+[Former]
+
 [Notifications]
 
 [%s and more (%d)]
diff --git a/langpacks/croatian/Plugins/GG.txt b/langpacks/croatian/Plugins/GG.txt
index 0f2b04d99b..98533d84cf 100644
--- a/langpacks/croatian/Plugins/GG.txt
+++ b/langpacks/croatian/Plugins/GG.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: GG.dll
 ;  Plugin: Gadu-Gadu protocol
-;  Version: 0.11.0.4
+;  Version: 0.95.11.1
 ;  Authors: Bartosz Bialek, Adam Strzelecki
 ;============================================================
 [Gadu-Gadu protocol support for Miranda NG.]
diff --git a/langpacks/croatian/Plugins/GmailNotifier.txt b/langpacks/croatian/Plugins/GmailNotifier.txt
index df2a5d28ca..821baac65c 100644
--- a/langpacks/croatian/Plugins/GmailNotifier.txt
+++ b/langpacks/croatian/Plugins/GmailNotifier.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Check your Gmail inboxes locally.]
 
-;file \plugins\GmailNotifier\res\options.rc
+;file \protocols\GmailNotifier\res\options.rc
 [Gmail account]
 
 [Name:]
@@ -54,7 +54,7 @@ sekundi
 
 [Log unread threads into database (enable history)]
 
-;file \plugins\GmailNotifier\src\check.cpp
+;file \protocols\GmailNotifier\src\check.cpp
 [Checking...]
 
 [Can't send account data!]
@@ -63,7 +63,7 @@ sekundi
 
 [Can't get RSS feed!]
 
-;file \plugins\GmailNotifier\src\main.cpp
+;file \protocols\GmailNotifier\src\main.cpp
 [Other]
 drugo
 [Gmail: New thread(s)]
@@ -74,7 +74,7 @@ drugo
 
 [&Check Gmail inbox]
 
-;file \plugins\GmailNotifier\src\options.cpp
+;file \protocols\GmailNotifier\src\options.cpp
 [GmailNotifier]
 
 [Network]
diff --git a/langpacks/croatian/Plugins/ICQ.txt b/langpacks/croatian/Plugins/ICQ.txt
index 7f0b7f0033..a5e8ee819b 100644
--- a/langpacks/croatian/Plugins/ICQ.txt
+++ b/langpacks/croatian/Plugins/ICQ.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: ICQ.dll
 ;  Plugin: ICQ-WIM protocol
-;  Version: 0.95.11.1
+;  Version: 0.95.11.4
 ;  Authors: George Hazan
 ;============================================================
 [ICQ protocol support for Miranda NG.]
@@ -16,7 +16,11 @@
 
 [Do not open chat windows on creation]
 
-[Advanced]
+[Use tray icon notifications]
+
+[E-mail]
+
+[Launch mailbox in a browser on click]
 
 [If a contact goes Offline, set this status instead and cache it for given timeout in seconds (0 - disabled)]
 
@@ -59,6 +63,8 @@
 [Do you really want to remove it from ignore list?]
 
 ;file \protocols\ICQ-WIM\src\main.cpp
+[E-mail notification]
+
 [Ignore]
 
 [Remove Ignore]
@@ -66,6 +72,15 @@
 ;file \protocols\ICQ-WIM\src\options.cpp
 [Network]
 
+[General]
+
+[Advanced]
+
+;file \protocols\ICQ-WIM\src\poll.cpp
+[You received e-mail from %s: %s]
+
+[You have %d unread emails]
+
 ;file \protocols\ICQ-WIM\src\proto.cpp
 [%s server connection]
 
diff --git a/langpacks/croatian/Plugins/Import.txt b/langpacks/croatian/Plugins/Import.txt
index 7ab112db60..2aae6c1f46 100644
--- a/langpacks/croatian/Plugins/Import.txt
+++ b/langpacks/croatian/Plugins/Import.txt
@@ -111,8 +111,6 @@ kopiraj
 
 [Skipping non-IM contact (%S)]
 
-[Skipping %S contact, ID not found]
-
 [Skipping duplicate %S contact %s]
 
 [Failed to add %S contact %s]
diff --git a/langpacks/croatian/Plugins/Jabber.txt b/langpacks/croatian/Plugins/Jabber.txt
index 3a2007022c..2c59c26a26 100644
--- a/langpacks/croatian/Plugins/Jabber.txt
+++ b/langpacks/croatian/Plugins/Jabber.txt
@@ -326,6 +326,8 @@ poruke
 
 [Node:]
 
+[Filter:]
+
 [Member Information]
 
 [Role:]
@@ -392,24 +394,10 @@ Zahtjev za prihvaćanje
 [Jabber Mood]
 
 ;file \protocols\JabberG\src\jabber_adhoc.cpp
-[Error %s %s]
-
-[Select Command]
-
-[Not supported]
-
 [Done]
 
-[In progress. Please Wait...]
-
 [Execute]
 
-[Requesting command list. Please wait...]
-
-[Jabber Ad-Hoc commands at %s]
-
-[Sending Ad-Hoc command to %s]
-
 ;file \protocols\JabberG\src\jabber_agent.cpp
 [Jabber Agent Registration]
 
@@ -544,32 +532,16 @@ Zahtjev za prihvaćanje
 
 [Moderator]
 
-[Visitors]
-
-[Participants]
-
-[Moderators]
-
 [Owners]
 
-[User %s is now banned.]
-
-[User %s changed status to %s with message: %s]
-
-[User %s changed status to %s]
-
-[Room configuration was changed.]
+[Moderators]
 
-[Outcast]
+[Participants]
 
-[Affiliation of %s was changed to '%s'.]
+[Visitors]
 
 [Role of %s was changed to '%s'.]
 
-[because room is now members-only]
-
-[user banned]
-
 [Change &nickname]
 
 [&Invite a user]
@@ -668,10 +640,6 @@ Detalji o &Korisniku
 
 [%s (not on roster)]
 
-[%s from\n%s]
-
-[Real JID not available]
-
 [Reason to kick %s]
 
 [Reason to ban %s]
@@ -742,26 +710,6 @@ Detalji o &Korisniku
 
 [Copy node information]
 
-;file \protocols\JabberG\src\jabber_disco.h
-[Identities]
-
-[category]
-
-[type]
-
-[Category]
-
-[Type]
-
-[Supported features]
-
-[Info request error]
-
-[Items request error]
-
-;file \protocols\JabberG\src\jabber_filterlist.cpp
-[Set filter...]
-
 ;file \protocols\JabberG\src\jabber_groupchat.cpp
 [Failed to retrieve room list from server.]
 
@@ -769,8 +717,6 @@ Detalji o &Korisniku
 
 [Room list request timed out.]
 
-[<no nick>]
-
 [Loading...]
 
 [Please wait for room list to download.]
@@ -781,7 +727,7 @@ Detalji o &Korisniku
 
 [Change nickname in <%s>]
 
-[has set the subject to:]
+[Error]
 
 [Group chat invitation to\n%s]
 
@@ -877,7 +823,7 @@ Statusne ikone
 ;file \protocols\JabberG\src\jabber_iqid.cpp
 [Authentication failed for %s.]
 
-[Jabber Authentication]
+[Authentication]
 
 [Registration successful]
 
@@ -1469,18 +1415,6 @@ drugo
 promjene statusa
 [Don't notify history messages]
 
-[Group]
-
-[Subscription]
-
-[Uploading...]
-
-[Downloading...]
-
-[XML for MS Excel (UTF-8 encoded)]
-
-[Connecting...]
-
 [Network]
 
 [Account]
@@ -1514,8 +1448,6 @@ promjene statusa
 [Some changes will take effect the next time you connect to the Jabber network.]
 
 ;file \protocols\JabberG\src\jabber_password.cpp
-[Set New Password for %s@%S]
-
 [New password does not match.]
 
 [Current password is incorrect.]
@@ -1543,50 +1475,6 @@ promjene statusa
 
 [Allow]
 
-[Simple mode]
-
-[Advanced mode]
-
-[Add JID]
-
-[Activate]
-
-[Set default]
-
-[Edit rule]
-
-[Add rule]
-
-[Delete rule]
-
-[Move rule up]
-
-[Move rule down]
-
-[Add list...]
-
-[Remove list]
-
-[** Default **]
-
-[** Subscription: both **]
-
-[** Subscription: to **]
-
-[** Subscription: from **]
-
-[** Subscription: none **]
-
-[<none>]
-
-[Message]
-Poruka
-[Presence (in)]
-
-[Presence (out)]
-
-[Query]
-
 [List has no rules, empty lists will be deleted then changes applied]
 
 [allow ]
@@ -1627,103 +1515,89 @@ poruke
 
 [Privacy lists are not saved, discard any changes and exit?]
 
-[Please save list before activating]
-
-[First, save the list]
-
-[Please save list before you make it the default list]
-
-[No list selected]
-
-[Can't remove active or default list]
-
-[Sorry]
-
-[Unable to save list because you are currently offline.]
+[Simple mode]
 
-[List Editor...]
+[Advanced mode]
 
-;file \protocols\JabberG\src\jabber_proto.cpp
-[No compatible file transfer mechanism exists]
+[Add JID]
 
-[Protocol is offline or no JID]
+[Activate]
 
-[No valid OMEMO session exists]
+[Set default]
 
-;file \protocols\JabberG\src\jabber_rc.cpp
-[Command completed successfully]
+[Edit rule]
 
-[Error occurred during processing command]
+[Add rule]
 
-[Set status]
+[Delete rule]
 
-[Set options]
+[Move rule up]
 
-[Forward unread messages]
+[Move rule down]
 
-[Leave group chats]
+[Add list...]
 
-[Lock workstation]
+[Remove list]
 
-[Quit Miranda NG]
+[** Default **]
 
-[Change Status]
+[** Subscription: both **]
 
-[Choose the status and status message]
+[** Subscription: to **]
 
-[Status]
+[** Subscription: from **]
 
-[Extended away (Not available)]
+[** Subscription: none **]
 
-[Invisible]
+[<none>]
 
-[Offline]
+[Message]
+Poruka
+[Presence (in)]
 
-[Priority]
+[Presence (out)]
 
-[Status message]
+[Query]
 
-[Change global status]
+[Please save list before activating]
 
-[Set Options]
+[First, save the list]
 
-[Set the desired options]
+[Please save list before you make it the default list]
 
-[Automatically Accept File Transfers]
+[No list selected]
 
-[Play sounds]
+[Can't remove active or default list]
 
-[Disable remote controlling (check twice what you are doing)]
+[Sorry]
 
-[There is no messages to forward]
+[Unable to save list because you are currently offline.]
 
-[Forward options]
+[List Editor...]
 
-[%d message(s) to be forwarded]
+;file \protocols\JabberG\src\jabber_proto.cpp
+[No compatible file transfer mechanism exists]
 
-[Mark messages as read]
+[Protocol is offline or no JID]
 
-[%d message(s) forwarded]
+[No valid OMEMO session exists]
 
-[Workstation successfully locked]
+;file \protocols\JabberG\src\jabber_roster.cpp
+[Group]
 
-[Error %d occurred during workstation lock]
+[Subscription]
 
-[Confirmation needed]
+[Uploading...]
 
-[Please confirm Miranda NG shutdown]
+[Downloading...]
 
-[There is no group chats to leave]
+[Connecting...]
 
-[Choose the group chats you want to leave]
+[XML for MS Excel (UTF-8 encoded)]
 
 ;file \protocols\JabberG\src\jabber_search.cpp
-[Error %s %s\r\nPlease select other server]
-
 [Error: unknown reply received\r\nPlease select other server]
 
-[Error %s %s\r\nTry to specify more detailed]
-
 [Search error]
 
 [Select/type search service URL above and press <Go>]
@@ -1745,6 +1619,8 @@ poruke
 
 [sent unknown presence type]
 
+[Outcast]
+
 [Nick:]
 
 [Status:]
@@ -1762,30 +1638,22 @@ poruke
 
 [Requesting registration instruction...]
 
-[Authentication failed for %s@%S.]
-
-[Message redirected from: %s\r\n%s]
+[Registration canceled]
 
 [Sending registration information...]
 
 ;file \protocols\JabberG\src\jabber_userinfo.cpp
-[Resource]
-
 [<not specified>]
 
+[Resource]
+
 [Software]
 
 [Version]
 
 [System]
 
-[unknown]
-
-[Idle since]
-
-[Client capabilities]
-
-[Software information]
+[Last activity]
 
 [Operating system]
 
@@ -1801,26 +1669,14 @@ poruke
 
 [Tune]
 
-[both]
-
-[to]
-
-[from]
-
-[none]
-
 [Last logoff time]
 
 [Uptime]
 
 [Logoff message]
 
-[<no information available>]
-
 [Last active resource]
 
-[Please switch online to see more details.]
-
 [Copy]
 kopiraj
 [Copy only this value]
@@ -1870,10 +1726,10 @@ kopiraj
 
 [Unknown error]
 
-[Error]
-
 [Unknown error message]
 
+[Offline]
+
 [Advanced Status]
 
 [Set mood...]
diff --git a/langpacks/croatian/Plugins/LotusNotify.txt b/langpacks/croatian/Plugins/LotusNotify.txt
index f917deae12..3936463054 100644
--- a/langpacks/croatian/Plugins/LotusNotify.txt
+++ b/langpacks/croatian/Plugins/LotusNotify.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Notify about new mail in Lotus Database]
 
-;file \plugins\LotusNotify\res\LotusNotify.rc
+;file \protocols\LotusNotify\res\LotusNotify.rc
 [Lotus connection settings]
 
 [Primary server:]
@@ -66,7 +66,7 @@ tekst
 
 [Offline status mean:]
 
-;file \plugins\LotusNotify\src\LotusNotify.cpp
+;file \protocols\LotusNotify\src\LotusNotify.cpp
 [Unable to load all required Lotus API functions]
 
 [Lotus Notes Client not detected. Check plugin configuration description at https://miranda-ng.org/p/LotusNotify]
diff --git a/langpacks/croatian/Plugins/MSN.txt b/langpacks/croatian/Plugins/MSN.txt
index 98c7d3002e..c9870a6596 100644
--- a/langpacks/croatian/Plugins/MSN.txt
+++ b/langpacks/croatian/Plugins/MSN.txt
@@ -132,8 +132,6 @@ Detalji o &Korisniku
 [&Deop user]
 
 ;file \protocols\MSN\src\msn_commands.cpp
-[%I64u bytes]
-
 [MSN Alert]
 
 ;file \protocols\MSN\src\msn_errors.cpp
diff --git a/langpacks/croatian/Plugins/MenuEx.txt b/langpacks/croatian/Plugins/MenuEx.txt
index 00be83487a..f2e5d8a63d 100644
--- a/langpacks/croatian/Plugins/MenuEx.txt
+++ b/langpacks/croatian/Plugins/MenuEx.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MenuEx.dll
 ;  Plugin: Menu item ext
-;  Version: 1.3.1.0
+;  Version: 1.3.2.0
 ;  Authors: Heiko Schillinger, Baloo, Billy_Bons, Robert Pösel
 ;============================================================
 [Adds some useful options to a contacts menu.]
@@ -20,8 +20,6 @@
 
 [Copy to Account (Ctrl+click for move to Account)]
 
-[Request Authorization]
-Zahtjevaj autorizaciju
 [Browse Received Files]
 
 [Copy IP]
@@ -79,14 +77,8 @@ Korisnik je na mreži
 
 [Typing Notify]
 
-[Please authorize me to add you to my contact list.]
-
-[Do you want to send authorization request\nto new contact?]
-
 [Open ignore settings]
 
-[Request authorization]
-Zahtjevaj autorizaciju
 [MenuItemEx]
 
 ;file \plugins\MenuItemEx\src\options.cpp
diff --git a/langpacks/croatian/Plugins/MinecraftDynmap.txt b/langpacks/croatian/Plugins/MinecraftDynmap.txt
index 91c3beae5f..1605198e41 100644
--- a/langpacks/croatian/Plugins/MinecraftDynmap.txt
+++ b/langpacks/croatian/Plugins/MinecraftDynmap.txt
@@ -13,8 +13,6 @@
 [Visible name:]
 
 ;file \protocols\MinecraftDynmap\src\chat.cpp
-[Server]
-
 [Admin]
 
 [Normal]
diff --git a/langpacks/croatian/Plugins/MirOTR.txt b/langpacks/croatian/Plugins/MirOTR.txt
index cbbf0ff14e..3a7a8fd4d3 100644
--- a/langpacks/croatian/Plugins/MirOTR.txt
+++ b/langpacks/croatian/Plugins/MirOTR.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MirOTR.dll
 ;  Plugin: Miranda OTR
-;  Version: 0.14.1.17
+;  Version: 0.14.2.1
 ;  Authors: ProgAndy & CHEF-KOCH
 ;============================================================
 [OTR (Off-the-Record) plugin for Miranda NG (using some code and ideas from SecureIM, Pidgin-OTR and old Miranda OTR (by SJE)).]
@@ -80,6 +80,17 @@
 
 [&Verify Fingerprint]
 
+;file \plugins\MirOTR\src\icons.cpp
+[OTR private]
+
+[OTR unverified]
+
+[OTR finished]
+
+[OTR not secure]
+
+[Refresh]
+
 ;file \plugins\MirOTR\src\language.h
 [Start OTR]
 
@@ -99,8 +110,6 @@ ne
 
 [OTR Encryption: Finished]
 
-[&Convert HTML (for Pidgin)]
-
 [OTR encrypted session with '%s' has been terminated]
 
 [Requesting OTR encrypted session with '%s']
@@ -131,16 +140,6 @@ ne
 
 [OTR encrypted session with '%s' is now using a NOT VERIFIED fingerprint]
 
-[OTR unverified]
-
-[OTR finished]
-
-[OTR private]
-
-[OTR not secure]
-
-[Refresh]
-
 [Generating new private key for protocol '%s'.\nPlease Wait...]
 
 [General]
@@ -236,6 +235,8 @@ ne
 
 [OTR Status]
 
+[&Convert HTML (for Pidgin)]
+
 ;file \plugins\MirOTR\src\options.cpp
 [Private Data]
 
diff --git a/langpacks/croatian/Plugins/MirandaG15.txt b/langpacks/croatian/Plugins/MirandaG15.txt
index cb2095d28d..2345258e63 100644
--- a/langpacks/croatian/Plugins/MirandaG15.txt
+++ b/langpacks/croatian/Plugins/MirandaG15.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MirandaG15.dll
 ;  Plugin: MirandaG15
-;  Version: 0.1.2.0
+;  Version: 0.1.2.1
 ;  Authors: Martin Kleinhans
 ;============================================================
 [Provides an interface to use Miranda from the LCD of various Logitech devices.]
diff --git a/langpacks/croatian/Plugins/MsgPopup.txt b/langpacks/croatian/Plugins/MsgPopup.txt
index 7374ce7f0d..613de9d1a3 100644
--- a/langpacks/croatian/Plugins/MsgPopup.txt
+++ b/langpacks/croatian/Plugins/MsgPopup.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MsgPopup.dll
 ;  Plugin: Message popup
-;  Version: 0.1.2.1
+;  Version: 0.1.2.2
 ;  Authors: StDenis
 ;============================================================
 [Plugin replaces message boxes (those having only OK button) with popups.]
diff --git a/langpacks/croatian/Plugins/NewsAggregator.txt b/langpacks/croatian/Plugins/NewsAggregator.txt
index f0437a879c..8ce646345f 100644
--- a/langpacks/croatian/Plugins/NewsAggregator.txt
+++ b/langpacks/croatian/Plugins/NewsAggregator.txt
@@ -2,12 +2,12 @@
 ;============================================================
 ;  File: NewsAggregator.dll
 ;  Plugin: News aggregator
-;  Version: 0.1.0.4
+;  Version: 0.1.0.5
 ;  Authors: Mataes, FREAK_THEMIGHTY
 ;============================================================
 [RSS/Atom news aggregator.]
 
-;file \plugins\NewsAggregator\Res\Resource.rc
+;file \protocols\NewsAggregator\Res\Resource.rc
 [Add]
 
 [Change]
@@ -72,14 +72,14 @@
 
 [&Import]
 
-;file \plugins\NewsAggregator\Src\Authentication.cpp
+;file \protocols\NewsAggregator\Src\Authentication.cpp
 [Enter your username]
 
 [Error]
 
 [Enter your password]
 
-;file \plugins\NewsAggregator\Src\CheckFeed.cpp
+;file \protocols\NewsAggregator\Src\CheckFeed.cpp
 [%s\nis a valid feed's address.]
 
 [News Aggregator]
@@ -88,7 +88,7 @@
 
 [empty]
 
-;file \plugins\NewsAggregator\Src\Icons.cpp
+;file \protocols\NewsAggregator\Src\Icons.cpp
 [Protocol icon]
 
 [Check All Feeds]
@@ -103,13 +103,13 @@
 
 [Auto Update Disabled]
 
-;file \plugins\NewsAggregator\Src\Menus.cpp
+;file \protocols\NewsAggregator\Src\Menus.cpp
 [Check feed]
 
 [Change feed]
 
-;file \plugins\NewsAggregator\Src\NewsAggregator.cpp
-;file \plugins\NewsAggregator\Src\Options.cpp
+;file \protocols\NewsAggregator\Src\NewsAggregator.cpp
+;file \protocols\NewsAggregator\Src\Options.cpp
 [OPML files]
 
 [Not valid import file.]
@@ -154,11 +154,11 @@
 
 [Network]
 
-;file \plugins\NewsAggregator\Src\Services.cpp
+;file \protocols\NewsAggregator\Src\Services.cpp
 [Avatars]
 
 [Enable/disable auto update]
 
-;file \plugins\NewsAggregator\Src\Utils.cpp
+;file \protocols\NewsAggregator\Src\Utils.cpp
 [NewsAggregator HTTP connections]
 
diff --git a/langpacks/croatian/Plugins/NimContact.txt b/langpacks/croatian/Plugins/NimContact.txt
index 18d2f7836a..abefc3c0b4 100644
--- a/langpacks/croatian/Plugins/NimContact.txt
+++ b/langpacks/croatian/Plugins/NimContact.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Non-IM Contact allows you to add 'contacts' that can act as shortcuts to other programs, or links to web pages.\r\nThe contacts name can be read from a text file (includes any ASCII file).\r\nThis plugin is a combination of Favorites and Text Reader plugins both made by me)]
 
-;file \plugins\Non-IM Contact\res\resource.rc
+;file \protocols\Non-IM Contact\res\resource.rc
 [View/Edit Files]
 
 [Add File]
@@ -108,7 +108,7 @@ Pomoć
 
 [EXAMPLE: %fn1,%fn2]
 
-;file \plugins\Non-IM Contact\src\contactinfo.cpp
+;file \protocols\Non-IM Contact\src\contactinfo.cpp
 [Select Folder]
 
 [Non-IM Contact protocol timer is Disabled]
@@ -117,7 +117,7 @@ Pomoć
 
 [New Non-IM Contact]
 
-;file \plugins\Non-IM Contact\src\dialog.cpp
+;file \protocols\Non-IM Contact\src\dialog.cpp
 [String replacing variables...\r\nThe following are all the valid variables that can be used. Refer to the wiki.miranda-ng.org for a proper explanation.\r\n\r\nfile(X)\t\t<- specifies the file to read from. MUST be followed by either start() or end() or wholeline()\r\nfilename(X)\t<- copies the filename of file X.\r\nstart(...)\t\t<- specifies where to start copying from.\r\nend(...)\t\t<- specifies where to stop copying.\r\nwholeline(line(...))\t<- specifies a whole line to copy\r\n\r\nstart() and end() explained\r\n.........................\r\nMUST start with line() followed by a number or a string inside " marks, OR csv(separatorX) variable. The number specifies which character in the line to start/end copying. The string specifies a string in the line to start/end copying.\r\n\r\ncsv(seperatorX) explained...\r\nSeperator is either "tab" or "space" or any SINGLE character. X is the Xth separator to pass before copying, (or to stop before).\r\n\r\nLastly the line(...) variable...\r\nInside the brackets must be either a number (to specify the line number), or a string inside " marks (to use the line with that string), or lastline(X). The X in lastline is the Xth line above the last line, i.e., lastline(1) will use the 2nd last line of the file. If searching for a line with "some words" you may put a + or - X after the closing ), i.e., line("some words")+3 to go 3 lines after the line with "some words".\r\n\r\nSome examples...\r\nfilename(0)    <- will display the filename of the 0th file\r\nfile(0)wholeline(line(0)))    <- will display the whole first line of the 0th file\r\nfile(0)wholeline(line("hello")-1)))    <- the wholeline above the first occurrence of "hello" in the file\r\nfile(0)start(line(lastline(1))csv(tab2))end(line(lastline())csv(tab4)))    <- starts at the 2nd last line of the file, from the 2nd tab variable, until the 4th tab variable in the last line (in the 0th file)\r\nfile(0)start(line("hello")+1"zzzz")end(line(6)17))    <- starts from the first occurrence of zzzz in the line after the first occurrence of hello, until the 17th character in the 6th line (starting from line 0) of the 0th file.\r\n]
 
 [Contacts Display Info]
@@ -130,7 +130,7 @@ Pomoć
 
 [Edit Non-IM Contact "%s"]
 
-;file \plugins\Non-IM Contact\src\files.cpp
+;file \protocols\Non-IM Contact\src\files.cpp
 [Do you want to overwrite the contents of the file?\r\n\r\nPressing No will append these contacts to the end of the file.]
 
 [File couldn't be opened]
@@ -139,10 +139,10 @@ Pomoć
 
 [line(%-3d) = | %s]
 
-;file \plugins\Non-IM Contact\src\http.cpp
+;file \protocols\Non-IM Contact\src\http.cpp
 [Non-IM Contacts]
 
-;file \plugins\Non-IM Contact\src\main.cpp
+;file \protocols\Non-IM Contact\src\main.cpp
 [Plugins]
 
 [Main Icon]
@@ -163,7 +163,7 @@ Pomoć
 
 [E&dit Contact Settings]
 
-;file \plugins\Non-IM Contact\src\namereplacing.cpp
+;file \protocols\Non-IM Contact\src\namereplacing.cpp
 [%s - ERROR: no line specified or line not found (in %s)]
 
 [%s - ERROR: file couldn't be opened (in %s)]
diff --git a/langpacks/croatian/Plugins/NotesReminders.txt b/langpacks/croatian/Plugins/NotesReminders.txt
index a69764469a..794ff5331c 100644
--- a/langpacks/croatian/Plugins/NotesReminders.txt
+++ b/langpacks/croatian/Plugins/NotesReminders.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: NotesReminders.dll
 ;  Plugin: Sticky Notes & Reminders
-;  Version: 0.1.0.1
+;  Version: 0.2.0.2
 ;  Authors: Joe Kucera, Lubomir Kolev Ivanov, Georg Fischer
 ;============================================================
 [Sticky Notes & Reminders Implementation for Miranda NG.]
@@ -50,12 +50,12 @@
 
 [Add Reminder]
 
-[Trigger On Time && Date:]
-
 [Date]
 
 [Time]
 
+[Repeat each day]
+
 [Reminder Note:]
 
 [None]
@@ -102,8 +102,6 @@
 
 [D&elete All Reminders]
 
-[Context Menu Note Popup]
-
 [&Hide Note]
 
 [&Always On Top]
@@ -152,9 +150,6 @@ poništi
 
 [&Show / Hide Notes]
 
-;file \plugins\NotesAndReminders\src\globals.h
-[Notes & Reminders]
-
 ;file \plugins\NotesAndReminders\src\hotkeys.cpp
 [New Note]
 
@@ -165,10 +160,6 @@ poništi
 [New Reminder]
 
 ;file \plugins\NotesAndReminders\src\main.cpp
-[Are you sure you want to delete all notes?]
-
-[Are you sure you want to delete all reminders?]
-
 [Delete All Notes]
 
 [Show/Hide Notes]
@@ -195,20 +186,10 @@ poništi
 
 [Sticky Notes]
 
-[Plugins]
-
 [Add New Note]
 
 [Add New Reminder]
 
-[Alerts]
-
-[Reminder triggered]
-
-[Reminder triggered (Alternative 1)]
-
-[Reminder triggered (Alternative 2)]
-
 [Notes && Reminders]
 
 [New &Note]
@@ -221,6 +202,14 @@ poništi
 
 [Miranda could not load the Notes & Reminders plugin, Msftedit.dll is missing. If you are using WINE, please make sure you have Msftedit.dll installed. Press 'Yes' to continue loading Miranda.]
 
+[Alerts]
+
+[Reminder triggered]
+
+[Reminder triggered (Alternative 1)]
+
+[Reminder triggered (Alternative 2)]
+
 ;file \plugins\NotesAndReminders\src\notes.cpp
 [Black]
 
@@ -268,6 +257,8 @@ poništi
 
 [Date/Title]
 
+[Are you sure you want to delete all notes?]
+
 ;file \plugins\NotesAndReminders\src\options.cpp
 [Sticky Note Caption]
 
@@ -279,11 +270,17 @@ poništi
 
 [Select Executable]
 
+[Plugins]
+
 ;file \plugins\NotesAndReminders\src\reminders.cpp
 [Minutes]
 
 [Hours]
 
+[The specified time is invalid due to begin of daylight saving (summer time).]
+
+[The specified time is invalid.]
+
 [Hour]
 
 [Day]
@@ -292,10 +289,6 @@ poništi
 
 [Week]
 
-[The specified time is invalid due to begin of daylight saving (summer time).]
-
-[The specified time is invalid.]
-
 [The specified time offset is invalid.]
 
 [&Update Reminder]
@@ -316,5 +309,10 @@ sekundi
 
 [Date of activation]
 
+[Are you sure you want to delete all reminders?]
+
 [Are you sure you want to delete this reminder?]
 
+;file \plugins\NotesAndReminders\src\stdafx.h
+[Notes & Reminders]
+
diff --git a/langpacks/croatian/Plugins/PasteIt.txt b/langpacks/croatian/Plugins/PasteIt.txt
index d8142f7780..fc544977d9 100644
--- a/langpacks/croatian/Plugins/PasteIt.txt
+++ b/langpacks/croatian/Plugins/PasteIt.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: PasteIt.dll
 ;  Plugin: Paste it
-;  Version: 1.0.0.3
+;  Version: 1.0.0.4
 ;  Authors: Krzysztof Kral
 ;============================================================
 [Uploads the text to web page and sends the URL to your friends.]
@@ -142,11 +142,11 @@
 [File '%s' is empty]
 
 ;file \plugins\PasteIt\src\PasteToWeb1.cpp
-[Error during sending text to web page: %s]
+[Error during sending text to web page: %S]
 
 [Error during sending text to web page]
 
-[Error during getting user key from web page: %s]
+[Error during getting user key from web page: %S]
 
 [Paste expire date]
 
diff --git a/langpacks/croatian/Plugins/PluginUpdater.txt b/langpacks/croatian/Plugins/PluginUpdater.txt
index 5f907fbd9f..4f76e501d0 100644
--- a/langpacks/croatian/Plugins/PluginUpdater.txt
+++ b/langpacks/croatian/Plugins/PluginUpdater.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: PluginUpdater.dll
 ;  Plugin: Plugin updater
-;  Version: 0.2.0.2
+;  Version: 0.2.0.3
 ;  Authors: Mataes, George Hazan
 ;============================================================
 [Installs and updates plugins and other Miranda NG components.]
diff --git a/langpacks/croatian/Plugins/PopupPlus.txt b/langpacks/croatian/Plugins/PopupPlus.txt
index 6f4e850458..b12f275e5c 100644
--- a/langpacks/croatian/Plugins/PopupPlus.txt
+++ b/langpacks/croatian/Plugins/PopupPlus.txt
@@ -1,6 +1,6 @@
 #muuid {26a9125d-7863-4e01-af0e-d14ef95c5054}
 ;============================================================
-;  File: Popup.dll
+;  File: PopupPlus.dll
 ;  Plugin: Popup plus
 ;  Version: 2.1.1.15
 ;  Authors: MPK, Merlin_de (Luca Santarelli, Victor Pavlychko)
@@ -82,7 +82,7 @@ Povijest
 
 [Download more skins]
 
-[Popup History]
+[Popup history]
 
 [Desktop]
 
@@ -263,15 +263,11 @@ Pozadina
 [Avatar border]
 
 ;file \plugins\Popup\src\history.cpp
-[Popup History is disabled]
+[Popup history is disabled]
 
-[Popup History message]
+[Popup history message]
 
 ;file \plugins\Popup\src\icons.cpp
-[Popups are enabled]
-
-[Popups are disabled]
-
 [With "favorite" overlay]
 
 [With "fullscreen" overlay]
@@ -309,13 +305,13 @@ akcije
 
 [Advanced]
 
-[Toggle Popups]
+[Toggle popups]
 
-[Enable Popups]
+[Enable popups]
 
-[Disable Popups]
+[Disable popups]
 
-[Popup Plus]
+[Popup plus]
 
 [Error: I could not register the Popup Window class.\r\nThe plugin will not operate.]
 
diff --git a/langpacks/croatian/Plugins/SkypeWeb.txt b/langpacks/croatian/Plugins/SkypeWeb.txt
index 0ff6efc5a8..9079695f9c 100644
--- a/langpacks/croatian/Plugins/SkypeWeb.txt
+++ b/langpacks/croatian/Plugins/SkypeWeb.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: SkypeWeb.dll
 ;  Plugin: Skype protocol (Web)
-;  Version: 0.12.3.1
+;  Version: 0.12.3.3
 ;  Authors: Miranda NG team
 ;============================================================
 [Skype protocol support for Miranda NG. Based on new Skype for Web.]
diff --git a/langpacks/croatian/Plugins/SmileyAdd.txt b/langpacks/croatian/Plugins/SmileyAdd.txt
index 0b823f3410..532aac091d 100644
--- a/langpacks/croatian/Plugins/SmileyAdd.txt
+++ b/langpacks/croatian/Plugins/SmileyAdd.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: SmileyAdd.dll
 ;  Plugin: SmileyAdd
-;  Version: 0.3.1.0
+;  Version: 0.3.1.1
 ;  Authors: Peacow, nightwish, bid, borkra
 ;============================================================
 [Smiley support for Miranda NG.]
diff --git a/langpacks/croatian/Plugins/StatusManager.txt b/langpacks/croatian/Plugins/StatusManager.txt
index e690691b8a..77f18fbb9d 100644
--- a/langpacks/croatian/Plugins/StatusManager.txt
+++ b/langpacks/croatian/Plugins/StatusManager.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: StatusManager.dll
 ;  Plugin: Status manager
-;  Version: 1.2.0.4
+;  Version: 1.2.0.5
 ;  Authors: P Boon
 ;============================================================
 [A connection checker and auto away module. Also allows you to define the status Miranda should set on startup, configurable per protocol.]
diff --git a/langpacks/croatian/Plugins/TabSRMM.txt b/langpacks/croatian/Plugins/TabSRMM.txt
index c74a7e7830..1e5d294dc9 100644
--- a/langpacks/croatian/Plugins/TabSRMM.txt
+++ b/langpacks/croatian/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: TabSRMM.dll
 ;  Plugin: TabSRMM
-;  Version: 3.5.0.12
+;  Version: 3.5.0.13
 ;  Authors: The Miranda developers team and contributors
 ;============================================================
 [IM and group chat module for Miranda NG.]
@@ -178,8 +178,6 @@ Poruka
 
 [Use the message log color theme for group chat popups]
 
-[No compatible popup plugin was found. The event notification\nsystem is not available.]
-
 [Dialog]
 
 [Cancel]
@@ -1697,10 +1695,6 @@ drugo
 
 [Feature enabled (used as overlay)]
 
-[Enable typing notification]
-
-[Disable typing notification]
-
 ;file \plugins\TabSRMM\src\msgs.h
 [Message windows - IM]
 
@@ -1984,10 +1978,10 @@ ikona područja obavijesti
 
 [Enable &typing notification]
 
-[...is typing a message.]
-
 [...has stopped typing.]
 
+[...is typing a message.]
+
 [Contact started typing]
 
 [Contact stopped typing]
diff --git a/langpacks/croatian/Plugins/UInfoEx.txt b/langpacks/croatian/Plugins/UInfoEx.txt
index 9dfc52636f..4e6e0f8f97 100644
--- a/langpacks/croatian/Plugins/UInfoEx.txt
+++ b/langpacks/croatian/Plugins/UInfoEx.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: UInfoEx.dll
 ;  Plugin: User info ext
-;  Version: 0.8.5.1
+;  Version: 0.8.5.2
 ;  Authors: DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
 ;============================================================
 [Extended UserInfo module for Miranda NG. Provides interface to edit all contact information.]
@@ -1110,11 +1110,9 @@ Strelica dolje
 
 [Abort Refreshing Contact Details]
 
-[Do you want to cancel the current refresh procedure?]
-
 [Miranda must be online for refreshing contact information!]
 
-[The function caused an exception!]
+[Do you want to cancel the current refresh procedure?]
 
 ;file \plugins\UserInfoEx\src\svc_reminder.cpp
 [%s has %s today.]
@@ -1216,16 +1214,8 @@ Strelica dolje
 ;file \plugins\UserInfoEx\src\ex_import\svc_ExImXML.cpp
 [Can't create xml file!\n%S]
 
-[Export took %f ms]
-
 [Contact: %s (%S)]
 
-[Importing %s caused error %d]
-
-[Loading contact %s from xml failed with error %d]
-
-[Importing Owner caused error %d]
-
 [Parser is unable to load XMLCard "%s"\nError: %d\nDescription: %s]
 
 [The selected file is no valid XMLCard]
@@ -1238,12 +1228,8 @@ Strelica dolje
 
 [Selected XMLCard does not contain an owner contact!]
 
-[Import took %f ms]
-
 [added contacts: %u / %u\nadded settings: %u / %u\nadded events %u / %u\nduplicated events: %u]
 
-[FATAL: An exception was thrown while importing contacts from xmlCard!]
-
 ;file \plugins\UserInfoEx\src\Flags\svc_flags.cpp
 [Flags (UInfoEx)]
 
diff --git a/langpacks/croatian/Plugins/VKontakte.txt b/langpacks/croatian/Plugins/VKontakte.txt
index 45b9767151..75d425a04d 100644
--- a/langpacks/croatian/Plugins/VKontakte.txt
+++ b/langpacks/croatian/Plugins/VKontakte.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: VKontakte.dll
 ;  Plugin: VKontakte protocol
-;  Version: 0.1.8.1
+;  Version: 0.1.9.0
 ;  Authors: Miranda NG team
 ;============================================================
 [VKontakte protocol support for Miranda NG.]
diff --git a/langpacks/croatian/Plugins/Weather.txt b/langpacks/croatian/Plugins/Weather.txt
index 5a02f6ee16..890382f6df 100644
--- a/langpacks/croatian/Plugins/Weather.txt
+++ b/langpacks/croatian/Plugins/Weather.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Retrieves weather information and displays it in your contact list.]
 
-;file \plugins\Weather\res\resource.rc
+;file \protocols\Weather\res\resource.rc
 [Update]
 
 [Brief Info]
@@ -254,7 +254,7 @@ lista kontakata
 
 [To default]
 
-;file \plugins\Weather\src\stdafx.h
+;file \protocols\Weather\src\stdafx.h
 [N/A]
 
 [Invalid ID format, missing "/" (10)]
@@ -337,7 +337,7 @@ lista kontakata
 
 [The URL for weather map has not been set. You can set it from the Edit Settings dialog.]
 
-;file \plugins\Weather\src\weather.cpp
+;file \protocols\Weather\src\weather.cpp
 [Enable/disable auto update]
 
 [Auto Update Enabled]
@@ -348,7 +348,7 @@ lista kontakata
 
 [Alert Issued]
 
-;file \plugins\Weather\src\weather_addstn.cpp
+;file \protocols\Weather\src\weather_addstn.cpp
 [Current weather information for %s.]
 
 [%s is now the default weather station]
@@ -361,7 +361,7 @@ lista kontakata
 
 [<Enter station ID here>]
 
-;file \plugins\Weather\src\weather_contacts.cpp
+;file \protocols\Weather\src\weather_contacts.cpp
 [Weather condition was not logged.]
 
 [Get city name from ID]
@@ -378,7 +378,7 @@ lista kontakata
 
 [All Files]
 sve datoteke
-;file \plugins\Weather\src\weather_conv.cpp
+;file \protocols\Weather\src\weather_conv.cpp
 [mb]
 
 [in]
@@ -391,15 +391,15 @@ sve datoteke
 
 [HTTP Error %i]
 
-;file \plugins\Weather\src\weather_data.cpp
+;file \protocols\Weather\src\weather_data.cpp
 [<Enter city name here>]
 
 [Error when obtaining data: %s]
 
-;file \plugins\Weather\src\weather_http.cpp
+;file \protocols\Weather\src\weather_http.cpp
 [Weather HTTP connections]
 
-;file \plugins\Weather\src\weather_icons.cpp
+;file \protocols\Weather\src\weather_icons.cpp
 [Protocol icon]
 
 [Update Disabled]
@@ -420,7 +420,7 @@ sve datoteke
 
 [Edit Settings]
 
-;file \plugins\Weather\src\weather_info.cpp
+;file \protocols\Weather\src\weather_info.cpp
 [Name]
 
 [Author]
@@ -459,21 +459,21 @@ stavaka
 
 [Description:]
 
-;file \plugins\Weather\src\weather_ini.cpp
+;file \protocols\Weather\src\weather_ini.cpp
 [All update data has been reloaded.]
 
 [Invalid ini format for: %s]
 
 [No update data file is found. Please check your Plugins\\Weather directory.]
 
-;file \plugins\Weather\src\weather_mwin.cpp
+;file \protocols\Weather\src\weather_mwin.cpp
 [Frame Font]
 
 [Frame Title Font]
 
 [Frame Background]
 
-;file \plugins\Weather\src\weather_opt.cpp
+;file \protocols\Weather\src\weather_opt.cpp
 [Weather Protocol Text Preview]
 
 [Network]
@@ -484,8 +484,8 @@ stavaka
 
 [Popups]
 
-;file \plugins\Weather\src\weather_popup.cpp
-;file \plugins\Weather\src\weather_svcs.cpp
+;file \protocols\Weather\src\weather_popup.cpp
+;file \protocols\Weather\src\weather_svcs.cpp
 [Station ID]
 
 [Disable &weather notification]
@@ -512,10 +512,10 @@ stavaka
 
 [Display in a frame]
 
-;file \plugins\Weather\src\weather_update.cpp
+;file \protocols\Weather\src\weather_update.cpp
 [Unable to retrieve weather information for %s]
 
-;file \plugins\Weather\src\weather_userinfo.cpp
+;file \protocols\Weather\src\weather_userinfo.cpp
 [Variable]
 
 [Information]
diff --git a/langpacks/croatian/Plugins/WebView.txt b/langpacks/croatian/Plugins/WebView.txt
index dfead7a14b..c0e24fa1fc 100644
--- a/langpacks/croatian/Plugins/WebView.txt
+++ b/langpacks/croatian/Plugins/WebView.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Adds web pages as contacts to your contact list and can display text and/or issue change alerts from those pages in a window.]
 
-;file \plugins\WebView\res\webview.rc
+;file \protocols\WebView\res\webview.rc
 [Webview]
 
 [Update data every]
@@ -180,7 +180,7 @@ tekst
 
 [C&lear all]
 
-;file \plugins\WebView\src\main.cpp
+;file \protocols\WebView\src\main.cpp
 [Alert event]
 
 [Auto update disabled]
@@ -207,14 +207,14 @@ tekst
 
 [Stop data processing]
 
-;file \plugins\WebView\src\webview.cpp
+;file \protocols\WebView\src\webview.cpp
 [All Webview sites have been updated.]
 
 [Network]
 
 [Popups]
 
-;file \plugins\WebView\src\webview_alerts.cpp
+;file \protocols\WebView\src\webview_alerts.cpp
 [Cannot write to file]
 
 [Last updated on]
@@ -245,7 +245,7 @@ tekst
 
 [Loaded from cache]
 
-;file \plugins\WebView\src\webview_datawnd.cpp
+;file \protocols\WebView\src\webview_datawnd.cpp
 [ERROR: You have two or more Webview contacts with the same URL and contact name.]
 
 [Alert options]
@@ -258,7 +258,7 @@ tekst
 
 [Disable stick to the front]
 
-;file \plugins\WebView\src\webview_getdata.cpp
+;file \protocols\WebView\src\webview_getdata.cpp
 [URL not supplied]
 
 [Download in progress, please wait...]
@@ -305,7 +305,7 @@ tekst
 
 [Alert test conditions not met; press the refresh button to view content.]
 
-;file \plugins\WebView\src\webview_opts.cpp
+;file \protocols\WebView\src\webview_opts.cpp
 [No whitespace removal]
 
 [Minimal level of whitespace removal]
@@ -342,7 +342,7 @@ tekst
 
 [Invalid symbol present in contact name.]
 
-;file \plugins\WebView\src\webview_services.cpp
+;file \protocols\WebView\src\webview_services.cpp
 [Cache folder does not exist.]
 
 [Missing "psite.bat" file.]
diff --git a/langpacks/croatian/Plugins/WhoUsesMyFiles.txt b/langpacks/croatian/Plugins/WhoUsesMyFiles.txt
index cffdd34abe..316bb9504d 100644
--- a/langpacks/croatian/Plugins/WhoUsesMyFiles.txt
+++ b/langpacks/croatian/Plugins/WhoUsesMyFiles.txt
@@ -55,12 +55,10 @@
 [Show current connections]
 
 ;file \plugins\WhoUsesMyFiles\src\options.cpp
-[Popup plugin not found!]
+[Common Dialog Error 0x%lx]
 
 [Error]
 
-[Common Dialog Error 0x%lx]
-
 [Not implemented yet...]
 
 [Who uses my files]
diff --git a/langpacks/croatian/Plugins/YAMN.txt b/langpacks/croatian/Plugins/YAMN.txt
index 00b1c4459b..20049ba236 100644
--- a/langpacks/croatian/Plugins/YAMN.txt
+++ b/langpacks/croatian/Plugins/YAMN.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Mail notifier and browser for Miranda NG. Included POP3 protocol.]
 
-;file \plugins\YAMN\res\YAMN.rc
+;file \protocols\YAMN\res\YAMN.rc
 [Installed plugins]
 
 [Version:]
@@ -156,7 +156,7 @@ Poruka
 
 [Text color]
 
-;file \plugins\YAMN\src\main.cpp
+;file \protocols\YAMN\src\main.cpp
 [Check &mail (All Account)]
 
 [Check &mail (This Account)]
@@ -171,17 +171,17 @@ Poruka
 
 [Connect Fail]
 
-;file \plugins\YAMN\src\main.h
+;file \protocols\YAMN\src\main.h
 [New mail message]
 
 [Connect failed]
 
-;file \plugins\YAMN\src\services.cpp
+;file \protocols\YAMN\src\services.cpp
 [Nick]
 
 [No new mail message]
 
-;file \plugins\YAMN\src\browser\badconnect.cpp
+;file \protocols\YAMN\src\browser\badconnect.cpp
 [%s - connection error]
 
 [An error occurred. Error code: %d]
@@ -190,7 +190,7 @@ Poruka
 
 [ - connection error]
 
-;file \plugins\YAMN\src\browser\mailbrowser.cpp
+;file \protocols\YAMN\src\browser\mailbrowser.cpp
 [%s - %d new mail messages, %d total]
 
 [%s : %d new mail message(s), %d total]
@@ -229,15 +229,15 @@ označi sve
 
 [Delete confirmation]
 
-;file \plugins\YAMN\src\mails\mime.cpp
+;file \protocols\YAMN\src\mails\mime.cpp
 [Translate header error]
 
 [Part]
 
-;file \plugins\YAMN\src\proto\netlib.cpp
+;file \protocols\YAMN\src\proto\netlib.cpp
 [%s connection]
 
-;file \plugins\YAMN\src\proto\pop3\pop3comm.cpp
+;file \protocols\YAMN\src\proto\pop3\pop3comm.cpp
 [Disconnected]
 
 [POP3 protocol (internal)]
@@ -314,7 +314,7 @@ označi sve
 
 [Error %d-%d-%d-%d:]
 
-;file \plugins\YAMN\src\proto\pop3\pop3opt.cpp
+;file \protocols\YAMN\src\proto\pop3\pop3opt.cpp
 [Network]
 
 [Accounts]
diff --git a/langpacks/croatian/Untranslated/=CORE=.txt b/langpacks/croatian/Untranslated/=CORE=.txt
index 210f93af9b..5cd09a1a1e 100644
--- a/langpacks/croatian/Untranslated/=CORE=.txt
+++ b/langpacks/croatian/Untranslated/=CORE=.txt
@@ -162,6 +162,30 @@
 [Select &all]
 [Paste and send]
 [Delete]
+[Popup history]
+[Case sensitive]
+[Default timeout]
+[Never timeout]
+[Set timeout:]
+[Width:]
+[Maximum height:]
+[Opacity (%):]
+[Border]
+[Round corners (window)]
+[Preview]
+[Transparent background]
+[Layout]
+[Avatar size:]
+[Disable when]
+[Global hover]
+[Sidebar width:]
+[Text indent:]
+[Padding:]
+[Round corners (avatar)]
+[Text color:]
+[Background color:]
+[Set timeout]
+[Timeout value (0 = default):]
 [Find]
 [&Find next]
 [Find what:]
@@ -714,6 +738,44 @@
 [Contact started typing]
 [Contact stopped typing]
 [An unknown error has occurred.]
+[Popups are enabled]
+[Popups are disabled]
+[Example]
+[The quick brown fox jumped over the lazy dog.]
+[Example With a Long Title]
+[Thequickbrownfoxjumpedoverthelazydog.]
+[An avatar.]
+[Bottom right]
+[Bottom left]
+[Top right]
+[Top left]
+[Icon on left]
+[Icon on right]
+[No time]
+[Time on left]
+[Time on right]
+[Time above avatar]
+[No avatar]
+[Left avatar]
+[Right avatar]
+[Full-screen app running]
+[No animate]
+[Horizontal animate]
+[Vertical animate]
+[You cannot set a default timeout of 0.\nValue has been reset.]
+[Settings]
+[Classes]
+[Disable popups]
+[Enable popups]
+[Toggle popups]
+[First line]
+[Second line]
+[Time]
+[Sidebar]
+[Title underline]
+[Copy title to clipboard]
+[Copy message to clipboard]
+[Copy timestamp to clipboard]
 [Client cannot decode host message. Possible causes: host does not support SSL or requires not existing security package]
 [Host we are connecting to is not the one certificate was issued for]
 [Invalid message]
diff --git a/langpacks/croatian/Untranslated/Actman.txt b/langpacks/croatian/Untranslated/Actman.txt
index 07adf8746c..df6f69b4a2 100644
--- a/langpacks/croatian/Untranslated/Actman.txt
+++ b/langpacks/croatian/Untranslated/Actman.txt
@@ -329,13 +329,13 @@
 [with confirmation]
 [without confirmation]
 [Empty updater download folder]
-[Popup Plus (popup.dll) latest YAPP (yapp.dll)]
-[Enables or disables Popup windows]
+[Popup plus (PopupPlus.dll) latest StdPopup (StdPopup.dll)]
+[Enables or disables popup windows]
 [Notify]
-[YAPP or Popup]
+[StdPopup or Popup plus]
 [Popup window]
 [Unicode Text]
-[Enables or disables Popup windows (maybe deprecated)]
+[Enables or disables popup windows (maybe deprecated)]
 [result of protocol service call]
 [Send a general request through the protocol chain for a contact]
 [str, account name]
diff --git a/langpacks/croatian/Untranslated/ChangeKeyboardLayout.txt b/langpacks/croatian/Untranslated/ChangeKeyboardLayout.txt
index bac9878299..d8fa21daf6 100644
--- a/langpacks/croatian/Untranslated/ChangeKeyboardLayout.txt
+++ b/langpacks/croatian/Untranslated/ChangeKeyboardLayout.txt
@@ -32,5 +32,4 @@
 [Changing Case]
 [Message sessions]
 [Popups]
-[Popup]
 [ChangeKeyboardLayout]
diff --git a/langpacks/croatian/Untranslated/Clist_modern.txt b/langpacks/croatian/Untranslated/Clist_modern.txt
index 06f248d619..4e28462219 100644
--- a/langpacks/croatian/Untranslated/Clist_modern.txt
+++ b/langpacks/croatian/Untranslated/Clist_modern.txt
@@ -325,6 +325,7 @@
 [Last message time]
 [Account name]
 [Rate]
+[Last online]
 [-Nothing-]
 [Hide to tray]
 [Behind left edge]
@@ -351,7 +352,6 @@
 [Center group names]
 [Right align group names]
 [Row]
-[Row design]
 [(Unknown contact)]
 [Show avatar]
 [Hide avatar]
@@ -363,13 +363,6 @@
 [Close Miranda]
 [Restore last status]
 [Show/Hide offline users]
-[Empty %s cell]
-[column]
-[line]
-[columns]
-[lines]
-[%s, contain %s]
-[ layered]
 [( unknown )]
 [%s\n\n%s\n\nAuthor(s):\t %s\nContact:\t %s\nWeb:\t %s\n\nFile:\t %s]
 [%s\n\n%s\n\nAuthor(s): %s\nContact:\t %s\nWeb:\t %s\n\nFile:\t %s]
diff --git a/langpacks/croatian/Untranslated/CmdLine.txt b/langpacks/croatian/Untranslated/CmdLine.txt
index 9f2f3a8952..84674f32a3 100644
--- a/langpacks/croatian/Untranslated/CmdLine.txt
+++ b/langpacks/croatian/Untranslated/CmdLine.txt
@@ -91,4 +91,3 @@
 [Command '%s' is not currently supported.]
 [Could not create CommandLine listening server!]
 [You can only run one instance of CmdLine plugin.]
-[Notify]
diff --git a/langpacks/croatian/Untranslated/CurrencyRates.txt b/langpacks/croatian/Untranslated/CurrencyRates.txt
index d47299a2f8..dc3c316781 100644
--- a/langpacks/croatian/Untranslated/CurrencyRates.txt
+++ b/langpacks/croatian/Untranslated/CurrencyRates.txt
@@ -44,6 +44,7 @@
 [&Display in Contact List as:]
 [&Status Message:]
 [&Tendency:]
+[&Personal key:]
 [&Advanced Settings...]
 [Rate Info]
 [There is nothing to show]
@@ -55,10 +56,6 @@
 [Info provided by]
 [Enter positive number.]
 [Currency Rate]
-[Error occurred during HTML parsing.]
-[Error occurred during site access.]
-[Currency Symbol]
-[Currency Name]
 [Source of Information]
 [Rate Value]
 [Previous Rate Value]
@@ -68,13 +65,8 @@
 [Percentage Character (%)]
 [Tabulation]
 [Left slash (\\)]
-[Open Price]
-[Percent Change to After Hours]
-[Percent Change to Yesterday Close]
-[Day's High]
-[Day's Low]
-[Previous Close]
-[Change]
+[Error occurred during HTML parsing.]
+[Error occurred during site access.]
 [From Currency Full Name]
 [From Currency Short Name]
 [Into Currency Full Name]
@@ -95,7 +87,9 @@
 [Enable/Disable Currency Rates Auto Update]
 [Currency Rates Auto Update Enabled]
 [Currency Rates Auto Update Disabled]
+[Currency Symbol]
 [Network]
+[This plugin requires a personal key. Press Yes to obtain it at the site and then enter the result in the Options dialog, otherwise this plugin will fail.]
 [CurrencyRates HTTP connections]
 [Protocol icon]
 [Currency Rate up]
@@ -107,7 +101,6 @@
 [Import]
 [XML File (*.xml)]
 [All files (*.*)]
-[Miranda could not load CurrencyRates plugin. XML parser is missing.]
 [Miranda could not load CurrencyRates plugin. Microsoft HTML parser is missing.]
 [Log Files (*.txt,*.log)]
 [Enter integer value]
diff --git a/langpacks/croatian/Untranslated/Db_autobackups.txt b/langpacks/croatian/Untranslated/Db_autobackups.txt
index d347356a53..aa06ccab2b 100644
--- a/langpacks/croatian/Untranslated/Db_autobackups.txt
+++ b/langpacks/croatian/Untranslated/Db_autobackups.txt
@@ -12,7 +12,6 @@
 [Compress backup to zip-archive]
 [Backup profile folder]
 [Disable progress bar]
-[Disable popups]
 [Use CloudFile]
 [Backup NOW]
 [Backup progress]
@@ -23,11 +22,14 @@
 [Error]
 [Database backed up]
 [Database back up in process...]
+[Enable &AutoBackups notification]
+[Disable &AutoBackups notification]
 [Miranda NG databases]
 [Compressed Miranda NG databases]
 [Database]
 [Backup profile]
 [Save profile as...]
+[Popups]
 [Database backups]
 [Backup folder]
 [days]
diff --git a/langpacks/croatian/Untranslated/Discord.txt b/langpacks/croatian/Untranslated/Discord.txt
index c36fdfa627..8cf973502e 100644
--- a/langpacks/croatian/Untranslated/Discord.txt
+++ b/langpacks/croatian/Untranslated/Discord.txt
@@ -3,8 +3,9 @@
 [Password:]
 [Contacts]
 [Default group:]
+[Enable group chats]
 [Do not open chat windows on creation]
-[Use subgroups for guild's channels (requires restart)]
+[Use subgroups for server channels (requires restart)]
 [Nick:]
 [edited at]
 [Change &nickname]
@@ -21,11 +22,15 @@
 [Enter channel name]
 [Enter invitation code you received]
 [Do you really want to leave the guild?]
+[Disable sync]
+[Enable sync]
 [Join guild]
 [Copy my Discord ID]
 [Leave guild]
 [Create new channel]
 [Copy Discord ID]
+[Enable guild sync]
+[Load server history]
 [Network]
 [Account]
 [%s server connection]
diff --git a/langpacks/croatian/Untranslated/Facebook.txt b/langpacks/croatian/Untranslated/Facebook.txt
index 30a2a3b9bb..2e59e1881f 100644
--- a/langpacks/croatian/Untranslated/Facebook.txt
+++ b/langpacks/croatian/Untranslated/Facebook.txt
@@ -62,10 +62,10 @@
 [User &history]
 [Delete conversation]
 [This will permanently delete the conversation history]
-[Former]
 [Myself]
 [Friend]
 [User]
+[Former]
 [Notifications]
 [%s and more (%d)]
 [Login error: %s]
diff --git a/langpacks/croatian/Untranslated/ICQ.txt b/langpacks/croatian/Untranslated/ICQ.txt
index 04d1ed7a9d..93607cb830 100644
--- a/langpacks/croatian/Untranslated/ICQ.txt
+++ b/langpacks/croatian/Untranslated/ICQ.txt
@@ -3,7 +3,9 @@
 [Password:]
 [Sign in/sign up using phone]
 [Do not open chat windows on creation]
-[Advanced]
+[Use tray icon notifications]
+[E-mail]
+[Launch mailbox in a browser on click]
 [If a contact goes Offline, set this status instead and cache it for given timeout in seconds (0 - disabled)]
 [After that, set this status to a contact and move it offline after specified timeout in seconds (0 - disabled)]
 [Send group chat invitation]
@@ -23,9 +25,14 @@
 [&Invite a user]
 [&Leave/destroy chat]
 [Do you really want to remove it from ignore list?]
+[E-mail notification]
 [Ignore]
 [Remove Ignore]
 [Network]
+[General]
+[Advanced]
+[You received e-mail from %s: %s]
+[You have %d unread emails]
 [%s server connection]
 [Synchronize server groups]
 [Edit ignore list]
diff --git a/langpacks/croatian/Untranslated/Import.txt b/langpacks/croatian/Untranslated/Import.txt
index 25cfbf0589..d1631ade82 100644
--- a/langpacks/croatian/Untranslated/Import.txt
+++ b/langpacks/croatian/Untranslated/Import.txt
@@ -47,7 +47,6 @@
 [Skipping contact, account %S cannot be mapped.]
 [Skipping contact, %S not installed.]
 [Skipping non-IM contact (%S)]
-[Skipping %S contact, ID not found]
 [Skipping duplicate %S contact %s]
 [Failed to add %S contact %s]
 [Added %S contact %s, '%s']
diff --git a/langpacks/croatian/Untranslated/Jabber.txt b/langpacks/croatian/Untranslated/Jabber.txt
index a116607291..735d207614 100644
--- a/langpacks/croatian/Untranslated/Jabber.txt
+++ b/langpacks/croatian/Untranslated/Jabber.txt
@@ -157,6 +157,7 @@
 [Refresh]
 [JID:]
 [Node:]
+[Filter:]
 [Member Information]
 [Role:]
 [Set role]
@@ -188,15 +189,8 @@
 [Frame text]
 [Jabber Activity]
 [Jabber Mood]
-[Error %s %s]
-[Select Command]
-[Not supported]
 [Done]
-[In progress. Please Wait...]
 [Execute]
-[Requesting command list. Please wait...]
-[Jabber Ad-Hoc commands at %s]
-[Sending Ad-Hoc command to %s]
 [Jabber Agent Registration]
 [No message]
 [Register]
@@ -261,19 +255,11 @@
 [Visitor]
 [Participant]
 [Moderator]
-[Visitors]
-[Participants]
-[Moderators]
 [Owners]
-[User %s is now banned.]
-[User %s changed status to %s with message: %s]
-[User %s changed status to %s]
-[Room configuration was changed.]
-[Outcast]
-[Affiliation of %s was changed to '%s'.]
+[Moderators]
+[Participants]
+[Visitors]
 [Role of %s was changed to '%s'.]
-[because room is now members-only]
-[user banned]
 [Change &nickname]
 [&Invite a user]
 [&Roles]
@@ -322,8 +308,6 @@
 [Real &JID: %s]
 [Invite Users to\n%s]
 [%s (not on roster)]
-[%s from\n%s]
-[Real JID not available]
 [Reason to kick %s]
 [Reason to ban %s]
 [Invite %s to %s]
@@ -358,25 +342,15 @@
 [Copy JID]
 [Copy node name]
 [Copy node information]
-[Identities]
-[category]
-[type]
-[Category]
-[Type]
-[Supported features]
-[Info request error]
-[Items request error]
-[Set filter...]
 [Failed to retrieve room list from server.]
 [No rooms available on server.]
 [Room list request timed out.]
-[<no nick>]
 [Loading...]
 [Please wait for room list to download.]
 [Please specify group chat directory first.]
 [Bookmarks...]
 [Change nickname in <%s>]
-[has set the subject to:]
+[Error]
 [Group chat invitation to\n%s]
 [transport]
 [Notes]
@@ -422,7 +396,7 @@
 [Discovery]
 [Privacy]
 [Authentication failed for %s.]
-[Jabber Authentication]
+[Authentication]
 [Registration successful]
 [Password is successfully changed. Don't forget to update your password in the Jabber protocol option.]
 [Password cannot be changed.]
@@ -711,12 +685,6 @@
 [Affiliation changes]
 [Role changes]
 [Don't notify history messages]
-[Group]
-[Subscription]
-[Uploading...]
-[Downloading...]
-[XML for MS Excel (UTF-8 encoded)]
-[Connecting...]
 [Network]
 [Account]
 [Advanced]
@@ -733,7 +701,6 @@
 [Odnoklassniki]
 [S.ms]
 [Some changes will take effect the next time you connect to the Jabber network.]
-[Set New Password for %s@%S]
 [New password does not match.]
 [Current password is incorrect.]
 [Sending request, please wait...]
@@ -747,6 +714,25 @@
 [Default privacy list successfully declined]
 [Error occurred while setting default list]
 [Allow]
+[List has no rules, empty lists will be deleted then changes applied]
+[allow ]
+[deny ]
+[all.]
+[ and ]
+[incoming presences]
+[outgoing presences]
+[queries]
+[Else ]
+[If Jabber ID is ']
+[ (nickname: ]
+[If group is ']
+[If subscription is ']
+[then ]
+[ (act., def.)]
+[ (active)]
+[ (default)]
+[Ready.]
+[Privacy lists are not saved, discard any changes and exit?]
 [Simple mode]
 [Advanced mode]
 [Add JID]
@@ -768,25 +754,6 @@
 [Presence (in)]
 [Presence (out)]
 [Query]
-[List has no rules, empty lists will be deleted then changes applied]
-[allow ]
-[deny ]
-[all.]
-[ and ]
-[incoming presences]
-[outgoing presences]
-[queries]
-[Else ]
-[If Jabber ID is ']
-[ (nickname: ]
-[If group is ']
-[If subscription is ']
-[then ]
-[ (act., def.)]
-[ (active)]
-[ (default)]
-[Ready.]
-[Privacy lists are not saved, discard any changes and exit?]
 [Please save list before activating]
 [First, save the list]
 [Please save list before you make it the default list]
@@ -798,42 +765,13 @@
 [No compatible file transfer mechanism exists]
 [Protocol is offline or no JID]
 [No valid OMEMO session exists]
-[Command completed successfully]
-[Error occurred during processing command]
-[Set status]
-[Set options]
-[Forward unread messages]
-[Leave group chats]
-[Lock workstation]
-[Quit Miranda NG]
-[Change Status]
-[Choose the status and status message]
-[Status]
-[Extended away (Not available)]
-[Invisible]
-[Offline]
-[Priority]
-[Status message]
-[Change global status]
-[Set Options]
-[Set the desired options]
-[Automatically Accept File Transfers]
-[Play sounds]
-[Disable remote controlling (check twice what you are doing)]
-[There is no messages to forward]
-[Forward options]
-[%d message(s) to be forwarded]
-[Mark messages as read]
-[%d message(s) forwarded]
-[Workstation successfully locked]
-[Error %d occurred during workstation lock]
-[Confirmation needed]
-[Please confirm Miranda NG shutdown]
-[There is no group chats to leave]
-[Choose the group chats you want to leave]
-[Error %s %s\r\nPlease select other server]
+[Group]
+[Subscription]
+[Uploading...]
+[Downloading...]
+[Connecting...]
+[XML for MS Excel (UTF-8 encoded)]
 [Error: unknown reply received\r\nPlease select other server]
-[Error %s %s\r\nTry to specify more detailed]
 [Search error]
 [Select/type search service URL above and press <Go>]
 [Please wait...\r\nConnecting search server...]
@@ -844,6 +782,7 @@
 [declined subscription]
 [sent error presence]
 [sent unknown presence type]
+[Outcast]
 [Nick:]
 [Status:]
 [Real JID:]
@@ -852,18 +791,14 @@
 [Error: Cannot connect to the server]
 [Error: Connection lost]
 [Requesting registration instruction...]
-[Authentication failed for %s@%S.]
-[Message redirected from: %s\r\n%s]
+[Registration canceled]
 [Sending registration information...]
-[Resource]
 [<not specified>]
+[Resource]
 [Software]
 [Version]
 [System]
-[unknown]
-[Idle since]
-[Client capabilities]
-[Software information]
+[Last activity]
 [Operating system]
 [Operating system version]
 [Software version]
@@ -871,16 +806,10 @@
 [Mood]
 [Activity]
 [Tune]
-[both]
-[to]
-[from]
-[none]
 [Last logoff time]
 [Uptime]
 [Logoff message]
-[<no information available>]
 [Last active resource]
-[Please switch online to see more details.]
 [Copy only this value]
 [format]
 [Unknown format]
@@ -904,8 +833,8 @@
 [Service unavailable]
 [Remote server timeout]
 [Unknown error]
-[Error]
 [Unknown error message]
+[Offline]
 [Advanced Status]
 [Set mood...]
 [Set activity...]
diff --git a/langpacks/croatian/Untranslated/MSN.txt b/langpacks/croatian/Untranslated/MSN.txt
index 47211f4354..61ef7da60e 100644
--- a/langpacks/croatian/Untranslated/MSN.txt
+++ b/langpacks/croatian/Untranslated/MSN.txt
@@ -57,7 +57,6 @@
 [&Kick user]
 [&Op user]
 [&Deop user]
-[%I64u bytes]
 [MSN Alert]
 [User not online]
 [IID_IOleObject failed.]
diff --git a/langpacks/croatian/Untranslated/MenuEx.txt b/langpacks/croatian/Untranslated/MenuEx.txt
index c5b6cbc1b6..a2f8b1a55f 100644
--- a/langpacks/croatian/Untranslated/MenuEx.txt
+++ b/langpacks/croatian/Untranslated/MenuEx.txt
@@ -30,8 +30,6 @@
 [Files]
 [Authorization]
 [Typing Notify]
-[Please authorize me to add you to my contact list.]
-[Do you want to send authorization request\nto new contact?]
 [Open ignore settings]
 [MenuItemEx]
 [Customize]
diff --git a/langpacks/croatian/Untranslated/MinecraftDynmap.txt b/langpacks/croatian/Untranslated/MinecraftDynmap.txt
index f1f657da39..acbda01caa 100644
--- a/langpacks/croatian/Untranslated/MinecraftDynmap.txt
+++ b/langpacks/croatian/Untranslated/MinecraftDynmap.txt
@@ -1,7 +1,6 @@
 [Minecraft Dynmap support for Miranda NG.]
 [Server:]
 [Visible name:]
-[Server]
 [Admin]
 [Normal]
 [You]
diff --git a/langpacks/croatian/Untranslated/MirOTR.txt b/langpacks/croatian/Untranslated/MirOTR.txt
index 9ed2dac51a..4e198a2586 100644
--- a/langpacks/croatian/Untranslated/MirOTR.txt
+++ b/langpacks/croatian/Untranslated/MirOTR.txt
@@ -34,6 +34,11 @@
 [&Refresh OTR session]
 [Sto&p OTR session]
 [&Verify Fingerprint]
+[OTR private]
+[OTR unverified]
+[OTR finished]
+[OTR not secure]
+[Refresh]
 [Start OTR]
 [Stop OTR]
 [OTR status (Click for more options)]
@@ -41,7 +46,6 @@
 [OTR Encryption: UNVERIFIED]
 [OTR Encryption: Private]
 [OTR Encryption: Finished]
-[&Convert HTML (for Pidgin)]
 [OTR encrypted session with '%s' has been terminated]
 [Requesting OTR encrypted session with '%s']
 [Beginning OTR encrypted session with '%s']
@@ -57,11 +61,6 @@
 [OTR Information]
 [OTR encrypted session with '%s' is now using a VERIFIED fingerprint]
 [OTR encrypted session with '%s' is now using a NOT VERIFIED fingerprint]
-[OTR unverified]
-[OTR finished]
-[OTR private]
-[OTR not secure]
-[Refresh]
 [Generating new private key for protocol '%s'.\nPlease Wait...]
 [General]
 [Protocols]
@@ -109,6 +108,7 @@
 [You are using SecureIM. MirOTR will only work for contacts with SecureIM disabled]
 [MirOTR menu]
 [OTR Status]
+[&Convert HTML (for Pidgin)]
 [Private Data]
 [Services]
 [\nusing older protocol version %i]
diff --git a/langpacks/croatian/Untranslated/NotesReminders.txt b/langpacks/croatian/Untranslated/NotesReminders.txt
index 4a0cbd21ec..da7f3781ee 100644
--- a/langpacks/croatian/Untranslated/NotesReminders.txt
+++ b/langpacks/croatian/Untranslated/NotesReminders.txt
@@ -20,9 +20,9 @@
 [Reset to defaults]
 [(Using MCI allows different sounds to be played simultaneously, may not be needed or desired when a custom sound plugin is installed.)]
 [Add Reminder]
-[Trigger On Time && Date:]
 [Date]
 [Time]
+[Repeat each day]
 [Reminder Note:]
 [None]
 [Daily]
@@ -45,7 +45,6 @@
 [New &Reminder]
 [&Delete Reminder]
 [D&elete All Reminders]
-[Context Menu Note Popup]
 [&Hide Note]
 [&Always On Top]
 [&New Note]
@@ -69,13 +68,10 @@
 [Always &On Top]
 [Delete &All Notes]
 [&Show / Hide Notes]
-[Notes & Reminders]
 [New Note]
 [Toggle Notes Visibility]
 [Bring All Notes to Front]
 [New Reminder]
-[Are you sure you want to delete all notes?]
-[Are you sure you want to delete all reminders?]
 [Delete All Notes]
 [Show/Hide Notes]
 [On Top Caption Icon]
@@ -89,19 +85,18 @@
 [Play Sound Icon]
 [View Notes]
 [Sticky Notes]
-[Plugins]
 [Add New Note]
 [Add New Reminder]
-[Alerts]
-[Reminder triggered]
-[Reminder triggered (Alternative 1)]
-[Reminder triggered (Alternative 2)]
 [Notes && Reminders]
 [New &Note]
 [Vie&w Notes]
 [&Delete All Notes]
 [&Bring All to Front]
 [Miranda could not load the Notes & Reminders plugin, Msftedit.dll is missing. If you are using WINE, please make sure you have Msftedit.dll installed. Press 'Yes' to continue loading Miranda.]
+[Alerts]
+[Reminder triggered]
+[Reminder triggered (Alternative 1)]
+[Reminder triggered (Alternative 2)]
 [Black]
 [Maroon]
 [Green]
@@ -125,19 +120,21 @@
 [Notes]
 [Note text]
 [Date/Title]
+[Are you sure you want to delete all notes?]
 [Sticky Note Caption]
 [Sticky Note Background Color]
 [Sticky Note Body]
 [Executable Files\0*.exe\0All Files\0*.*\0\0]
 [Select Executable]
+[Plugins]
 [Minutes]
 [Hours]
+[The specified time is invalid due to begin of daylight saving (summer time).]
+[The specified time is invalid.]
 [Hour]
 [Day]
 [Days]
 [Week]
-[The specified time is invalid due to begin of daylight saving (summer time).]
-[The specified time is invalid.]
 [The specified time offset is invalid.]
 [&Update Reminder]
 [Every]
@@ -147,4 +144,6 @@
 [Alternative 2]
 [Reminder text]
 [Date of activation]
+[Are you sure you want to delete all reminders?]
 [Are you sure you want to delete this reminder?]
+[Notes & Reminders]
diff --git a/langpacks/croatian/Untranslated/PasteIt.txt b/langpacks/croatian/Untranslated/PasteIt.txt
index 8d8c7a9bc5..1c2ba79512 100644
--- a/langpacks/croatian/Untranslated/PasteIt.txt
+++ b/langpacks/croatian/Untranslated/PasteIt.txt
@@ -64,9 +64,9 @@
 [File size is larger then 10 MB, cannot be sent]
 [Cannot open file '%s']
 [File '%s' is empty]
-[Error during sending text to web page: %s]
+[Error during sending text to web page: %S]
 [Error during sending text to web page]
-[Error during getting user key from web page: %s]
+[Error during getting user key from web page: %S]
 [Paste expire date]
 [Never]
 [10 minutes]
diff --git a/langpacks/croatian/Untranslated/PopupPlus.txt b/langpacks/croatian/Untranslated/PopupPlus.txt
index f550cc99b0..7010daf4a7 100644
--- a/langpacks/croatian/Untranslated/PopupPlus.txt
+++ b/langpacks/croatian/Untranslated/PopupPlus.txt
@@ -35,7 +35,7 @@
 [Skin options]
 [Preview]
 [Download more skins]
-[Popup History]
+[Popup history]
 [Desktop]
 [Popup area]
 [pixel(s)]
@@ -119,10 +119,8 @@
 [Sidebar]
 [Title underline]
 [Avatar border]
-[Popup History is disabled]
-[Popup History message]
-[Popups are enabled]
-[Popups are disabled]
+[Popup history is disabled]
+[Popup history message]
 [With "favorite" overlay]
 [With "fullscreen" overlay]
 [Error]
@@ -138,10 +136,10 @@
 [Classes]
 [Contacts]
 [Advanced]
-[Toggle Popups]
-[Enable Popups]
-[Disable Popups]
-[Popup Plus]
+[Toggle popups]
+[Enable popups]
+[Disable popups]
+[Popup plus]
 [Error: I could not register the Popup Window class.\r\nThe plugin will not operate.]
 [No effect]
 [Fade in/out]
diff --git a/langpacks/croatian/Untranslated/TabSRMM.txt b/langpacks/croatian/Untranslated/TabSRMM.txt
index 0561194f90..136a18dad7 100644
--- a/langpacks/croatian/Untranslated/TabSRMM.txt
+++ b/langpacks/croatian/Untranslated/TabSRMM.txt
@@ -59,7 +59,6 @@
 [Group chats]
 [Errors]
 [Use the message log color theme for group chat popups]
-[No compatible popup plugin was found. The event notification\nsystem is not available.]
 [Dialog]
 [Cancel]
 [All modes]
@@ -793,8 +792,6 @@
 [Clock symbol (for the info panel clock)]
 [Feature disabled (used as overlay)]
 [Feature enabled (used as overlay)]
-[Enable typing notification]
-[Disable typing notification]
 [Message windows - IM]
 [Message windows - all]
 [Message windows - group chats]
@@ -929,8 +926,8 @@
 [Add offline contacts to multisend list]
 [Disable &typing notification]
 [Enable &typing notification]
-[...is typing a message.]
 [...has stopped typing.]
+[...is typing a message.]
 [Contact started typing]
 [Contact stopped typing]
 [Force default message log]
diff --git a/langpacks/croatian/Untranslated/UInfoEx.txt b/langpacks/croatian/Untranslated/UInfoEx.txt
index 6ac313bb7e..0d12315d85 100644
--- a/langpacks/croatian/Untranslated/UInfoEx.txt
+++ b/langpacks/croatian/Untranslated/UInfoEx.txt
@@ -530,9 +530,8 @@
 [Phone (UInfoEx)]
 [[b]%s (%S)...[/b]\n%d Contacts remaining]
 [Abort Refreshing Contact Details]
-[Do you want to cancel the current refresh procedure?]
 [Miranda must be online for refreshing contact information!]
-[The function caused an exception!]
+[Do you want to cancel the current refresh procedure?]
 [%s has %s today.]
 [an anniversary]
 [He/she has the following anniversaries:]
@@ -579,18 +578,12 @@
 [Select a destination file...]
 [Import User Details from VCard]
 [Can't create xml file!\n%S]
-[Export took %f ms]
 [Contact: %s (%S)]
-[Importing %s caused error %d]
-[Loading contact %s from xml failed with error %d]
-[Importing Owner caused error %d]
 [Parser is unable to load XMLCard "%s"\nError: %d\nDescription: %s]
 [The selected file is no valid XMLCard]
 [The version of the XMLCard is not supported by UserInfoEx]
 [Complete]
 [Owner contact successfully imported.]
 [Selected XMLCard does not contain an owner contact!]
-[Import took %f ms]
 [added contacts: %u / %u\nadded settings: %u / %u\nadded events %u / %u\nduplicated events: %u]
-[FATAL: An exception was thrown while importing contacts from xmlCard!]
 [Flags (UInfoEx)]
diff --git a/langpacks/croatian/Untranslated/WhoUsesMyFiles.txt b/langpacks/croatian/Untranslated/WhoUsesMyFiles.txt
index 9361a265ef..67011880e3 100644
--- a/langpacks/croatian/Untranslated/WhoUsesMyFiles.txt
+++ b/langpacks/croatian/Untranslated/WhoUsesMyFiles.txt
@@ -22,9 +22,8 @@
 [Alert computer name with username]
 [Disabled options will be available in the next version]
 [Show current connections]
-[Popup plugin not found!]
-[Error]
 [Common Dialog Error 0x%lx]
+[Error]
 [Not implemented yet...]
 [Who uses my files]
 [Services]
diff --git a/langpacks/czech/=CORE=.txt b/langpacks/czech/=CORE=.txt
index e14465b5f1..37ac57850e 100644
--- a/langpacks/czech/=CORE=.txt
+++ b/langpacks/czech/=CORE=.txt
@@ -570,6 +570,55 @@ Vybr&at vše
 Vložit a odeslat
 [Delete]
 Smazat
+;file \src\core\stdpopup\res\resource.rc
+[Popup history]
+Historie oznámení
+[Case sensitive]
+Rozlišovat malá a VELKÁ
+[Default timeout]
+Výchozí doba zobrazení
+[Never timeout]
+Zobrazovat trvale
+[Set timeout:]
+Autom. skrýt po:
+[Width:]
+Šířka:
+[Maximum height:]
+Maximální výška:
+[Opacity (%):]
+Průhlednost (%):
+[Border]
+Okraj
+[Round corners (window)]
+Zaoblit rohy oken
+[Preview]
+Náhled
+[Transparent background]
+Průhledné pozadí
+[Layout]
+Rozvržení
+[Avatar size:]
+Velikost avataru:
+[Disable when]
+Neaktivní při
+[Global hover]
+Nezavírat po umístění myši
+[Sidebar width:]
+Šířka bočn. pruhu:
+[Text indent:]
+Odsazení textu:
+[Padding:]
+Vyplnění:
+[Round corners (avatar)]
+Zaoblit rohy avatarů
+[Text color:]
+Barva textu:
+[Background color:]
+Barva pozadí:
+[Set timeout]
+Nastavit dobu zobrazení
+[Timeout value (0 = default):]
+Prodleva (0 = výchozí):
 ;file \src\core\stduihist\res\resource.rc
 [Find]
 Najít
@@ -1749,6 +1798,88 @@ Kontakt přestal psát
 ;file \src\core\stdmsg\src\msgtimedout.cpp
 [An unknown error has occurred.]
 Neznámá chyba.
+;file \src\core\stdpopup\src\icons.cpp
+[Popups are enabled]
+Oznámení jsou zapnuta
+[Popups are disabled]
+Oznámení jsou vypnuta
+;file \src\core\stdpopup\src\notify_imp.cpp
+;file \src\core\stdpopup\src\options.cpp
+[Example]
+Příklad
+[The quick brown fox jumped over the lazy dog.]
+Žluťoučký kůň úpěl ďábelské ódy.
+[Example With a Long Title]
+Příklad dlouhého záhlaví
+[Thequickbrownfoxjumpedoverthelazydog.]
+Žluťoučkýkůňúpělďábelskéódy.
+[An avatar.]
+avatar
+[Bottom right]
+Vpravo dole
+[Bottom left]
+Vlevo dole
+[Top right]
+Vpravo nahoře
+[Top left]
+Vlevo nahoře
+[Icon on left]
+Ikona vlevo
+[Icon on right]
+Ikona vpravo
+[No time]
+Bez času
+[Time on left]
+Čas vlevo
+[Time on right]
+Čas vpravo
+[Time above avatar]
+Čas nad avatarem
+[No avatar]
+Bez avataru
+[Left avatar]
+Avatar vlevo
+[Right avatar]
+Avatar vpravo
+[Full-screen app running]
+Celoobrazovkový režim
+[No animate]
+Bez animace
+[Horizontal animate]
+Horizontální animace
+[Vertical animate]
+Vertikální animace
+[You cannot set a default timeout of 0.\nValue has been reset.]
+Nemůžete nastavit výchozí dobu zobrazení na 0.\nHodnota byla obnovena.
+[Settings]
+Nastavení
+[Classes]
+Třídy
+;file \src\core\stdpopup\src\services.cpp
+[Disable popups]
+Vypnout oznámení
+[Enable popups]
+Povolit oznámení
+;file \src\core\stdpopup\src\yapp.cpp
+[Toggle popups]
+Zapnout/vypnout oznámení
+[First line]
+První řádek
+[Second line]
+Druhý řádek
+[Time]
+Čas
+[Sidebar]
+Boční pruh
+[Title underline]
+Podtržení záhlaví
+;file \src\core\stdpopup\src\yapp_history_dlg.cpp
+[Copy title to clipboard]
+Zkopírovat záhlaví
+[Copy message to clipboard]
+Zkopírovat zprávu
+[Copy timestamp to clipboard]
+Zkopírovat časový údaj
 ;file \src\core\stdssl\src\netlibssl.cpp
 [Client cannot decode host message. Possible causes: host does not support SSL or requires not existing security package]
 Klient nemůže dekódovat zprávu hostitele. Možné příčiny: Hostitel nepodporuje SSL nebo vyžaduje neexistující soubor zabezpečení
@@ -2631,8 +2762,6 @@ Prázdný slot
 Doplněk Unicode
 [ANSI plugin]
 Doplněk ANSI
-[Unused]
-
 [Show/Hide]
 Zobrazit nebo skrýt
 [Exit]
@@ -2647,6 +2776,8 @@ Přesunout do skupiny
 Zap
 [Off]
 Vyp
+[Unused]
+
 [Frames]
 Rámečky
 [Add group]
diff --git a/langpacks/czech/Plugins/Actman.txt b/langpacks/czech/Plugins/Actman.txt
index 2985e1ea11..d9ab39a37c 100644
--- a/langpacks/czech/Plugins/Actman.txt
+++ b/langpacks/czech/Plugins/Actman.txt
@@ -677,19 +677,19 @@ Zjistit aktualizace
 
 [Empty updater download folder]
 
-[Popup Plus (popup.dll) latest YAPP (yapp.dll)]
+[Popup plus (PopupPlus.dll) latest StdPopup (StdPopup.dll)]
 
-[Enables or disables Popup windows]
+[Enables or disables popup windows]
 
 [Notify]
 Oznámení
-[YAPP or Popup]
+[StdPopup or Popup plus]
 
 [Popup window]
 Zobrazit text
 [Unicode Text]
 
-[Enables or disables Popup windows (maybe deprecated)]
+[Enables or disables popup windows (maybe deprecated)]
 
 [result of protocol service call]
 
diff --git a/langpacks/czech/Plugins/ChangeKeyboardLayout.txt b/langpacks/czech/Plugins/ChangeKeyboardLayout.txt
index ee015b98ee..fe656993fc 100644
--- a/langpacks/czech/Plugins/ChangeKeyboardLayout.txt
+++ b/langpacks/czech/Plugins/ChangeKeyboardLayout.txt
@@ -82,8 +82,6 @@ Komunikace
 [Popups]
 Oznámení
 ;file \plugins\ChangeKeyboardLayout\src\main.cpp
-[Popup]
-Oznámení
 ;file \plugins\ChangeKeyboardLayout\src\stdafx.h
 [ChangeKeyboardLayout]
 Změna rozvržení klávesnice
diff --git a/langpacks/czech/Plugins/Clist_modern.txt b/langpacks/czech/Plugins/Clist_modern.txt
index a805d0ff41..27da147f43 100644
--- a/langpacks/czech/Plugins/Clist_modern.txt
+++ b/langpacks/czech/Plugins/Clist_modern.txt
@@ -747,6 +747,8 @@ Jméno (použít místní nastavení)
 Název účtu
 [Rate]
 Priorita
+[Last online]
+Naposledy online
 [-Nothing-]
 ---
 [Hide to tray]
@@ -808,8 +810,6 @@ Názvy skupin uprostřed
 Názvy skupin vpravo
 [Row]
 Řádek
-[Row design]
-Vzhled řádku
 ;file \plugins\Clist_modern\src\modern_clistsettings.cpp
 [(Unknown contact)]
 (neznámý kontakt)
@@ -835,21 +835,6 @@ Ukončit program Miranda
 Obnovit předchozí stav
 [Show/Hide offline users]
 Zobrazit/skrýt uživatele offline
-;file \plugins\Clist_modern\src\modern_rowtemplateopt.cpp
-[Empty %s cell]
-Prázdná buňka %s
-[column]
-sloupec
-[line]
-řádek
-[columns]
-sloupce
-[lines]
-řádky
-[%s, contain %s]
-%s, obsahuje %s
-[ layered]
- moderní
 ;file \plugins\Clist_modern\src\modern_skinopt.cpp
 [( unknown )]
 (neznámý)
diff --git a/langpacks/czech/Plugins/CloudFile.txt b/langpacks/czech/Plugins/CloudFile.txt
index 9c1c61c1e7..3d55fb3031 100644
--- a/langpacks/czech/Plugins/CloudFile.txt
+++ b/langpacks/czech/Plugins/CloudFile.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Allows you to transfer files via cloud services.]
 
-;file \plugins\CloudFile\res\resource.rc
+;file \protocols\CloudFile\res\resource.rc
 [Default service]
 
 [General]
@@ -42,7 +42,7 @@ Navštívit stránku
 
 [Revoke access]
 
-;file \plugins\CloudFile\src\icons.cpp
+;file \protocols\CloudFile\src\icons.cpp
 [Upload file(s)]
 Nahrát soubor(y)
 [Dropbox]
@@ -53,22 +53,22 @@ Nahrát soubor(y)
 
 [Yandex.Disk]
 
-;file \plugins\CloudFile\src\menus.cpp
+;file \protocols\CloudFile\src\menus.cpp
 [Upload to...]
 
 [Upload]
 Nahrát na server
-;file \plugins\CloudFile\src\options.cpp
+;file \protocols\CloudFile\src\options.cpp
 [None]
 ---
 [Services]
 Služby
-;file \plugins\CloudFile\src\srmm.cpp
+;file \protocols\CloudFile\src\srmm.cpp
 [Upload files to...]
 
-;file \plugins\CloudFile\src\Services\dropbox_service.cpp
+;file \protocols\CloudFile\src\Services\dropbox_service.cpp
 [Server does not respond]
 
-;file \plugins\CloudFile\src\Services\google_service.cpp
-;file \plugins\CloudFile\src\Services\microsoft_service.cpp
-;file \plugins\CloudFile\src\Services\yandex_service.cpp
+;file \protocols\CloudFile\src\Services\google_service.cpp
+;file \protocols\CloudFile\src\Services\microsoft_service.cpp
+;file \protocols\CloudFile\src\Services\yandex_service.cpp
diff --git a/langpacks/czech/Plugins/CmdLine.txt b/langpacks/czech/Plugins/CmdLine.txt
index ea39777104..7abc2b7b75 100644
--- a/langpacks/czech/Plugins/CmdLine.txt
+++ b/langpacks/czech/Plugins/CmdLine.txt
@@ -195,8 +195,3 @@ Dword
 
 [You can only run one instance of CmdLine plugin.]
 
-;file \plugins\CmdLine\src\utils.cpp
-[Notify]
-Oznámení
-[Warning]
-Upozornění
diff --git a/langpacks/czech/Plugins/ConnectionNotify.txt b/langpacks/czech/Plugins/ConnectionNotify.txt
index db978b722d..d0896185ca 100644
--- a/langpacks/czech/Plugins/ConnectionNotify.txt
+++ b/langpacks/czech/Plugins/ConnectionNotify.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Notify with popup if some connection established]
 Zobrazí oznámení při navázání spojení.
-;file \plugins\ConnectionNotify\res\ConnectionNotify.rc
+;file \protocols\ConnectionNotify\res\ConnectionNotify.rc
 [Set popup colors]
 Nastavit barvy oznámení
 [Popup options]
@@ -56,7 +56,7 @@ Zrušit
 Můžete používat zástupné znaky * a ? (pro port zadejte číslo nebo *)
 [Remote IP:Port]
 Vzdálená IP:port
-;file \plugins\ConnectionNotify\src\ConnectionNotify.cpp
+;file \protocols\ConnectionNotify\src\ConnectionNotify.cpp
 [Show]
 Zobrazit
 [Hide]
@@ -79,6 +79,6 @@ Akce
 Doplňky
 [New Connection Notification]
 Upozornění na nové připojení
-;file \plugins\ConnectionNotify\src\filter.cpp
+;file \protocols\ConnectionNotify\src\filter.cpp
 [First close options window]
 Nejprve zavřete okno s nastavením
diff --git a/langpacks/czech/Plugins/CrashDumper.txt b/langpacks/czech/Plugins/CrashDumper.txt
index 5f56178f8f..68ba13be31 100644
--- a/langpacks/czech/Plugins/CrashDumper.txt
+++ b/langpacks/czech/Plugins/CrashDumper.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: CrashDumper.dll
 ;  Plugin: Crash dumper
-;  Version: 0.1.0.2
+;  Version: 0.1.0.3
 ;  Authors: borkra
 ;============================================================
 [Crash Dumper and Version Information for Miranda NG.]
diff --git a/langpacks/czech/Plugins/CurrencyRates.txt b/langpacks/czech/Plugins/CurrencyRates.txt
index 4ac38d26fc..772fa044e9 100644
--- a/langpacks/czech/Plugins/CurrencyRates.txt
+++ b/langpacks/czech/Plugins/CurrencyRates.txt
@@ -2,12 +2,12 @@
 ;============================================================
 ;  File: CurrencyRates.dll
 ;  Plugin: Currency Rates
-;  Version: 0.1.0.101
+;  Version: 0.2.0.3
 ;  Authors: Dioksin
 ;============================================================
 [Shows currency rates.]
 Zobrazuje kurzy měn.
-;file \plugins\CurrencyRates\res\Forex.rc
+;file \protocols\CurrencyRates\res\Forex.rc
 [Variable List]
 Seznam proměnných
 [Edit Settings]
@@ -104,14 +104,16 @@ Odst&ranit
 Zpráva &stavu
 [&Tendency:]
 
+[&Personal key:]
+
 [&Advanced Settings...]
 Pokročilé nastavení...
 [Rate Info]
 
-;file \plugins\CurrencyRates\src\Chart.h
+;file \protocols\CurrencyRates\src\Chart.h
 [There is nothing to show]
 
-;file \plugins\CurrencyRates\src\CommonOptionDlg.cpp
+;file \protocols\CurrencyRates\src\CommonOptionDlg.cpp
 [Seconds]
 sekund
 [Minutes]
@@ -124,24 +126,15 @@ Zadejte číselnou hodnotu mezi 1 a 60.
 Zadejte číselnou hodnotu mezi 1 a 24.
 [Enter text to display in contact list.]
 Zadejte text pro zobrazení v seznamu kontaktů.
-;file \plugins\CurrencyRates\src\CurrencyConverter.cpp
+;file \protocols\CurrencyRates\src\CurrencyConverter.cpp
 [Info provided by]
 Informace poskytuje
 [Enter positive number.]
 
-;file \plugins\CurrencyRates\src\CurrencyRateInfoDlg.cpp
+;file \protocols\CurrencyRates\src\CurrencyRateInfoDlg.cpp
 [Currency Rate]
 
-;file \plugins\CurrencyRates\src\CurrencyRatesProviderCurrencyConverter.cpp
-[Error occurred during HTML parsing.]
-
-[Error occurred during site access.]
-
-;file \plugins\CurrencyRates\src\CurrencyRatesProviderVisitorFormatSpecificator.cpp
-[Currency Symbol]
-
-[Currency Name]
-
+;file \protocols\CurrencyRates\src\CurrencyRatesProviderBase.cpp
 [Source of Information]
 
 [Rate Value]
@@ -160,20 +153,11 @@ Informace poskytuje
 
 [Left slash (\\)]
 
-[Open Price]
-
-[Percent Change to After Hours]
-
-[Percent Change to Yesterday Close]
-
-[Day's High]
-
-[Day's Low]
+;file \protocols\CurrencyRates\src\CurrencyRatesProviderCurrencyConverter.cpp
+[Error occurred during HTML parsing.]
 
-[Previous Close]
+[Error occurred during site access.]
 
-[Change]
-Změnit
 [From Currency Full Name]
 
 [From Currency Short Name]
@@ -184,7 +168,7 @@ Změnit
 
 [Short notation for "%f/%i"]
 
-;file \plugins\CurrencyRates\src\Forex.cpp
+;file \protocols\CurrencyRates\src\Forex.cpp
 [Auto Update Enabled]
 Deaktivovat automatickou aktualizaci
 [Auto Update Disabled]
@@ -215,12 +199,16 @@ Upravit nastavení...
 
 [Currency Rates Auto Update Disabled]
 
+[Currency Symbol]
+
 [Network]
 Sítě
-;file \plugins\CurrencyRates\src\HTTPSession.cpp
+;file \protocols\CurrencyRates\src\HTTPSession.cpp
+[This plugin requires a personal key. Press Yes to obtain it at the site and then enter the result in the Options dialog, otherwise this plugin will fail.]
+
 [CurrencyRates HTTP connections]
 CurrencyRates - spojení pomocí protokolu HTTP
-;file \plugins\CurrencyRates\src\IconLib.cpp
+;file \protocols\CurrencyRates\src\IconLib.cpp
 [Protocol icon]
 Ikona protokolu
 [Currency Rate up]
@@ -237,17 +225,15 @@ Exportovat
 
 [Import]
 Importovat
-;file \plugins\CurrencyRates\src\ImportExport.cpp
+;file \protocols\CurrencyRates\src\ImportExport.cpp
 [XML File (*.xml)]
 XML soubory (*.xml)
 [All files (*.*)]
 Všechny soubory (*.*)
-;file \plugins\CurrencyRates\src\ModuleInfo.cpp
-[Miranda could not load CurrencyRates plugin. XML parser is missing.]
-Miranda nemůže načíst doplněk CurrencyRates. XML parser nebyl nalezen.
+;file \protocols\CurrencyRates\src\ModuleInfo.cpp
 [Miranda could not load CurrencyRates plugin. Microsoft HTML parser is missing.]
 Miranda nemůže načíst doplněk CurrencyRates. Microsoft HTML parser nebyl nalezen.
-;file \plugins\CurrencyRates\src\SettingsDlg.cpp
+;file \protocols\CurrencyRates\src\SettingsDlg.cpp
 [Log Files (*.txt,*.log)]
 Záznamové soubory (*.txt,*.log)
 [Enter integer value]
diff --git a/langpacks/czech/Plugins/Db_autobackups.txt b/langpacks/czech/Plugins/Db_autobackups.txt
index af344682df..3361ef57b1 100644
--- a/langpacks/czech/Plugins/Db_autobackups.txt
+++ b/langpacks/czech/Plugins/Db_autobackups.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Db_autobackups.dll
 ;  Plugin: Db autobackuper
-;  Version: 0.1.0.2
+;  Version: 0.1.0.3
 ;  Authors: chaos.persei, sje, Kildor, Billy_Bons
 ;============================================================
 [Database autobackuper plugin.]
@@ -34,8 +34,6 @@ Komprimovat zálohu do zip-archivu
 Složka pro zálohy profilu
 [Disable progress bar]
 Vypnout ukazatel průběhu
-[Disable popups]
-Vypnout oznámení
 [Use CloudFile]
 Použít CloudFile
 [Backup NOW]
@@ -58,6 +56,10 @@ Databáze zálohována
 [Database back up in process...]
 Probíhá záloha databáze...
 ;file \plugins\Db_autobackups\src\main.cpp
+[Enable &AutoBackups notification]
+
+[Disable &AutoBackups notification]
+
 [Miranda NG databases]
 Databáze Mirandy NG
 [Compressed Miranda NG databases]
@@ -70,6 +72,8 @@ Databáze
 Zazálohovat profil
 [Save profile as...]
 Uložit profil jako...
+[Popups]
+Oznámení
 [Database backups]
 Zálohování databáze
 [Backup folder]
diff --git a/langpacks/czech/Plugins/Discord.txt b/langpacks/czech/Plugins/Discord.txt
index 51b937eeb7..41c192f8bb 100644
--- a/langpacks/czech/Plugins/Discord.txt
+++ b/langpacks/czech/Plugins/Discord.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Discord.dll
 ;  Plugin: Discord protocol
-;  Version: 0.6.1.1
+;  Version: 0.6.2.1
 ;  Authors: George Hazan
 ;============================================================
 [Discord support for Miranda NG.]
@@ -18,9 +18,11 @@ Heslo:
 Kontakty
 [Default group:]
 Výchozí skupina:
+[Enable group chats]
+
 [Do not open chat windows on creation]
 Neotevírat okno se skupinovým rozhovorem po jeho vytvoření
-[Use subgroups for guild's channels (requires restart)]
+[Use subgroups for server channels (requires restart)]
 
 [Nick:]
 Přezdívka:
@@ -58,6 +60,10 @@ Skupinové rozhovory
 
 [Do you really want to leave the guild?]
 
+[Disable sync]
+
+[Enable sync]
+
 [Join guild]
 
 [Copy my Discord ID]
@@ -68,6 +74,10 @@ Skupinové rozhovory
 
 [Copy Discord ID]
 
+[Enable guild sync]
+
+[Load server history]
+
 ;file \protocols\Discord\src\options.cpp
 [Network]
 Sítě
diff --git a/langpacks/czech/Plugins/FTPFile.txt b/langpacks/czech/Plugins/FTPFile.txt
index 655e8547eb..4995204d95 100644
--- a/langpacks/czech/Plugins/FTPFile.txt
+++ b/langpacks/czech/Plugins/FTPFile.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: FTPFile.dll
 ;  Plugin: FTP File YM
-;  Version: 0.6.0.4
+;  Version: 0.6.0.5
 ;  Authors: yaho
 ;============================================================
 [FTP a file to a server and send the URL to your friend. Supported automatic zipping before upload and encryption via SFTP and FTPS.]
diff --git a/langpacks/czech/Plugins/Facebook.txt b/langpacks/czech/Plugins/Facebook.txt
index ed06edc28e..bdfa2fa0d7 100644
--- a/langpacks/czech/Plugins/Facebook.txt
+++ b/langpacks/czech/Plugins/Facebook.txt
@@ -142,14 +142,14 @@ Zobrazit &historii
 
 [This will permanently delete the conversation history]
 
-[Former]
-Bývalý účastník
 [Myself]
 Já
 [Friend]
 Přítel
 [User]
 Uživatel
+[Former]
+Bývalý účastník
 [Notifications]
 Upozornění
 [%s and more (%d)]
diff --git a/langpacks/czech/Plugins/GG.txt b/langpacks/czech/Plugins/GG.txt
index 4e8c377ce0..6ff7491595 100644
--- a/langpacks/czech/Plugins/GG.txt
+++ b/langpacks/czech/Plugins/GG.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: GG.dll
 ;  Plugin: Gadu-Gadu protocol
-;  Version: 0.11.0.4
+;  Version: 0.95.11.1
 ;  Authors: Bartosz Bialek, Adam Strzelecki
 ;============================================================
 [Gadu-Gadu protocol support for Miranda NG.]
diff --git a/langpacks/czech/Plugins/GmailNotifier.txt b/langpacks/czech/Plugins/GmailNotifier.txt
index 0cde96d0f1..4a0ec8732b 100644
--- a/langpacks/czech/Plugins/GmailNotifier.txt
+++ b/langpacks/czech/Plugins/GmailNotifier.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Check your Gmail inboxes locally.]
 Lokálně kontroluje vaše schránky na Gmailu.
-;file \plugins\GmailNotifier\res\options.rc
+;file \protocols\GmailNotifier\res\options.rc
 [Gmail account]
 Účet na Gmailu
 [Name:]
@@ -54,7 +54,7 @@ Zobrazit ikonu ve stavové liště (restart)
 Nepřihlašovat automaticky (veřejný počítač)
 [Log unread threads into database (enable history)]
 Zapsat nepřečtené zprávy do databáze (historie)
-;file \plugins\GmailNotifier\src\check.cpp
+;file \protocols\GmailNotifier\src\check.cpp
 [Checking...]
 Kontrolování...
 [Can't send account data!]
@@ -63,7 +63,7 @@ Nelze zaslat data o účtu!
 Neplatné jméno nebo heslo!
 [Can't get RSS feed!]
 Nelze přečíst kanál RSS!
-;file \plugins\GmailNotifier\src\main.cpp
+;file \protocols\GmailNotifier\src\main.cpp
 [Other]
 Ostatní
 [Gmail: New thread(s)]
@@ -74,7 +74,7 @@ Gmail: Nové vlákno/a
 &Zkontrolovat všechny účty (Gmail)
 [&Check Gmail inbox]
 &Zkontrolovat účet (Gmail)
-;file \plugins\GmailNotifier\src\options.cpp
+;file \protocols\GmailNotifier\src\options.cpp
 [GmailNotifier]
 GmailNotifier
 [Network]
diff --git a/langpacks/czech/Plugins/ICQ.txt b/langpacks/czech/Plugins/ICQ.txt
index a94df6386f..f44e4b88a2 100644
--- a/langpacks/czech/Plugins/ICQ.txt
+++ b/langpacks/czech/Plugins/ICQ.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: ICQ.dll
 ;  Plugin: ICQ-WIM protocol
-;  Version: 0.95.11.1
+;  Version: 0.95.11.4
 ;  Authors: George Hazan
 ;============================================================
 [ICQ protocol support for Miranda NG.]
@@ -16,8 +16,12 @@ Heslo:
 
 [Do not open chat windows on creation]
 Neotevírat okno se skupinovým rozhovorem po jeho vytvoření
-[Advanced]
-Extra
+[Use tray icon notifications]
+
+[E-mail]
+E-mail
+[Launch mailbox in a browser on click]
+
 [If a contact goes Offline, set this status instead and cache it for given timeout in seconds (0 - disabled)]
 
 [After that, set this status to a contact and move it offline after specified timeout in seconds (0 - disabled)]
@@ -59,6 +63,8 @@ Pozvat už&ivatele
 [Do you really want to remove it from ignore list?]
 
 ;file \protocols\ICQ-WIM\src\main.cpp
+[E-mail notification]
+
 [Ignore]
 Filtrování
 [Remove Ignore]
@@ -66,6 +72,15 @@ Filtrování
 ;file \protocols\ICQ-WIM\src\options.cpp
 [Network]
 Sítě
+[General]
+Obecné
+[Advanced]
+Extra
+;file \protocols\ICQ-WIM\src\poll.cpp
+[You received e-mail from %s: %s]
+
+[You have %d unread emails]
+
 ;file \protocols\ICQ-WIM\src\proto.cpp
 [%s server connection]
 %s - spojení se serverem
diff --git a/langpacks/czech/Plugins/Import.txt b/langpacks/czech/Plugins/Import.txt
index 26a79a96c1..7c1c1a05ae 100644
--- a/langpacks/czech/Plugins/Import.txt
+++ b/langpacks/czech/Plugins/Import.txt
@@ -111,8 +111,6 @@ Přeskakování kontaktu, účet %S nemůže být přiřazen.
 Přeskakování kontaktu, %S není nainstalován
 [Skipping non-IM contact (%S)]
 Přeskakování ne-IM kontaktu (%S)
-[Skipping %S contact, ID not found]
-Přeskakování %S kontaktu, nenalezeno ID
 [Skipping duplicate %S contact %s]
 Přeskakování duplicitního %S kontaktu %s
 [Failed to add %S contact %s]
diff --git a/langpacks/czech/Plugins/Jabber.txt b/langpacks/czech/Plugins/Jabber.txt
index 914ddf1a67..ab630ac0e9 100644
--- a/langpacks/czech/Plugins/Jabber.txt
+++ b/langpacks/czech/Plugins/Jabber.txt
@@ -326,6 +326,8 @@ Aktualizovat
 Identifikátor:
 [Node:]
 Uzel:
+[Filter:]
+Filtr:
 [Member Information]
 Členské informace
 [Role:]
@@ -392,24 +394,10 @@ Jabber aktivita
 [Jabber Mood]
 Jabber nálada
 ;file \protocols\JabberG\src\jabber_adhoc.cpp
-[Error %s %s]
-Chyba č.%s %s
-[Select Command]
-Vyberte příkaz
-[Not supported]
-Není podporováno
 [Done]
 Dokončeno
-[In progress. Please Wait...]
-Čekejte prosím...
 [Execute]
 Spustit
-[Requesting command list. Please wait...]
-Zjišťování seznamu příkazů. Počkejte prosím...
-[Jabber Ad-Hoc commands at %s]
-
-[Sending Ad-Hoc command to %s]
-
 ;file \protocols\JabberG\src\jabber_agent.cpp
 [Jabber Agent Registration]
 Jabber :: Registrace služby
@@ -544,32 +532,16 @@ Přihlížející
 Účastník
 [Moderator]
 Moderátor
-[Visitors]
-Přihlížející
-[Participants]
-Účastníci
-[Moderators]
-Moderátoři
 [Owners]
 Vlastníci
-[User %s is now banned.]
-Uživatel %d je nyní zablokován.
-[User %s changed status to %s with message: %s]
-Uživatel %s změnil status na %s se zprávou: %s
-[User %s changed status to %s]
-Uživatel %s změnil stav na %s
-[Room configuration was changed.]
-Nastavení místnosti bylo změněno.
-[Outcast]
-
-[Affiliation of %s was changed to '%s'.]
-Vztah uživatele %s byl změněn na '%s'.
+[Moderators]
+Moderátoři
+[Participants]
+Účastníci
+[Visitors]
+Přihlížející
 [Role of %s was changed to '%s'.]
 Role uživatele %s byla změněna na '%s'.
-[because room is now members-only]
-protože místnost je nyní pouze pro členy
-[user banned]
-uživatel zablokován
 [Change &nickname]
 Změ&nit přezdívku
 [&Invite a user]
@@ -668,10 +640,6 @@ Skutečné &JID: %s
 Pozvat uživatele do\n%s
 [%s (not on roster)]
 %s (není v seznamu)
-[%s from\n%s]
-%s z\n%s
-[Real JID not available]
-Skutečné JID není dostupné
 [Reason to kick %s]
 Důvod k vykopnutí %s
 [Reason to ban %s]
@@ -742,26 +710,6 @@ Zkopírovat JID
 Zkopírovat název uzlu
 [Copy node information]
 Zkopírovat informace o uzlu
-;file \protocols\JabberG\src\jabber_disco.h
-[Identities]
-Identity
-[category]
-kategorie
-[type]
-typ
-[Category]
-Kategorie
-[Type]
-Typ
-[Supported features]
-Podporované funkce
-[Info request error]
-
-[Items request error]
-
-;file \protocols\JabberG\src\jabber_filterlist.cpp
-[Set filter...]
-Filtrovat...
 ;file \protocols\JabberG\src\jabber_groupchat.cpp
 [Failed to retrieve room list from server.]
 
@@ -769,8 +717,6 @@ Filtrovat...
 
 [Room list request timed out.]
 
-[<no nick>]
-<bez přezdívky>
 [Loading...]
 Načítání...
 [Please wait for room list to download.]
@@ -781,8 +727,8 @@ Načítání...
 Záložky...
 [Change nickname in <%s>]
 
-[has set the subject to:]
-nastavil téma na:
+[Error]
+Chyba
 [Group chat invitation to\n%s]
 Příchozí pozvánka k diskusi v\n%s
 ;file \protocols\JabberG\src\jabber_icolib.cpp
@@ -877,8 +823,8 @@ Soukromí
 ;file \protocols\JabberG\src\jabber_iqid.cpp
 [Authentication failed for %s.]
 Chyba při ověřování %s.
-[Jabber Authentication]
-Jabber :: Ověření
+[Authentication]
+
 [Registration successful]
 Registrace proběhla úspěšně
 [Password is successfully changed. Don't forget to update your password in the Jabber protocol option.]
@@ -1469,18 +1415,6 @@ Změny funkce
 Změny stavu
 [Don't notify history messages]
 Neoznamovat staré zprávy
-[Group]
-Skupina
-[Subscription]
-Autorizace
-[Uploading...]
-Data->server...
-[Downloading...]
-Stahování...
-[XML for MS Excel (UTF-8 encoded)]
-
-[Connecting...]
-Navazování spojení...
 [Network]
 Sítě
 [Account]
@@ -1514,8 +1448,6 @@ Odnoklassniki
 [Some changes will take effect the next time you connect to the Jabber network.]
 Některé změny se projeví až při dalším připojení k síti Jabber.
 ;file \protocols\JabberG\src\jabber_password.cpp
-[Set New Password for %s@%S]
-Nové heslo pro %s@%S
 [New password does not match.]
 Zadaná hesla si neodpovídají.
 [Current password is incorrect.]
@@ -1543,6 +1475,46 @@ Výchozí seznam úspěšně přepnut
 
 [Allow]
 Povolit
+[List has no rules, empty lists will be deleted then changes applied]
+Zatím bez pravidel; prázdné seznamy budou vymazány a stav následně uložen.
+[allow ]
+povolit\s
+[deny ]
+zakázat\s
+[all.]
+vše
+[messages]
+zpráv
+[ and ]
+ a\s
+[incoming presences]
+příchozí stavy
+[outgoing presences]
+odchozí stavy
+[queries]
+Soukr. zprávy
+[Else ]
+Jinak\s
+[If Jabber ID is ']
+Pokud je jabber ID '
+[ (nickname: ]
+ (přezdívka:\s
+[If group is ']
+Pokud je skupina '
+[If subscription is ']
+Pokud je autorizace '
+[then ]
+potom\s
+[ (act., def.)]
+ (akt., vých.)
+[ (active)]
+ (aktivní)
+[ (default)]
+ (výchozí)
+[Ready.]
+Připraveno
+[Privacy lists are not saved, discard any changes and exit?]
+V seznamu jste udělali změny. Opravdu chcete editor ukončit?
 [Simple mode]
 Základní režim
 [Advanced mode]
@@ -1587,46 +1559,6 @@ Stav (příchozí)
 Stav (odchozí)
 [Query]
 Dotaz
-[List has no rules, empty lists will be deleted then changes applied]
-Zatím bez pravidel; prázdné seznamy budou vymazány a stav následně uložen.
-[allow ]
-povolit\s
-[deny ]
-zakázat\s
-[all.]
-vše
-[messages]
-zpráv
-[ and ]
- a\s
-[incoming presences]
-příchozí stavy
-[outgoing presences]
-odchozí stavy
-[queries]
-Soukr. zprávy
-[Else ]
-Jinak\s
-[If Jabber ID is ']
-Pokud je jabber ID '
-[ (nickname: ]
- (přezdívka:\s
-[If group is ']
-Pokud je skupina '
-[If subscription is ']
-Pokud je autorizace '
-[then ]
-potom\s
-[ (act., def.)]
- (akt., vých.)
-[ (active)]
- (aktivní)
-[ (default)]
- (výchozí)
-[Ready.]
-Připraveno
-[Privacy lists are not saved, discard any changes and exit?]
-V seznamu jste udělali změny. Opravdu chcete editor ukončit?
 [Please save list before activating]
 Nejprve prosím uložte vytvořený seznam.
 [First, save the list]
@@ -1650,80 +1582,22 @@ Editor...
 
 [No valid OMEMO session exists]
 
-;file \protocols\JabberG\src\jabber_rc.cpp
-[Command completed successfully]
-
-[Error occurred during processing command]
-Chyba při zpracování příkazu
-[Set status]
-Změnit stav
-[Set options]
-Změnit nastavení
-[Forward unread messages]
-Přeposlat nepřečtené zprávy
-[Leave group chats]
-
-[Lock workstation]
-Zamknout počítač
-[Quit Miranda NG]
-Ukončit program Miranda NG
-[Change Status]
-Změnit stav
-[Choose the status and status message]
-Vyberte požadovaný stav a zadejte zprávu
-[Status]
-Stavy
-[Extended away (Not available)]
-Nejsem tady
-[Invisible]
-Neviditelný
-[Offline]
-Offline
-[Priority]
-Priorita
-[Status message]
-Zpráva stavu
-[Change global status]
-Změnit globální statu
-[Set Options]
-Změnit nastavení
-[Set the desired options]
-Vyberte požadovanou možnost
-[Automatically Accept File Transfers]
-Automaticky přijímat soubory
-[Play sounds]
-Přehrát zvuky
-[Disable remote controlling (check twice what you are doing)]
-
-[There is no messages to forward]
-Počet přeposlaných zpráv: 0
-[Forward options]
-
-[%d message(s) to be forwarded]
-Počet zpráv k přeposlání: %d
-[Mark messages as read]
-
-[%d message(s) forwarded]
-Počet přeposlaných zpráv: %d
-[Workstation successfully locked]
-Počítač byl zamknut
-[Error %d occurred during workstation lock]
-Chyba č.%d při zamykání počítače
-[Confirmation needed]
-
-[Please confirm Miranda NG shutdown]
-Potvrďte prosím ukončení Mirandy
-[There is no group chats to leave]
-
-[Choose the group chats you want to leave]
+;file \protocols\JabberG\src\jabber_roster.cpp
+[Group]
+Skupina
+[Subscription]
+Autorizace
+[Uploading...]
+Data->server...
+[Downloading...]
+Stahování...
+[Connecting...]
+Navazování spojení...
+[XML for MS Excel (UTF-8 encoded)]
 
 ;file \protocols\JabberG\src\jabber_search.cpp
-[Error %s %s\r\nPlease select other server]
-Chyba: %s %s\r\nVyberte prosím jiný server.
 [Error: unknown reply received\r\nPlease select other server]
 Chyba: Neznámá odpověď\r\nVyberte prosím jiný server.
-[Error %s %s\r\nTry to specify more detailed]
-Chyba: %s %s\r\nZadejte přesnější údaje.
 [Search error]
 Chyba při vyhledávání
 [Select/type search service URL above and press <Go>]
@@ -1745,6 +1619,8 @@ ukončil komunikaci
 
 [sent unknown presence type]
 
+[Outcast]
+
 [Nick:]
 Přezdívka:
 [Status:]
@@ -1762,31 +1638,23 @@ Chyba: Nelze navázat spojení se serverem
 Chyba: Spojení nečekaně ukončeno
 [Requesting registration instruction...]
 Požadavek na instrukce k registraci...
-[Authentication failed for %s@%S.]
-
-[Message redirected from: %s\r\n%s]
+[Registration canceled]
 
 [Sending registration information...]
 Odesílání registračních údajů...
 ;file \protocols\JabberG\src\jabber_userinfo.cpp
-[Resource]
-Zdroj
 [<not specified>]
 <neurčeno>
+[Resource]
+Zdroj
 [Software]
 Software
 [Version]
 Verze
 [System]
 Systém
-[unknown]
-neznámý
-[Idle since]
-Nečinnost od
-[Client capabilities]
-Možnosti klientského softwaru
-[Software information]
-Informace o softwaru
+[Last activity]
+
 [Operating system]
 Operační systém
 [Operating system version]
@@ -1801,26 +1669,14 @@ Nálada
 Činnost
 [Tune]
 Hudba
-[both]
-oboje
-[to]
-do
-[from]
-od
-[none]
----
 [Last logoff time]
 Doba posledního odhlášení
 [Uptime]
 
 [Logoff message]
 Zpráva při odhlášení
-[<no information available>]
-<neuvedeno>
 [Last active resource]
 Naposledy aktivní umístění
-[Please switch online to see more details.]
-
 [Copy]
 Zkopírovat
 [Copy only this value]
@@ -1870,10 +1726,10 @@ Prozatím nefunguje
 
 [Unknown error]
 Neznámá chyba
-[Error]
-Chyba
 [Unknown error message]
 Neznámé chybové hlášení
+[Offline]
+Offline
 [Advanced Status]
 Pokročilý stav
 [Set mood...]
diff --git a/langpacks/czech/Plugins/LotusNotify.txt b/langpacks/czech/Plugins/LotusNotify.txt
index dd18171db6..8383f4db87 100644
--- a/langpacks/czech/Plugins/LotusNotify.txt
+++ b/langpacks/czech/Plugins/LotusNotify.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Notify about new mail in Lotus Database]
 
-;file \plugins\LotusNotify\res\LotusNotify.rc
+;file \protocols\LotusNotify\res\LotusNotify.rc
 [Lotus connection settings]
 
 [Primary server:]
@@ -66,7 +66,7 @@ Předmět
 
 [Offline status mean:]
 
-;file \plugins\LotusNotify\src\LotusNotify.cpp
+;file \protocols\LotusNotify\src\LotusNotify.cpp
 [Unable to load all required Lotus API functions]
 
 [Lotus Notes Client not detected. Check plugin configuration description at https://miranda-ng.org/p/LotusNotify]
diff --git a/langpacks/czech/Plugins/MSN.txt b/langpacks/czech/Plugins/MSN.txt
index f1fe22c255..aa5bce8998 100644
--- a/langpacks/czech/Plugins/MSN.txt
+++ b/langpacks/czech/Plugins/MSN.txt
@@ -132,8 +132,6 @@ Zobrazit &historii
 [&Deop user]
 
 ;file \protocols\MSN\src\msn_commands.cpp
-[%I64u bytes]
-%I64u bajtů
 [MSN Alert]
 Upozornění MSN
 ;file \protocols\MSN\src\msn_errors.cpp
diff --git a/langpacks/czech/Plugins/MenuEx.txt b/langpacks/czech/Plugins/MenuEx.txt
index 7d96babda9..3acada6188 100644
--- a/langpacks/czech/Plugins/MenuEx.txt
+++ b/langpacks/czech/Plugins/MenuEx.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MenuEx.dll
 ;  Plugin: Menu item ext
-;  Version: 1.3.1.0
+;  Version: 1.3.2.0
 ;  Authors: Heiko Schillinger, Baloo, Billy_Bons, Robert Pösel
 ;============================================================
 [Adds some useful options to a contacts menu.]
@@ -20,8 +20,6 @@ Skrýt
 Filtrování
 [Copy to Account (Ctrl+click for move to Account)]
 Zkopírovat do účtu (Ctrl+klik pro přesunutí do účtu)
-[Request Authorization]
-Požádat o autorizaci
 [Browse Received Files]
 Procházet přijatými soubory
 [Copy IP]
@@ -79,14 +77,8 @@ Uživatel online
 Autorizace
 [Typing Notify]
 Psaní zprávy
-[Please authorize me to add you to my contact list.]
-Prosím potvrďte můj požadavek o přidání vás do mého seznamu kontaktů.
-[Do you want to send authorization request\nto new contact?]
-Přejete si odeslat požadavek o autorizaci\nnového kontaktu?
 [Open ignore settings]
 Otevřít možnosti filtrování
-[Request authorization]
-Požádat o autorizaci
 [MenuItemEx]
 Rozšíření menu
 ;file \plugins\MenuItemEx\src\options.cpp
diff --git a/langpacks/czech/Plugins/MinecraftDynmap.txt b/langpacks/czech/Plugins/MinecraftDynmap.txt
index e2a14949be..211cdefadc 100644
--- a/langpacks/czech/Plugins/MinecraftDynmap.txt
+++ b/langpacks/czech/Plugins/MinecraftDynmap.txt
@@ -13,8 +13,6 @@ Server:
 [Visible name:]
 Viditelné jméno:
 ;file \protocols\MinecraftDynmap\src\chat.cpp
-[Server]
-Server
 [Admin]
 Admin
 [Normal]
diff --git a/langpacks/czech/Plugins/MirOTR.txt b/langpacks/czech/Plugins/MirOTR.txt
index 232d556761..0129b246ca 100644
--- a/langpacks/czech/Plugins/MirOTR.txt
+++ b/langpacks/czech/Plugins/MirOTR.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MirOTR.dll
 ;  Plugin: Miranda OTR
-;  Version: 0.14.1.17
+;  Version: 0.14.2.1
 ;  Authors: ProgAndy & CHEF-KOCH
 ;============================================================
 [OTR (Off-the-Record) plugin for Miranda NG (using some code and ideas from SecureIM, Pidgin-OTR and old Miranda OTR (by SJE)).]
@@ -80,6 +80,17 @@ Obnovit šifrovanou relaci (OTR)
 Zrušit šifrovanou relaci (OTR)
 [&Verify Fingerprint]
 Ověřit otisk
+;file \plugins\MirOTR\src\icons.cpp
+[OTR private]
+Privátní (OTR)
+[OTR unverified]
+Neověřeno (OTR)
+[OTR finished]
+Ukončeno (OTR)
+[OTR not secure]
+Nezabezpečeno (OTR)
+[Refresh]
+Aktualizovat
 ;file \plugins\MirOTR\src\language.h
 [Start OTR]
 Šifrovat spojení (OTR)
@@ -99,8 +110,6 @@ Stav šifrování (OTR) (klikněte pro více možností)
 Šifrování (OTR): Privátní
 [OTR Encryption: Finished]
 Šifrování (OTR): Ukončeno
-[&Convert HTML (for Pidgin)]
-&Konvertovat HTML (pro Pidgin)
 [OTR encrypted session with '%s' has been terminated]
 Šifrovaná relace (OTR) s '%s' byla ukončena
 [Requesting OTR encrypted session with '%s']
@@ -131,16 +140,6 @@ Ukončena šifrovaná relace (OTR) kontaktem '%s'. Měli byste udělat to samé!
 Šifrovaná relace (OTR) s '%s' nyní používá OVĚŘENÝ otisk
 [OTR encrypted session with '%s' is now using a NOT VERIFIED fingerprint]
 Šifrovaná relace (OTR) s '%s' nyní používá NEOVĚŘENÝ otisk
-[OTR unverified]
-Neověřeno (OTR)
-[OTR finished]
-Ukončeno (OTR)
-[OTR private]
-Privátní (OTR)
-[OTR not secure]
-Nezabezpečeno (OTR)
-[Refresh]
-Aktualizovat
 [Generating new private key for protocol '%s'.\nPlease Wait...]
 Generování nového privátního klíče pro protokol '%s'.\nProsím čekejte...
 [General]
@@ -236,6 +235,8 @@ Používáte SecureIM. MirOTR funguje pouze pro kontakty s vypnutým SecureIM
 Nabídka MirOTR
 [OTR Status]
 Stav šifrování (OTR)
+[&Convert HTML (for Pidgin)]
+&Konvertovat HTML (pro Pidgin)
 ;file \plugins\MirOTR\src\options.cpp
 [Private Data]
 Privátní data
diff --git a/langpacks/czech/Plugins/MirandaG15.txt b/langpacks/czech/Plugins/MirandaG15.txt
index 0a2055da56..c3601fc052 100644
--- a/langpacks/czech/Plugins/MirandaG15.txt
+++ b/langpacks/czech/Plugins/MirandaG15.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MirandaG15.dll
 ;  Plugin: MirandaG15
-;  Version: 0.1.2.0
+;  Version: 0.1.2.1
 ;  Authors: Martin Kleinhans
 ;============================================================
 [Provides an interface to use Miranda from the LCD of various Logitech devices.]
diff --git a/langpacks/czech/Plugins/MsgPopup.txt b/langpacks/czech/Plugins/MsgPopup.txt
index b5a7e23d10..a1180f9c66 100644
--- a/langpacks/czech/Plugins/MsgPopup.txt
+++ b/langpacks/czech/Plugins/MsgPopup.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MsgPopup.dll
 ;  Plugin: Message popup
-;  Version: 0.1.2.1
+;  Version: 0.1.2.2
 ;  Authors: StDenis
 ;============================================================
 [Plugin replaces message boxes (those having only OK button) with popups.]
diff --git a/langpacks/czech/Plugins/NewsAggregator.txt b/langpacks/czech/Plugins/NewsAggregator.txt
index 8de1c4fb41..9e2e6a1bf9 100644
--- a/langpacks/czech/Plugins/NewsAggregator.txt
+++ b/langpacks/czech/Plugins/NewsAggregator.txt
@@ -2,12 +2,12 @@
 ;============================================================
 ;  File: NewsAggregator.dll
 ;  Plugin: News aggregator
-;  Version: 0.1.0.4
+;  Version: 0.1.0.5
 ;  Authors: Mataes, FREAK_THEMIGHTY
 ;============================================================
 [RSS/Atom news aggregator.]
 Čtečka novinek RSS/Atom.
-;file \plugins\NewsAggregator\Res\Resource.rc
+;file \protocols\NewsAggregator\Res\Resource.rc
 [Add]
 Přidat
 [Change]
@@ -72,14 +72,14 @@ Importovat z:
 Zdroje k importu:
 [&Import]
 &Importovat
-;file \plugins\NewsAggregator\Src\Authentication.cpp
+;file \protocols\NewsAggregator\Src\Authentication.cpp
 [Enter your username]
 Zadejte vaše uživ. jméno
 [Error]
 Chyba
 [Enter your password]
 Zadejte vaše heslo
-;file \plugins\NewsAggregator\Src\CheckFeed.cpp
+;file \protocols\NewsAggregator\Src\CheckFeed.cpp
 [%s\nis a valid feed's address.]
 %s\nje platná adresa zdroje.
 [News Aggregator]
@@ -88,7 +88,7 @@ Zadejte vaše heslo
 %s\nnení platná adresa zdroje.
 [empty]
 prázdné
-;file \plugins\NewsAggregator\Src\Icons.cpp
+;file \protocols\NewsAggregator\Src\Icons.cpp
 [Protocol icon]
 Ikona protokolu
 [Check All Feeds]
@@ -103,13 +103,13 @@ Exportovat zdroje
 Deaktivovat automatickou aktualizaci
 [Auto Update Disabled]
 Aktivovat automatickou aktualizaci
-;file \plugins\NewsAggregator\Src\Menus.cpp
+;file \protocols\NewsAggregator\Src\Menus.cpp
 [Check feed]
 Zkont. zdroj
 [Change feed]
 Změnit zdroj
-;file \plugins\NewsAggregator\Src\NewsAggregator.cpp
-;file \plugins\NewsAggregator\Src\Options.cpp
+;file \protocols\NewsAggregator\Src\NewsAggregator.cpp
+;file \protocols\NewsAggregator\Src\Options.cpp
 [OPML files]
 
 [Not valid import file.]
@@ -154,11 +154,11 @@ Zdroj
 
 [Network]
 Sítě
-;file \plugins\NewsAggregator\Src\Services.cpp
+;file \protocols\NewsAggregator\Src\Services.cpp
 [Avatars]
 Avatary
 [Enable/disable auto update]
 Povolit/zakázat automatickou aktualizaci
-;file \plugins\NewsAggregator\Src\Utils.cpp
+;file \protocols\NewsAggregator\Src\Utils.cpp
 [NewsAggregator HTTP connections]
 NewsAggregator - spojení pomocí protokolu HTTP
diff --git a/langpacks/czech/Plugins/NimContact.txt b/langpacks/czech/Plugins/NimContact.txt
index 98a5d17cc9..022480bfd0 100644
--- a/langpacks/czech/Plugins/NimContact.txt
+++ b/langpacks/czech/Plugins/NimContact.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Non-IM Contact allows you to add 'contacts' that can act as shortcuts to other programs, or links to web pages.\r\nThe contacts name can be read from a text file (includes any ASCII file).\r\nThis plugin is a combination of Favorites and Text Reader plugins both made by me)]
 
-;file \plugins\Non-IM Contact\res\resource.rc
+;file \protocols\Non-IM Contact\res\resource.rc
 [View/Edit Files]
 
 [Add File]
@@ -108,7 +108,7 @@ Nápověda
 
 [EXAMPLE: %fn1,%fn2]
 
-;file \plugins\Non-IM Contact\src\contactinfo.cpp
+;file \protocols\Non-IM Contact\src\contactinfo.cpp
 [Select Folder]
 Vyberte požadovanou složku
 [Non-IM Contact protocol timer is Disabled]
@@ -117,7 +117,7 @@ Vyberte požadovanou složku
 
 [New Non-IM Contact]
 
-;file \plugins\Non-IM Contact\src\dialog.cpp
+;file \protocols\Non-IM Contact\src\dialog.cpp
 [String replacing variables...\r\nThe following are all the valid variables that can be used. Refer to the wiki.miranda-ng.org for a proper explanation.\r\n\r\nfile(X)\t\t<- specifies the file to read from. MUST be followed by either start() or end() or wholeline()\r\nfilename(X)\t<- copies the filename of file X.\r\nstart(...)\t\t<- specifies where to start copying from.\r\nend(...)\t\t<- specifies where to stop copying.\r\nwholeline(line(...))\t<- specifies a whole line to copy\r\n\r\nstart() and end() explained\r\n.........................\r\nMUST start with line() followed by a number or a string inside " marks, OR csv(separatorX) variable. The number specifies which character in the line to start/end copying. The string specifies a string in the line to start/end copying.\r\n\r\ncsv(seperatorX) explained...\r\nSeperator is either "tab" or "space" or any SINGLE character. X is the Xth separator to pass before copying, (or to stop before).\r\n\r\nLastly the line(...) variable...\r\nInside the brackets must be either a number (to specify the line number), or a string inside " marks (to use the line with that string), or lastline(X). The X in lastline is the Xth line above the last line, i.e., lastline(1) will use the 2nd last line of the file. If searching for a line with "some words" you may put a + or - X after the closing ), i.e., line("some words")+3 to go 3 lines after the line with "some words".\r\n\r\nSome examples...\r\nfilename(0)    <- will display the filename of the 0th file\r\nfile(0)wholeline(line(0)))    <- will display the whole first line of the 0th file\r\nfile(0)wholeline(line("hello")-1)))    <- the wholeline above the first occurrence of "hello" in the file\r\nfile(0)start(line(lastline(1))csv(tab2))end(line(lastline())csv(tab4)))    <- starts at the 2nd last line of the file, from the 2nd tab variable, until the 4th tab variable in the last line (in the 0th file)\r\nfile(0)start(line("hello")+1"zzzz")end(line(6)17))    <- starts from the first occurrence of zzzz in the line after the first occurrence of hello, until the 17th character in the 6th line (starting from line 0) of the 0th file.\r\n]
 
 [Contacts Display Info]
@@ -130,7 +130,7 @@ Vyberte požadovanou složku
 Soubory
 [Edit Non-IM Contact "%s"]
 
-;file \plugins\Non-IM Contact\src\files.cpp
+;file \protocols\Non-IM Contact\src\files.cpp
 [Do you want to overwrite the contents of the file?\r\n\r\nPressing No will append these contacts to the end of the file.]
 
 [File couldn't be opened]
@@ -139,10 +139,10 @@ Soubory
 
 [line(%-3d) = | %s]
 
-;file \plugins\Non-IM Contact\src\http.cpp
+;file \protocols\Non-IM Contact\src\http.cpp
 [Non-IM Contacts]
 
-;file \plugins\Non-IM Contact\src\main.cpp
+;file \protocols\Non-IM Contact\src\main.cpp
 [Plugins]
 Doplňky
 [Main Icon]
@@ -163,7 +163,7 @@ Hlavní ikona
 
 [E&dit Contact Settings]
 
-;file \plugins\Non-IM Contact\src\namereplacing.cpp
+;file \protocols\Non-IM Contact\src\namereplacing.cpp
 [%s - ERROR: no line specified or line not found (in %s)]
 
 [%s - ERROR: file couldn't be opened (in %s)]
diff --git a/langpacks/czech/Plugins/NotesReminders.txt b/langpacks/czech/Plugins/NotesReminders.txt
index 0e34878b70..3212ca2984 100644
--- a/langpacks/czech/Plugins/NotesReminders.txt
+++ b/langpacks/czech/Plugins/NotesReminders.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: NotesReminders.dll
 ;  Plugin: Sticky Notes & Reminders
-;  Version: 0.1.0.1
+;  Version: 0.2.0.2
 ;  Authors: Joe Kucera, Lubomir Kolev Ivanov, Georg Fischer
 ;============================================================
 [Sticky Notes & Reminders Implementation for Miranda NG.]
@@ -50,12 +50,12 @@ Obnovit výchozí
 
 [Add Reminder]
 Přidat připomínku
-[Trigger On Time && Date:]
-Da&tum a čas vyvolání
 [Date]
 Datum
 [Time]
 Čas
+[Repeat each day]
+
 [Reminder Note:]
 Obsah připomínky
 [None]
@@ -102,8 +102,6 @@ Přidat novou
 
 [D&elete All Reminders]
 
-[Context Menu Note Popup]
-
 [&Hide Note]
 
 [&Always On Top]
@@ -152,9 +150,6 @@ Vyjmou&t
 
 [&Show / Hide Notes]
 Zobrazit/skrýt poznám&ky
-;file \plugins\NotesAndReminders\src\globals.h
-[Notes & Reminders]
-Poznámky a připomínky
 ;file \plugins\NotesAndReminders\src\hotkeys.cpp
 [New Note]
 
@@ -165,10 +160,6 @@ Poznámky a připomínky
 [New Reminder]
 
 ;file \plugins\NotesAndReminders\src\main.cpp
-[Are you sure you want to delete all notes?]
-
-[Are you sure you want to delete all reminders?]
-
 [Delete All Notes]
 
 [Show/Hide Notes]
@@ -195,20 +186,10 @@ Smazat všechny
 
 [Sticky Notes]
 Poznámky na ploše
-[Plugins]
-Doplňky
 [Add New Note]
 Přidat novou poznámku
 [Add New Reminder]
 Přidat novou připomínku
-[Alerts]
-Upozornění
-[Reminder triggered]
-
-[Reminder triggered (Alternative 1)]
-
-[Reminder triggered (Alternative 2)]
-
 [Notes && Reminders]
 Poznámky &a připomínky
 [New &Note]
@@ -221,6 +202,14 @@ S&mazat všechny poznámky
 
 [Miranda could not load the Notes & Reminders plugin, Msftedit.dll is missing. If you are using WINE, please make sure you have Msftedit.dll installed. Press 'Yes' to continue loading Miranda.]
 
+[Alerts]
+Upozornění
+[Reminder triggered]
+
+[Reminder triggered (Alternative 1)]
+
+[Reminder triggered (Alternative 2)]
+
 ;file \plugins\NotesAndReminders\src\notes.cpp
 [Black]
 Černá
@@ -268,6 +257,8 @@ Poznámky
 Pozn. text
 [Date/Title]
 
+[Are you sure you want to delete all notes?]
+
 ;file \plugins\NotesAndReminders\src\options.cpp
 [Sticky Note Caption]
 
@@ -279,11 +270,17 @@ Pozn. text
 
 [Select Executable]
 
+[Plugins]
+Doplňky
 ;file \plugins\NotesAndReminders\src\reminders.cpp
 [Minutes]
 minut
 [Hours]
 hodin
+[The specified time is invalid due to begin of daylight saving (summer time).]
+
+[The specified time is invalid.]
+
 [Hour]
 hodina
 [Day]
@@ -292,10 +289,6 @@ den
 dnů
 [Week]
 týden
-[The specified time is invalid due to begin of daylight saving (summer time).]
-
-[The specified time is invalid.]
-
 [The specified time offset is invalid.]
 
 [&Update Reminder]
@@ -316,5 +309,10 @@ Výchozí
 Obsah připomínky
 [Date of activation]
 Datum vyvolání
+[Are you sure you want to delete all reminders?]
+
 [Are you sure you want to delete this reminder?]
 
+;file \plugins\NotesAndReminders\src\stdafx.h
+[Notes & Reminders]
+Poznámky a připomínky
diff --git a/langpacks/czech/Plugins/PasteIt.txt b/langpacks/czech/Plugins/PasteIt.txt
index 4ef549c64e..e8944c8ab9 100644
--- a/langpacks/czech/Plugins/PasteIt.txt
+++ b/langpacks/czech/Plugins/PasteIt.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: PasteIt.dll
 ;  Plugin: Paste it
-;  Version: 1.0.0.3
+;  Version: 1.0.0.4
 ;  Authors: Krzysztof Kral
 ;============================================================
 [Uploads the text to web page and sends the URL to your friends.]
@@ -142,11 +142,11 @@ Opravdu chcete pokračovat?
 [File '%s' is empty]
 
 ;file \plugins\PasteIt\src\PasteToWeb1.cpp
-[Error during sending text to web page: %s]
+[Error during sending text to web page: %S]
 
 [Error during sending text to web page]
 
-[Error during getting user key from web page: %s]
+[Error during getting user key from web page: %S]
 
 [Paste expire date]
 
diff --git a/langpacks/czech/Plugins/PluginUpdater.txt b/langpacks/czech/Plugins/PluginUpdater.txt
index b708ace711..1e26202115 100644
--- a/langpacks/czech/Plugins/PluginUpdater.txt
+++ b/langpacks/czech/Plugins/PluginUpdater.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: PluginUpdater.dll
 ;  Plugin: Plugin updater
-;  Version: 0.2.0.2
+;  Version: 0.2.0.3
 ;  Authors: Mataes, George Hazan
 ;============================================================
 [Installs and updates plugins and other Miranda NG components.]
diff --git a/langpacks/czech/Plugins/PopupPlus.txt b/langpacks/czech/Plugins/PopupPlus.txt
index 61044bd27b..1ef3d4f9e5 100644
--- a/langpacks/czech/Plugins/PopupPlus.txt
+++ b/langpacks/czech/Plugins/PopupPlus.txt
@@ -1,6 +1,6 @@
 #muuid {26a9125d-7863-4e01-af0e-d14ef95c5054}
 ;============================================================
-;  File: Popup.dll
+;  File: PopupPlus.dll
 ;  Plugin: Popup plus
 ;  Version: 2.1.1.15
 ;  Authors: MPK, Merlin_de (Luca Santarelli, Victor Pavlychko)
@@ -82,7 +82,7 @@ Možnosti skinu
 Náhled
 [Download more skins]
 Stáhnout další skiny
-[Popup History]
+[Popup history]
 Historie oznámení
 [Desktop]
 Plocha
@@ -263,15 +263,11 @@ Podtržení záhlaví
 [Avatar border]
 Orámovat avatary
 ;file \plugins\Popup\src\history.cpp
-[Popup History is disabled]
+[Popup history is disabled]
 Historie oznámení je vypnuta
-[Popup History message]
+[Popup history message]
 Zpráva historie oznámení
 ;file \plugins\Popup\src\icons.cpp
-[Popups are enabled]
-Oznámení jsou zapnuta
-[Popups are disabled]
-Oznámení jsou vypnuta
 [With "favorite" overlay]
 Překrytí pro oblíbené
 [With "fullscreen" overlay]
@@ -309,13 +305,13 @@ Akce
 Kontakty
 [Advanced]
 Extra
-[Toggle Popups]
+[Toggle popups]
 Zapnout/vypnout oznámení
-[Enable Popups]
+[Enable popups]
 Povolit oznámení
-[Disable Popups]
+[Disable popups]
 Vypnout oznámení
-[Popup Plus]
+[Popup plus]
 Oznámení plus
 [Error: I could not register the Popup Window class.\r\nThe plugin will not operate.]
 Chyba: Nelze zaregistrovat třídu Popup Window.\r\nDoplněk nebude fungovat.
diff --git a/langpacks/czech/Plugins/SkypeWeb.txt b/langpacks/czech/Plugins/SkypeWeb.txt
index 52cef8539b..7fdedb4d80 100644
--- a/langpacks/czech/Plugins/SkypeWeb.txt
+++ b/langpacks/czech/Plugins/SkypeWeb.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: SkypeWeb.dll
 ;  Plugin: Skype protocol (Web)
-;  Version: 0.12.3.1
+;  Version: 0.12.3.3
 ;  Authors: Miranda NG team
 ;============================================================
 [Skype protocol support for Miranda NG. Based on new Skype for Web.]
diff --git a/langpacks/czech/Plugins/SmileyAdd.txt b/langpacks/czech/Plugins/SmileyAdd.txt
index 6c155cafa2..f839381bc6 100644
--- a/langpacks/czech/Plugins/SmileyAdd.txt
+++ b/langpacks/czech/Plugins/SmileyAdd.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: SmileyAdd.dll
 ;  Plugin: SmileyAdd
-;  Version: 0.3.1.0
+;  Version: 0.3.1.1
 ;  Authors: Peacow, nightwish, bid, borkra
 ;============================================================
 [Smiley support for Miranda NG.]
diff --git a/langpacks/czech/Plugins/StatusManager.txt b/langpacks/czech/Plugins/StatusManager.txt
index 46dda2e1d7..766fff2096 100644
--- a/langpacks/czech/Plugins/StatusManager.txt
+++ b/langpacks/czech/Plugins/StatusManager.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: StatusManager.dll
 ;  Plugin: Status manager
-;  Version: 1.2.0.4
+;  Version: 1.2.0.5
 ;  Authors: P Boon
 ;============================================================
 [A connection checker and auto away module. Also allows you to define the status Miranda should set on startup, configurable per protocol.]
diff --git a/langpacks/czech/Plugins/TabSRMM.txt b/langpacks/czech/Plugins/TabSRMM.txt
index d2deceaa3c..39aef8713c 100644
--- a/langpacks/czech/Plugins/TabSRMM.txt
+++ b/langpacks/czech/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: TabSRMM.dll
 ;  Plugin: TabSRMM
-;  Version: 3.5.0.12
+;  Version: 3.5.0.13
 ;  Authors: The Miranda developers team and contributors
 ;============================================================
 [IM and group chat module for Miranda NG.]
@@ -178,8 +178,6 @@ Skupinové rozhovory
 Chyby
 [Use the message log color theme for group chat popups]
 Použít barevné schéma záznamu komunikace pro skupinový chat
-[No compatible popup plugin was found. The event notification\nsystem is not available.]
-Nebyl nalezen žádný podporovaný popup plugin. Oznámení událostí\nnení dostupné.
 [Dialog]
 Dialog
 [Cancel]
@@ -1697,10 +1695,6 @@ Symbol hodin (pro hodiny informačního panelu)
 Funkce zakázána (použito jako překrytí)
 [Feature enabled (used as overlay)]
 Funkce povolena (použito jako překrytí)
-[Enable typing notification]
-
-[Disable typing notification]
-
 ;file \plugins\TabSRMM\src\msgs.h
 [Message windows - IM]
 Komunikační okna - klasické rozhovory
@@ -1984,10 +1978,10 @@ Přidávat offline kontakty do seznamu více příjemců
 Vypnout &upozornění na psaní
 [Enable &typing notification]
 Zapnout &upozornění na psaní
-[...is typing a message.]
-... píše zprávu.
 [...has stopped typing.]
 ... dopsal zprávu.
+[...is typing a message.]
+... píše zprávu.
 [Contact started typing]
 Kontakt začal psát
 [Contact stopped typing]
diff --git a/langpacks/czech/Plugins/UInfoEx.txt b/langpacks/czech/Plugins/UInfoEx.txt
index 31385eee82..88017c23d5 100644
--- a/langpacks/czech/Plugins/UInfoEx.txt
+++ b/langpacks/czech/Plugins/UInfoEx.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: UInfoEx.dll
 ;  Plugin: User info ext
-;  Version: 0.8.5.1
+;  Version: 0.8.5.2
 ;  Authors: DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
 ;============================================================
 [Extended UserInfo module for Miranda NG. Provides interface to edit all contact information.]
@@ -1110,12 +1110,10 @@ Telefon (UInfoEx)
 \[b]%s (%S)...[/b]\n%d kontaktů zbývá
 [Abort Refreshing Contact Details]
 Přerušit proces občerstvování detailů
-[Do you want to cancel the current refresh procedure?]
-Chcete přerušit probíhající proceduru občerstvování?
 [Miranda must be online for refreshing contact information!]
 Pro občerstvení detailů kontaktů je potřeba být online!
-[The function caused an exception!]
-Tato akce způsobila výjimku!
+[Do you want to cancel the current refresh procedure?]
+Chcete přerušit probíhající proceduru občerstvování?
 ;file \plugins\UserInfoEx\src\svc_reminder.cpp
 [%s has %s today.]
 %s má dnes %s.
@@ -1216,16 +1214,8 @@ Importovat detaily uživatele z VCard
 ;file \plugins\UserInfoEx\src\ex_import\svc_ExImXML.cpp
 [Can't create xml file!\n%S]
 Nelze vytvořit xml soubor!\n%S
-[Export took %f ms]
-Export zabral %f ms
 [Contact: %s (%S)]
 Kontakt: %s (%S)
-[Importing %s caused error %d]
-Import %s způsobil chybu %d
-[Loading contact %s from xml failed with error %d]
-Načítání kontaktu %s z XML skončilo chybou %d
-[Importing Owner caused error %d]
-Import Vlastníka způsobil chybu %d
 [Parser is unable to load XMLCard "%s"\nError: %d\nDescription: %s]
 Parser nemůže načíst XMLCard "%s"\nChyba: %d\nPopis: %s
 [The selected file is no valid XMLCard]
@@ -1238,12 +1228,8 @@ Dokončeno
 Kontakt vlastníka byl úspěšně naimportován.
 [Selected XMLCard does not contain an owner contact!]
 Vybraný XMLCard neobsahuje kontakt vlastníka
-[Import took %f ms]
-Import zabral %f ms
 [added contacts: %u / %u\nadded settings: %u / %u\nadded events %u / %u\nduplicated events: %u]
 přidané kontakty: %u / %u\npřidaná nastavení: %u / %u\npřidané události %u / %u\nzdvojené události: %u
-[FATAL: An exception was thrown while importing contacts from xmlCard!]
-CHYBA: vznikla výjimka při importu kontaktů z XMLCard!
 ;file \plugins\UserInfoEx\src\Flags\svc_flags.cpp
 [Flags (UInfoEx)]
 Vlajky (UInfoEx)
diff --git a/langpacks/czech/Plugins/VKontakte.txt b/langpacks/czech/Plugins/VKontakte.txt
index e1f30b7d0e..209d0d5d61 100644
--- a/langpacks/czech/Plugins/VKontakte.txt
+++ b/langpacks/czech/Plugins/VKontakte.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: VKontakte.dll
 ;  Plugin: VKontakte protocol
-;  Version: 0.1.8.1
+;  Version: 0.1.9.0
 ;  Authors: Miranda NG team
 ;============================================================
 [VKontakte protocol support for Miranda NG.]
diff --git a/langpacks/czech/Plugins/Weather.txt b/langpacks/czech/Plugins/Weather.txt
index f7b5e93947..96dabe0a37 100644
--- a/langpacks/czech/Plugins/Weather.txt
+++ b/langpacks/czech/Plugins/Weather.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Retrieves weather information and displays it in your contact list.]
 Přijímá informace o počasí a zobrazuje je ve vašem seznamu kontaktů.
-;file \plugins\Weather\res\resource.rc
+;file \protocols\Weather\res\resource.rc
 [Update]
 Aktualizovat
 [Brief Info]
@@ -254,7 +254,7 @@ Zobrazit informaci o osobě
 Předchozí nastavení
 [To default]
 Výchozí nastavení
-;file \plugins\Weather\src\stdafx.h
+;file \protocols\Weather\src\stdafx.h
 [N/A]
 <neuvedeno>
 [Invalid ID format, missing "/" (10)]
@@ -337,7 +337,7 @@ Seznam ostatních proměnných, které jsou k dispozici:
 Není zadána adresa pro kompletní předpověď počasí. Z menu vyberte položku 'Upravit nastavení' a v sekci Odkazy doplňte příslušný údaj.
 [The URL for weather map has not been set. You can set it from the Edit Settings dialog.]
 Není zadána adresa pro mapu počasí. Z menu vyberte položku 'Upravit nastavení' a v sekci Odkazy doplňte příslušný údaj.
-;file \plugins\Weather\src\weather.cpp
+;file \protocols\Weather\src\weather.cpp
 [Enable/disable auto update]
 Povolit/zakázat automatickou aktualizaci
 [Auto Update Enabled]
@@ -348,7 +348,7 @@ Povolit automatickou aktualizaci
 Změna počasí
 [Alert Issued]
 Varování
-;file \plugins\Weather\src\weather_addstn.cpp
+;file \protocols\Weather\src\weather_addstn.cpp
 [Current weather information for %s.]
 Aktuální informace o počasí pro %s.
 [%s is now the default weather station]
@@ -361,7 +361,7 @@ Prosím zkuste znovu po aktualizaci předpovědi počasí.
 <zde zadejte název stanice>
 [<Enter station ID here>]
 <zde zadejte identifikátor stanice>
-;file \plugins\Weather\src\weather_contacts.cpp
+;file \protocols\Weather\src\weather_contacts.cpp
 [Weather condition was not logged.]
 Předpověď počasí nebyla zaznamenána.
 [Get city name from ID]
@@ -378,7 +378,7 @@ Obnovit výchozí
 Textové soubory
 [All Files]
 Všechny soubory
-;file \plugins\Weather\src\weather_conv.cpp
+;file \protocols\Weather\src\weather_conv.cpp
 [mb]
 mb
 [in]
@@ -391,15 +391,15 @@ mm
 <chyba>
 [HTTP Error %i]
 HTTP chyba %i
-;file \plugins\Weather\src\weather_data.cpp
+;file \protocols\Weather\src\weather_data.cpp
 [<Enter city name here>]
 <zde zadejte město>
 [Error when obtaining data: %s]
 Chyba při stahování dat: %s
-;file \plugins\Weather\src\weather_http.cpp
+;file \protocols\Weather\src\weather_http.cpp
 [Weather HTTP connections]
 Weather - spojení pomocí protokolu HTTP
-;file \plugins\Weather\src\weather_icons.cpp
+;file \protocols\Weather\src\weather_icons.cpp
 [Protocol icon]
 Ikona protokolu
 [Update Disabled]
@@ -420,7 +420,7 @@ Oznámení
 Oznámení vypnuto
 [Edit Settings]
 Upravit nastavení...
-;file \plugins\Weather\src\weather_info.cpp
+;file \protocols\Weather\src\weather_info.cpp
 [Name]
 Jméno
 [Author]
@@ -459,21 +459,21 @@ Alokováno paměti:
 bajtů
 [Description:]
 Popis:
-;file \plugins\Weather\src\weather_ini.cpp
+;file \protocols\Weather\src\weather_ini.cpp
 [All update data has been reloaded.]
 Aktualizovaná data byla znovu načtena.
 [Invalid ini format for: %s]
 Neplatný formát souboru ini: %s
 [No update data file is found. Please check your Plugins\\Weather directory.]
 Nelze najít konfigurační soubor. Podívejte se do složky Plugins\\Weather.
-;file \plugins\Weather\src\weather_mwin.cpp
+;file \protocols\Weather\src\weather_mwin.cpp
 [Frame Font]
 Písmo v rámečku
 [Frame Title Font]
 Písmo v záhlaví rámečku
 [Frame Background]
 Barva pozadí rámečku
-;file \plugins\Weather\src\weather_opt.cpp
+;file \protocols\Weather\src\weather_opt.cpp
 [Weather Protocol Text Preview]
 Počasí - náhled
 [Network]
@@ -484,8 +484,8 @@ Obecné
 Zobrazení
 [Popups]
 Oznámení
-;file \plugins\Weather\src\weather_popup.cpp
-;file \plugins\Weather\src\weather_svcs.cpp
+;file \protocols\Weather\src\weather_popup.cpp
+;file \protocols\Weather\src\weather_svcs.cpp
 [Station ID]
 Identifikátor
 [Disable &weather notification]
@@ -512,10 +512,10 @@ Aktualizovat vše včetně cache
 Předpověď počasí
 [Display in a frame]
 Zobrazit v rámečku
-;file \plugins\Weather\src\weather_update.cpp
+;file \protocols\Weather\src\weather_update.cpp
 [Unable to retrieve weather information for %s]
 Nelze stáhnout předpověď počasí pro %s
-;file \plugins\Weather\src\weather_userinfo.cpp
+;file \protocols\Weather\src\weather_userinfo.cpp
 [Variable]
 Proměnná
 [Information]
diff --git a/langpacks/czech/Plugins/WebView.txt b/langpacks/czech/Plugins/WebView.txt
index 08a5066e7d..5f86b297d7 100644
--- a/langpacks/czech/Plugins/WebView.txt
+++ b/langpacks/czech/Plugins/WebView.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Adds web pages as contacts to your contact list and can display text and/or issue change alerts from those pages in a window.]
 
-;file \plugins\WebView\res\webview.rc
+;file \protocols\WebView\res\webview.rc
 [Webview]
 
 [Update data every]
@@ -180,7 +180,7 @@ Zko&pírovat vše
 &Vybrat vše
 [C&lear all]
 S&mazat vše
-;file \plugins\WebView\src\main.cpp
+;file \protocols\WebView\src\main.cpp
 [Alert event]
 
 [Auto update disabled]
@@ -207,14 +207,14 @@ Možnosti
 
 [Stop data processing]
 
-;file \plugins\WebView\src\webview.cpp
+;file \protocols\WebView\src\webview.cpp
 [All Webview sites have been updated.]
 
 [Network]
 Sítě
 [Popups]
 Oznámení
-;file \plugins\WebView\src\webview_alerts.cpp
+;file \protocols\WebView\src\webview_alerts.cpp
 [Cannot write to file]
 Nelze zapsat do souboru
 [Last updated on]
@@ -245,7 +245,7 @@ Nelze zapsat do souboru
 
 [Loaded from cache]
 
-;file \plugins\WebView\src\webview_datawnd.cpp
+;file \protocols\WebView\src\webview_datawnd.cpp
 [ERROR: You have two or more Webview contacts with the same URL and contact name.]
 
 [Alert options]
@@ -258,7 +258,7 @@ Nelze zapsat do souboru
 
 [Disable stick to the front]
 
-;file \plugins\WebView\src\webview_getdata.cpp
+;file \protocols\WebView\src\webview_getdata.cpp
 [URL not supplied]
 
 [Download in progress, please wait...]
@@ -305,7 +305,7 @@ Online
 
 [Alert test conditions not met; press the refresh button to view content.]
 
-;file \plugins\WebView\src\webview_opts.cpp
+;file \protocols\WebView\src\webview_opts.cpp
 [No whitespace removal]
 
 [Minimal level of whitespace removal]
@@ -342,7 +342,7 @@ Dopl. PopUp
 
 [Invalid symbol present in contact name.]
 
-;file \plugins\WebView\src\webview_services.cpp
+;file \protocols\WebView\src\webview_services.cpp
 [Cache folder does not exist.]
 
 [Missing "psite.bat" file.]
diff --git a/langpacks/czech/Plugins/WhoUsesMyFiles.txt b/langpacks/czech/Plugins/WhoUsesMyFiles.txt
index 7799859527..fd0899d90a 100644
--- a/langpacks/czech/Plugins/WhoUsesMyFiles.txt
+++ b/langpacks/czech/Plugins/WhoUsesMyFiles.txt
@@ -55,12 +55,10 @@ Použít výchozí barvy
 [Show current connections]
 
 ;file \plugins\WhoUsesMyFiles\src\options.cpp
-[Popup plugin not found!]
+[Common Dialog Error 0x%lx]
 
 [Error]
 Chyba
-[Common Dialog Error 0x%lx]
-
 [Not implemented yet...]
 
 [Who uses my files]
diff --git a/langpacks/czech/Plugins/YAMN.txt b/langpacks/czech/Plugins/YAMN.txt
index fd8c958309..d80da9de60 100644
--- a/langpacks/czech/Plugins/YAMN.txt
+++ b/langpacks/czech/Plugins/YAMN.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Mail notifier and browser for Miranda NG. Included POP3 protocol.]
 
-;file \plugins\YAMN\res\YAMN.rc
+;file \protocols\YAMN\res\YAMN.rc
 [Installed plugins]
 Nainstalované doplňky
 [Version:]
@@ -156,7 +156,7 @@ Náhled
 Barva pozadí
 [Text color]
 Barva textu
-;file \plugins\YAMN\src\main.cpp
+;file \protocols\YAMN\src\main.cpp
 [Check &mail (All Account)]
 Vybrat &poštu ze všech účtů
 [Check &mail (This Account)]
@@ -171,17 +171,17 @@ YAMN
 Vybrat poštu
 [Connect Fail]
 Chyba při připojování
-;file \plugins\YAMN\src\main.h
+;file \protocols\YAMN\src\main.h
 [New mail message]
 
 [Connect failed]
 Chyba připojení
-;file \plugins\YAMN\src\services.cpp
+;file \protocols\YAMN\src\services.cpp
 [Nick]
 Přezdívka
 [No new mail message]
 
-;file \plugins\YAMN\src\browser\badconnect.cpp
+;file \protocols\YAMN\src\browser\badconnect.cpp
 [%s - connection error]
 
 [An error occurred. Error code: %d]
@@ -190,7 +190,7 @@ Přezdívka
 Neznámá chyba
 [ - connection error]
  - chyba připojení
-;file \plugins\YAMN\src\browser\mailbrowser.cpp
+;file \protocols\YAMN\src\browser\mailbrowser.cpp
 [%s - %d new mail messages, %d total]
 
 [%s : %d new mail message(s), %d total]
@@ -229,15 +229,15 @@ Datum
 Počet vybraných zpráv: %d. Opravdu je chcete smazat?
 [Delete confirmation]
 Potvrzení smazání
-;file \plugins\YAMN\src\mails\mime.cpp
+;file \protocols\YAMN\src\mails\mime.cpp
 [Translate header error]
 
 [Part]
 
-;file \plugins\YAMN\src\proto\netlib.cpp
+;file \protocols\YAMN\src\proto\netlib.cpp
 [%s connection]
 %s - spojení se serverem
-;file \plugins\YAMN\src\proto\pop3\pop3comm.cpp
+;file \protocols\YAMN\src\proto\pop3\pop3comm.cpp
 [Disconnected]
 Odpojen od serveru
 [POP3 protocol (internal)]
@@ -314,7 +314,7 @@ Mazání spamu
 
 [Error %d-%d-%d-%d:]
 Chyba %d-%d-%d-%d:
-;file \plugins\YAMN\src\proto\pop3\pop3opt.cpp
+;file \protocols\YAMN\src\proto\pop3\pop3opt.cpp
 [Network]
 Sítě
 [Accounts]
diff --git a/langpacks/czech/Untranslated/Actman.txt b/langpacks/czech/Untranslated/Actman.txt
index 647020dda6..92c29a1e67 100644
--- a/langpacks/czech/Untranslated/Actman.txt
+++ b/langpacks/czech/Untranslated/Actman.txt
@@ -186,11 +186,11 @@
 [with confirmation]
 [without confirmation]
 [Empty updater download folder]
-[Popup Plus (popup.dll) latest YAPP (yapp.dll)]
-[Enables or disables Popup windows]
-[YAPP or Popup]
+[Popup plus (PopupPlus.dll) latest StdPopup (StdPopup.dll)]
+[Enables or disables popup windows]
+[StdPopup or Popup plus]
 [Unicode Text]
-[Enables or disables Popup windows (maybe deprecated)]
+[Enables or disables popup windows (maybe deprecated)]
 [result of protocol service call]
 [Send a general request through the protocol chain for a contact]
 [str, account name]
diff --git a/langpacks/czech/Untranslated/CurrencyRates.txt b/langpacks/czech/Untranslated/CurrencyRates.txt
index a69ce247bf..65916cf112 100644
--- a/langpacks/czech/Untranslated/CurrencyRates.txt
+++ b/langpacks/czech/Untranslated/CurrencyRates.txt
@@ -6,14 +6,11 @@
 [&Watched currency rates:]
 [&Refresh Rates Every:]
 [&Tendency:]
+[&Personal key:]
 [Rate Info]
 [There is nothing to show]
 [Enter positive number.]
 [Currency Rate]
-[Error occurred during HTML parsing.]
-[Error occurred during site access.]
-[Currency Symbol]
-[Currency Name]
 [Source of Information]
 [Rate Value]
 [Previous Rate Value]
@@ -23,12 +20,8 @@
 [Percentage Character (%)]
 [Tabulation]
 [Left slash (\\)]
-[Open Price]
-[Percent Change to After Hours]
-[Percent Change to Yesterday Close]
-[Day's High]
-[Day's Low]
-[Previous Close]
+[Error occurred during HTML parsing.]
+[Error occurred during site access.]
 [From Currency Full Name]
 [From Currency Short Name]
 [Into Currency Full Name]
@@ -40,6 +33,8 @@
 [Enable/Disable Currency Rates Auto Update]
 [Currency Rates Auto Update Enabled]
 [Currency Rates Auto Update Disabled]
+[Currency Symbol]
+[This plugin requires a personal key. Press Yes to obtain it at the site and then enter the result in the Options dialog, otherwise this plugin will fail.]
 [Currency Rate up]
 [Currency Rate down]
 [Currency Rate not changed]
diff --git a/langpacks/czech/Untranslated/Db_autobackups.txt b/langpacks/czech/Untranslated/Db_autobackups.txt
index b76c946c96..90abc03b2e 100644
--- a/langpacks/czech/Untranslated/Db_autobackups.txt
+++ b/langpacks/czech/Untranslated/Db_autobackups.txt
@@ -1,2 +1,4 @@
 [Backup file mask:]
 [Uploading to cloud failed]
+[Enable &AutoBackups notification]
+[Disable &AutoBackups notification]
diff --git a/langpacks/czech/Untranslated/Discord.txt b/langpacks/czech/Untranslated/Discord.txt
index 749009d682..7e8a2f520a 100644
--- a/langpacks/czech/Untranslated/Discord.txt
+++ b/langpacks/czech/Untranslated/Discord.txt
@@ -1,5 +1,6 @@
 [Discord support for Miranda NG.]
-[Use subgroups for guild's channels (requires restart)]
+[Enable group chats]
+[Use subgroups for server channels (requires restart)]
 [edited at]
 [Channel control]
 [Change &topic]
@@ -12,11 +13,15 @@
 [Enter channel name]
 [Enter invitation code you received]
 [Do you really want to leave the guild?]
+[Disable sync]
+[Enable sync]
 [Join guild]
 [Copy my Discord ID]
 [Leave guild]
 [Create new channel]
 [Copy Discord ID]
+[Enable guild sync]
+[Load server history]
 [%s gateway connection]
 [Protocol is offline or user isn't authorized yet]
 [Attachment]
diff --git a/langpacks/czech/Untranslated/ICQ.txt b/langpacks/czech/Untranslated/ICQ.txt
index 7f8601fef6..6c30d94dbc 100644
--- a/langpacks/czech/Untranslated/ICQ.txt
+++ b/langpacks/czech/Untranslated/ICQ.txt
@@ -1,5 +1,7 @@
 [UIN/e-mail:]
 [Sign in/sign up using phone]
+[Use tray icon notifications]
+[Launch mailbox in a browser on click]
 [If a contact goes Offline, set this status instead and cache it for given timeout in seconds (0 - disabled)]
 [After that, set this status to a contact and move it offline after specified timeout in seconds (0 - disabled)]
 [Account registration]
@@ -9,7 +11,10 @@
 [Ignore list editor]
 [&Leave/destroy chat]
 [Do you really want to remove it from ignore list?]
+[E-mail notification]
 [Remove Ignore]
+[You received e-mail from %s: %s]
+[You have %d unread emails]
 [Synchronize server groups]
 [Edit ignore list]
 [UIN/e-mail/phone]
diff --git a/langpacks/czech/Untranslated/Jabber.txt b/langpacks/czech/Untranslated/Jabber.txt
index 4ed4bb75ad..cdbf266fce 100644
--- a/langpacks/czech/Untranslated/Jabber.txt
+++ b/langpacks/czech/Untranslated/Jabber.txt
@@ -1,23 +1,19 @@
-[Jabber Ad-Hoc commands at %s]
-[Sending Ad-Hoc command to %s]
 [Can negotiate options for specific features]
 [Can request advanced processing of message stanzas]
 [Supports generic publish-subscribe functionality]
 [Receives information about OMEMO devices]
 [Supports message carbons (XEP-0280)]
-[Outcast]
 [Outgoing XML parsing error]
 [request timeout.]
 [Navigate]
 [Add search directory]
-[Info request error]
-[Items request error]
 [Failed to retrieve room list from server.]
 [No rooms available on server.]
 [Room list request timed out.]
 [Please wait for room list to download.]
 [Please specify group chat directory first.]
 [Change nickname in <%s>]
+[Authentication]
 [Jabber Bookmarks Error]
 [Http authentication request received]
 [Do you want to create OMEMO session with new device:]
@@ -150,7 +146,6 @@
 [Receive conversations from other devices (XEP-0280)]
 [Use Stream Management (XEP-0198) if possible (Testing)]
 [Use OMEMO encryption for messages if possible (XEP-0384) (Basic support without GUI)]
-[XML for MS Excel (UTF-8 encoded)]
 [League Of Legends (EU Nordic)]
 [League Of Legends (EU West)]
 [League Of Legends (Oceania)]
@@ -165,21 +160,14 @@
 [No compatible file transfer mechanism exists]
 [Protocol is offline or no JID]
 [No valid OMEMO session exists]
-[Command completed successfully]
-[Leave group chats]
-[Disable remote controlling (check twice what you are doing)]
-[Forward options]
-[Mark messages as read]
-[Confirmation needed]
-[There is no group chats to leave]
-[Choose the group chats you want to leave]
+[XML for MS Excel (UTF-8 encoded)]
 [declined subscription]
 [sent error presence]
 [sent unknown presence type]
-[Authentication failed for %s@%S.]
-[Message redirected from: %s\r\n%s]
+[Outcast]
+[Registration canceled]
+[Last activity]
 [Uptime]
-[Please switch online to see more details.]
 [Redirect]
 [Bad request]
 [Unauthorized]
diff --git a/langpacks/czech/Untranslated/NotesReminders.txt b/langpacks/czech/Untranslated/NotesReminders.txt
index 4e4eeb03c1..9534e64027 100644
--- a/langpacks/czech/Untranslated/NotesReminders.txt
+++ b/langpacks/czech/Untranslated/NotesReminders.txt
@@ -10,6 +10,7 @@
 [Note transparency]
 [Open links with this program instead:]
 [(Using MCI allows different sounds to be played simultaneously, may not be needed or desired when a custom sound plugin is installed.)]
+[Repeat each day]
 [Repeat Alert Sound]
 [Use Sound]
 [reftime]
@@ -22,7 +23,6 @@
 [New &Reminder]
 [&Delete Reminder]
 [D&elete All Reminders]
-[Context Menu Note Popup]
 [&Hide Note]
 [&Always On Top]
 [&Delete Note]
@@ -37,8 +37,6 @@
 [Toggle Notes Visibility]
 [Bring All Notes to Front]
 [New Reminder]
-[Are you sure you want to delete all notes?]
-[Are you sure you want to delete all reminders?]
 [Delete All Notes]
 [Show/Hide Notes]
 [On Top Caption Icon]
@@ -50,13 +48,13 @@
 [Bring All to Front]
 [Play Sound Icon]
 [View Notes]
-[Reminder triggered]
-[Reminder triggered (Alternative 1)]
-[Reminder triggered (Alternative 2)]
 [New &Note]
 [Vie&w Notes]
 [&Bring All to Front]
 [Miranda could not load the Notes & Reminders plugin, Msftedit.dll is missing. If you are using WINE, please make sure you have Msftedit.dll installed. Press 'Yes' to continue loading Miranda.]
+[Reminder triggered]
+[Reminder triggered (Alternative 1)]
+[Reminder triggered (Alternative 2)]
 [Maroon]
 [Olive]
 [Navy]
@@ -70,6 +68,7 @@
 [Aqua]
 [Are you sure you want to delete this note?]
 [Date/Title]
+[Are you sure you want to delete all notes?]
 [Sticky Note Caption]
 [Sticky Note Background Color]
 [Sticky Note Body]
@@ -81,4 +80,5 @@
 [&Update Reminder]
 [Alternative 1]
 [Alternative 2]
+[Are you sure you want to delete all reminders?]
 [Are you sure you want to delete this reminder?]
diff --git a/langpacks/czech/Untranslated/PasteIt.txt b/langpacks/czech/Untranslated/PasteIt.txt
index 8a7cbe17b7..9a18ab38a7 100644
--- a/langpacks/czech/Untranslated/PasteIt.txt
+++ b/langpacks/czech/Untranslated/PasteIt.txt
@@ -27,9 +27,9 @@
 [File size is larger then 10 MB, cannot be sent]
 [Cannot open file '%s']
 [File '%s' is empty]
-[Error during sending text to web page: %s]
+[Error during sending text to web page: %S]
 [Error during sending text to web page]
-[Error during getting user key from web page: %s]
+[Error during getting user key from web page: %S]
 [Paste expire date]
 [10 minutes]
 [1 month]
diff --git a/langpacks/czech/Untranslated/TabSRMM.txt b/langpacks/czech/Untranslated/TabSRMM.txt
index 7338cb7a10..aa3aed3355 100644
--- a/langpacks/czech/Untranslated/TabSRMM.txt
+++ b/langpacks/czech/Untranslated/TabSRMM.txt
@@ -3,7 +3,5 @@
 [Data path]
 [Saved TabSRMM avatars]
 [Group chat logs root]
-[Enable typing notification]
-[Disable typing notification]
 [Missing component|The icon pack is missing. Please install it to the default icons folder.\n\nNo icons will be available]
 [File transfer problem|Sending the image by file transfer failed.\n\nPossible reasons: File transfers not supported, either you or the target contact is offline, or you are invisible and the target contact is not on your visibility list.]
diff --git a/langpacks/czech/Untranslated/WhoUsesMyFiles.txt b/langpacks/czech/Untranslated/WhoUsesMyFiles.txt
index 8d2d60f1f0..69b52660f1 100644
--- a/langpacks/czech/Untranslated/WhoUsesMyFiles.txt
+++ b/langpacks/czech/Untranslated/WhoUsesMyFiles.txt
@@ -17,7 +17,6 @@
 [Alert computer name with username]
 [Disabled options will be available in the next version]
 [Show current connections]
-[Popup plugin not found!]
 [Common Dialog Error 0x%lx]
 [Not implemented yet...]
 [Who uses my files]
diff --git a/langpacks/english_gb/=CORE=.txt b/langpacks/english_gb/=CORE=.txt
index 4f55be515b..5894c4fa86 100644
--- a/langpacks/english_gb/=CORE=.txt
+++ b/langpacks/english_gb/=CORE=.txt
@@ -21,6 +21,10 @@ Minimise the message window on send
 Use default colours
 [Use custom colors]
 Use custom colours
+[Text color:]
+Text colour:
+[Background color:]
+Background colour:
 [Send authorization request]
 Send authorisation request
 [Authorization request]
diff --git a/langpacks/english_gb/Plugins/CurrencyRates.txt b/langpacks/english_gb/Plugins/CurrencyRates.txt
index cf18a93932..70bdd39c0d 100644
--- a/langpacks/english_gb/Plugins/CurrencyRates.txt
+++ b/langpacks/english_gb/Plugins/CurrencyRates.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: CurrencyRates.dll
 ;  Plugin: Currency Rates
-;  Version: 0.1.0.101
+;  Version: 0.2.0.3
 ;  Authors: Dioksin
 ;============================================================
 [Colors]
diff --git a/langpacks/english_gb/Plugins/Db_autobackups.txt b/langpacks/english_gb/Plugins/Db_autobackups.txt
index e04366196a..a3add6e316 100644
--- a/langpacks/english_gb/Plugins/Db_autobackups.txt
+++ b/langpacks/english_gb/Plugins/Db_autobackups.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Db_autobackups.dll
 ;  Plugin: Db autobackuper
-;  Version: 0.1.0.2
+;  Version: 0.1.0.3
 ;  Authors: chaos.persei, sje, Kildor, Billy_Bons
 ;============================================================
 [Go to the "Options -> Customize -> Folders" to change settings]
diff --git a/langpacks/english_gb/Plugins/FTPFile.txt b/langpacks/english_gb/Plugins/FTPFile.txt
index b750dbfacc..0fd474905e 100644
--- a/langpacks/english_gb/Plugins/FTPFile.txt
+++ b/langpacks/english_gb/Plugins/FTPFile.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: FTPFile.dll
 ;  Plugin: FTP File YM
-;  Version: 0.6.0.4
+;  Version: 0.6.0.5
 ;  Authors: yaho
 ;============================================================
 [Upload canceled]
diff --git a/langpacks/english_gb/Plugins/GG.txt b/langpacks/english_gb/Plugins/GG.txt
index 000b30b39f..4a0b0b555f 100644
--- a/langpacks/english_gb/Plugins/GG.txt
+++ b/langpacks/english_gb/Plugins/GG.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: GG.dll
 ;  Plugin: Gadu-Gadu protocol
-;  Version: 0.11.0.4
+;  Version: 0.95.11.1
 ;  Authors: Bartosz Bialek, Adam Strzelecki
 ;============================================================
 [Send messages slower, but with full acknowledgment]
diff --git a/langpacks/english_gb/Plugins/MenuEx.txt b/langpacks/english_gb/Plugins/MenuEx.txt
index 9c29080986..7c23f9c9d2 100644
--- a/langpacks/english_gb/Plugins/MenuEx.txt
+++ b/langpacks/english_gb/Plugins/MenuEx.txt
@@ -2,18 +2,10 @@
 ;============================================================
 ;  File: MenuEx.dll
 ;  Plugin: Menu item ext
-;  Version: 1.3.1.0
+;  Version: 1.3.2.0
 ;  Authors: Heiko Schillinger, Baloo, Billy_Bons, Robert Pösel
 ;============================================================
-[Request Authorization]
-Request Authorisation
 [Authorization]
 Authorisation
-[Please authorize me to add you to my contact list.]
-Please authorise me to add you to my contact list.
-[Do you want to send authorization request\nto new contact?]
-Do you want to send authorisation request\nto new contact?
-[Request authorization]
-Request authorisation
 [Customize]
 Customise
diff --git a/langpacks/english_gb/Plugins/MirandaG15.txt b/langpacks/english_gb/Plugins/MirandaG15.txt
index 5b7e8bb472..7ee7a22cfb 100644
--- a/langpacks/english_gb/Plugins/MirandaG15.txt
+++ b/langpacks/english_gb/Plugins/MirandaG15.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MirandaG15.dll
 ;  Plugin: MirandaG15
-;  Version: 0.1.2.0
+;  Version: 0.1.2.1
 ;  Authors: Martin Kleinhans
 ;============================================================
 [Maximizing]
diff --git a/langpacks/english_gb/Plugins/MsgPopup.txt b/langpacks/english_gb/Plugins/MsgPopup.txt
index 96edc93169..02a6ef68e2 100644
--- a/langpacks/english_gb/Plugins/MsgPopup.txt
+++ b/langpacks/english_gb/Plugins/MsgPopup.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MsgPopup.dll
 ;  Plugin: Message popup
-;  Version: 0.1.2.1
+;  Version: 0.1.2.2
 ;  Authors: StDenis
 ;============================================================
 [Background color]
diff --git a/langpacks/english_gb/Plugins/NewsAggregator.txt b/langpacks/english_gb/Plugins/NewsAggregator.txt
index b1bb066027..55aabeab25 100644
--- a/langpacks/english_gb/Plugins/NewsAggregator.txt
+++ b/langpacks/english_gb/Plugins/NewsAggregator.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: NewsAggregator.dll
 ;  Plugin: News aggregator
-;  Version: 0.1.0.4
+;  Version: 0.1.0.5
 ;  Authors: Mataes, FREAK_THEMIGHTY
 ;============================================================
 [Visualization]
diff --git a/langpacks/english_gb/Plugins/NotesReminders.txt b/langpacks/english_gb/Plugins/NotesReminders.txt
index b998d0750f..04af5c0b13 100644
--- a/langpacks/english_gb/Plugins/NotesReminders.txt
+++ b/langpacks/english_gb/Plugins/NotesReminders.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: NotesReminders.dll
 ;  Plugin: Sticky Notes & Reminders
-;  Version: 0.1.0.1
+;  Version: 0.2.0.2
 ;  Authors: Joe Kucera, Lubomir Kolev Ivanov, Georg Fischer
 ;============================================================
 [Background Color]
diff --git a/langpacks/english_gb/Plugins/PluginUpdater.txt b/langpacks/english_gb/Plugins/PluginUpdater.txt
index eff6e31c20..f33a6780b2 100644
--- a/langpacks/english_gb/Plugins/PluginUpdater.txt
+++ b/langpacks/english_gb/Plugins/PluginUpdater.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: PluginUpdater.dll
 ;  Plugin: Plugin updater
-;  Version: 0.2.0.2
+;  Version: 0.2.0.3
 ;  Authors: Mataes, George Hazan
 ;============================================================
 [Go to Options -> Customize -> Hotkeys to change the hotkey]
diff --git a/langpacks/english_gb/Plugins/PopupPlus.txt b/langpacks/english_gb/Plugins/PopupPlus.txt
index 9a43fe2b25..dfe6133a17 100644
--- a/langpacks/english_gb/Plugins/PopupPlus.txt
+++ b/langpacks/english_gb/Plugins/PopupPlus.txt
@@ -1,6 +1,6 @@
 #muuid {26a9125d-7863-4e01-af0e-d14ef95c5054}
 ;============================================================
-;  File: Popup.dll
+;  File: PopupPlus.dll
 ;  Plugin: Popup plus
 ;  Version: 2.1.1.15
 ;  Authors: MPK, Merlin_de (Luca Santarelli, Victor Pavlychko)
diff --git a/langpacks/english_gb/Plugins/SkypeWeb.txt b/langpacks/english_gb/Plugins/SkypeWeb.txt
index 86c8bb3442..d4eb9299bc 100644
--- a/langpacks/english_gb/Plugins/SkypeWeb.txt
+++ b/langpacks/english_gb/Plugins/SkypeWeb.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: SkypeWeb.dll
 ;  Plugin: Skype protocol (Web)
-;  Version: 0.12.3.1
+;  Version: 0.12.3.3
 ;  Authors: Miranda NG team
 ;============================================================
 [Automatic messages synchronization]
diff --git a/langpacks/english_gb/Plugins/SmileyAdd.txt b/langpacks/english_gb/Plugins/SmileyAdd.txt
index 4e575d03bb..97150a24a0 100644
--- a/langpacks/english_gb/Plugins/SmileyAdd.txt
+++ b/langpacks/english_gb/Plugins/SmileyAdd.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: SmileyAdd.dll
 ;  Plugin: SmileyAdd
-;  Version: 0.3.1.0
+;  Version: 0.3.1.1
 ;  Authors: Peacow, nightwish, bid, borkra
 ;============================================================
 [Background color]
diff --git a/langpacks/english_gb/Plugins/StatusManager.txt b/langpacks/english_gb/Plugins/StatusManager.txt
index 59a984c834..c93262ee61 100644
--- a/langpacks/english_gb/Plugins/StatusManager.txt
+++ b/langpacks/english_gb/Plugins/StatusManager.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: StatusManager.dll
 ;  Plugin: Status manager
-;  Version: 1.2.0.4
+;  Version: 1.2.0.5
 ;  Authors: P Boon
 ;============================================================
 [Background color]
diff --git a/langpacks/english_gb/Plugins/TabSRMM.txt b/langpacks/english_gb/Plugins/TabSRMM.txt
index 1f133be3d9..e4fe160b19 100644
--- a/langpacks/english_gb/Plugins/TabSRMM.txt
+++ b/langpacks/english_gb/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: TabSRMM.dll
 ;  Plugin: TabSRMM
-;  Version: 3.5.0.12
+;  Version: 3.5.0.13
 ;  Authors: The Miranda developers team and contributors
 ;============================================================
 [Customize the panel]
diff --git a/langpacks/english_gb/Plugins/UInfoEx.txt b/langpacks/english_gb/Plugins/UInfoEx.txt
index 633a0670ff..458cbb7d91 100644
--- a/langpacks/english_gb/Plugins/UInfoEx.txt
+++ b/langpacks/english_gb/Plugins/UInfoEx.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: UInfoEx.dll
 ;  Plugin: User info ext
-;  Version: 0.8.5.1
+;  Version: 0.8.5.2
 ;  Authors: DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
 ;============================================================
 [Enter your full e-mail address.\n(e.g., john.doe@provider.com)]
diff --git a/langpacks/english_gb/Plugins/VKontakte.txt b/langpacks/english_gb/Plugins/VKontakte.txt
index 53f6189938..0a0a765d7b 100644
--- a/langpacks/english_gb/Plugins/VKontakte.txt
+++ b/langpacks/english_gb/Plugins/VKontakte.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: VKontakte.dll
 ;  Plugin: VKontakte protocol
-;  Version: 0.1.8.1
+;  Version: 0.1.9.0
 ;  Authors: Miranda NG team
 ;============================================================
 [Please authorize me to add you to my friend list.]
diff --git a/langpacks/french/=CORE=.txt b/langpacks/french/=CORE=.txt
index e029d1a1ce..cbad19b018 100644
--- a/langpacks/french/=CORE=.txt
+++ b/langpacks/french/=CORE=.txt
@@ -570,6 +570,55 @@ Tout &sélectionner
 Coller et envoyer
 [Delete]
 Effacer
+;file \src\core\stdpopup\res\resource.rc
+[Popup history]
+Historique des popups
+[Case sensitive]
+Respecter la casse
+[Default timeout]
+
+[Never timeout]
+Sans durée
+[Set timeout:]
+Délai :
+[Width:]
+Largeur :
+[Maximum height:]
+Hauteur maximum :
+[Opacity (%):]
+
+[Border]
+Bordures
+[Round corners (window)]
+
+[Preview]
+Aperçu
+[Transparent background]
+Arrière-plan transparent
+[Layout]
+Disposition
+[Avatar size:]
+
+[Disable when]
+Désactivé si
+[Global hover]
+
+[Sidebar width:]
+
+[Text indent:]
+
+[Padding:]
+
+[Round corners (avatar)]
+
+[Text color:]
+
+[Background color:]
+Couleur d'arrière-plan :
+[Set timeout]
+
+[Timeout value (0 = default):]
+Délai (0 = par défaut) :
 ;file \src\core\stduihist\res\resource.rc
 [Find]
 Chercher
@@ -1749,6 +1798,88 @@ Entrant (nouvelle session)
 ;file \src\core\stdmsg\src\msgtimedout.cpp
 [An unknown error has occurred.]
 Une erreur inconnue s'est produite.
+;file \src\core\stdpopup\src\icons.cpp
+[Popups are enabled]
+
+[Popups are disabled]
+
+;file \src\core\stdpopup\src\notify_imp.cpp
+;file \src\core\stdpopup\src\options.cpp
+[Example]
+Exemple
+[The quick brown fox jumped over the lazy dog.]
+Le rapide renard brun a sauté par-dessus le chien paresseux.
+[Example With a Long Title]
+Exemple avec un long titre
+[Thequickbrownfoxjumpedoverthelazydog.]
+Lerapiderenardbrunasautépau-dessuslechienparesseux.
+[An avatar.]
+Un avatar.
+[Bottom right]
+
+[Bottom left]
+
+[Top right]
+
+[Top left]
+
+[Icon on left]
+
+[Icon on right]
+
+[No time]
+Pas d'heure
+[Time on left]
+Heure sur la gauche
+[Time on right]
+Heure sur la droite
+[Time above avatar]
+Heure sur l'avatar
+[No avatar]
+
+[Left avatar]
+
+[Right avatar]
+
+[Full-screen app running]
+Programme en plein écran
+[No animate]
+
+[Horizontal animate]
+
+[Vertical animate]
+
+[You cannot set a default timeout of 0.\nValue has been reset.]
+Vous ne pouvez pas régler le délai par défaut à 0.\nLa valeur a été resetée.
+[Settings]
+Paramètres
+[Classes]
+
+;file \src\core\stdpopup\src\services.cpp
+[Disable popups]
+
+[Enable popups]
+
+;file \src\core\stdpopup\src\yapp.cpp
+[Toggle popups]
+
+[First line]
+Première ligne
+[Second line]
+Seconde ligne
+[Time]
+Heure
+[Sidebar]
+
+[Title underline]
+
+;file \src\core\stdpopup\src\yapp_history_dlg.cpp
+[Copy title to clipboard]
+Copier le titre
+[Copy message to clipboard]
+Copier le message
+[Copy timestamp to clipboard]
+Copier date et heure
 ;file \src\core\stdssl\src\netlibssl.cpp
 [Client cannot decode host message. Possible causes: host does not support SSL or requires not existing security package]
 
@@ -2631,8 +2762,6 @@ Blog vidé
 Plugin Unicode
 [ANSI plugin]
 Plugin ANSI
-[Unused]
-
 [Show/Hide]
 Afficher/Masquer
 [Exit]
@@ -2647,6 +2776,8 @@ Déplacer vers le groupe
 
 [Off]
 
+[Unused]
+
 [Frames]
 Cadres
 [Add group]
diff --git a/langpacks/french/Plugins/Actman.txt b/langpacks/french/Plugins/Actman.txt
index 7a2de1d63d..394cb0f780 100644
--- a/langpacks/french/Plugins/Actman.txt
+++ b/langpacks/french/Plugins/Actman.txt
@@ -677,19 +677,19 @@ Vérifier la présence de mises à jour
 
 [Empty updater download folder]
 
-[Popup Plus (popup.dll) latest YAPP (yapp.dll)]
+[Popup plus (PopupPlus.dll) latest StdPopup (StdPopup.dll)]
 
-[Enables or disables Popup windows]
+[Enables or disables popup windows]
 
 [Notify]
 
-[YAPP or Popup]
+[StdPopup or Popup plus]
 
 [Popup window]
 
 [Unicode Text]
 
-[Enables or disables Popup windows (maybe deprecated)]
+[Enables or disables popup windows (maybe deprecated)]
 
 [result of protocol service call]
 
diff --git a/langpacks/french/Plugins/ChangeKeyboardLayout.txt b/langpacks/french/Plugins/ChangeKeyboardLayout.txt
index 41024d71b1..a64d62d44d 100644
--- a/langpacks/french/Plugins/ChangeKeyboardLayout.txt
+++ b/langpacks/french/Plugins/ChangeKeyboardLayout.txt
@@ -82,8 +82,6 @@ Sessions de message
 [Popups]
 Popups
 ;file \plugins\ChangeKeyboardLayout\src\main.cpp
-[Popup]
-
 ;file \plugins\ChangeKeyboardLayout\src\stdafx.h
 [ChangeKeyboardLayout]
 
diff --git a/langpacks/french/Plugins/Clist_modern.txt b/langpacks/french/Plugins/Clist_modern.txt
index 82120e6a7e..4180214fbf 100644
--- a/langpacks/french/Plugins/Clist_modern.txt
+++ b/langpacks/french/Plugins/Clist_modern.txt
@@ -747,6 +747,8 @@ Heure du dernier message
 Nom de compte
 [Rate]
 Note
+[Last online]
+
 [-Nothing-]
 -Aucun-
 [Hide to tray]
@@ -808,8 +810,6 @@ Centre les groupes
 Aligner les groupes sur la droite
 [Row]
 Ligne
-[Row design]
-
 ;file \plugins\Clist_modern\src\modern_clistsettings.cpp
 [(Unknown contact)]
 (Contact inconnu)
@@ -835,21 +835,6 @@ Fermer Miranda
 
 [Show/Hide offline users]
 
-;file \plugins\Clist_modern\src\modern_rowtemplateopt.cpp
-[Empty %s cell]
-Cellule %s vide
-[column]
-colonne
-[line]
-ligne
-[columns]
-colonnes
-[lines]
-lignes
-[%s, contain %s]
-/s, contient /s
-[ layered]
-
 ;file \plugins\Clist_modern\src\modern_skinopt.cpp
 [( unknown )]
 
diff --git a/langpacks/french/Plugins/CloudFile.txt b/langpacks/french/Plugins/CloudFile.txt
index 52faba7c5a..81a5111ab1 100644
--- a/langpacks/french/Plugins/CloudFile.txt
+++ b/langpacks/french/Plugins/CloudFile.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Allows you to transfer files via cloud services.]
 
-;file \plugins\CloudFile\res\resource.rc
+;file \protocols\CloudFile\res\resource.rc
 [Default service]
 
 [General]
@@ -42,7 +42,7 @@ Annuler
 
 [Revoke access]
 
-;file \plugins\CloudFile\src\icons.cpp
+;file \protocols\CloudFile\src\icons.cpp
 [Upload file(s)]
 Envoyer un(des) fichier(s)
 [Dropbox]
@@ -53,22 +53,22 @@ Envoyer un(des) fichier(s)
 
 [Yandex.Disk]
 
-;file \plugins\CloudFile\src\menus.cpp
+;file \protocols\CloudFile\src\menus.cpp
 [Upload to...]
 
 [Upload]
 
-;file \plugins\CloudFile\src\options.cpp
+;file \protocols\CloudFile\src\options.cpp
 [None]
 Aucun
 [Services]
 Services
-;file \plugins\CloudFile\src\srmm.cpp
+;file \protocols\CloudFile\src\srmm.cpp
 [Upload files to...]
 
-;file \plugins\CloudFile\src\Services\dropbox_service.cpp
+;file \protocols\CloudFile\src\Services\dropbox_service.cpp
 [Server does not respond]
 
-;file \plugins\CloudFile\src\Services\google_service.cpp
-;file \plugins\CloudFile\src\Services\microsoft_service.cpp
-;file \plugins\CloudFile\src\Services\yandex_service.cpp
+;file \protocols\CloudFile\src\Services\google_service.cpp
+;file \protocols\CloudFile\src\Services\microsoft_service.cpp
+;file \protocols\CloudFile\src\Services\yandex_service.cpp
diff --git a/langpacks/french/Plugins/CmdLine.txt b/langpacks/french/Plugins/CmdLine.txt
index 18f6b655a6..283548deae 100644
--- a/langpacks/french/Plugins/CmdLine.txt
+++ b/langpacks/french/Plugins/CmdLine.txt
@@ -195,8 +195,3 @@ Valeur inconnue
 
 [You can only run one instance of CmdLine plugin.]
 
-;file \plugins\CmdLine\src\utils.cpp
-[Notify]
-
-[Warning]
-Avertissement
diff --git a/langpacks/french/Plugins/ConnectionNotify.txt b/langpacks/french/Plugins/ConnectionNotify.txt
index 35cfcc83db..18f900d79a 100644
--- a/langpacks/french/Plugins/ConnectionNotify.txt
+++ b/langpacks/french/Plugins/ConnectionNotify.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Notify with popup if some connection established]
 
-;file \plugins\ConnectionNotify\res\ConnectionNotify.rc
+;file \protocols\ConnectionNotify\res\ConnectionNotify.rc
 [Set popup colors]
 
 [Popup options]
@@ -56,7 +56,7 @@ Annuler
 
 [Remote IP:Port]
 
-;file \plugins\ConnectionNotify\src\ConnectionNotify.cpp
+;file \protocols\ConnectionNotify\src\ConnectionNotify.cpp
 [Show]
 Afficher
 [Hide]
@@ -79,6 +79,6 @@ Cacher
 Plugins
 [New Connection Notification]
 
-;file \plugins\ConnectionNotify\src\filter.cpp
+;file \protocols\ConnectionNotify\src\filter.cpp
 [First close options window]
 
diff --git a/langpacks/french/Plugins/CrashDumper.txt b/langpacks/french/Plugins/CrashDumper.txt
index 4280c9a18a..9e744241f8 100644
--- a/langpacks/french/Plugins/CrashDumper.txt
+++ b/langpacks/french/Plugins/CrashDumper.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: CrashDumper.dll
 ;  Plugin: Crash dumper
-;  Version: 0.1.0.2
+;  Version: 0.1.0.3
 ;  Authors: borkra
 ;============================================================
 [Crash Dumper and Version Information for Miranda NG.]
diff --git a/langpacks/french/Plugins/CurrencyRates.txt b/langpacks/french/Plugins/CurrencyRates.txt
index cf3ea7fb83..a938f90be8 100644
--- a/langpacks/french/Plugins/CurrencyRates.txt
+++ b/langpacks/french/Plugins/CurrencyRates.txt
@@ -2,12 +2,12 @@
 ;============================================================
 ;  File: CurrencyRates.dll
 ;  Plugin: Currency Rates
-;  Version: 0.1.0.101
+;  Version: 0.2.0.3
 ;  Authors: Dioksin
 ;============================================================
 [Shows currency rates.]
 
-;file \plugins\CurrencyRates\res\Forex.rc
+;file \protocols\CurrencyRates\res\Forex.rc
 [Variable List]
 Liste variables
 [Edit Settings]
@@ -104,14 +104,16 @@ Aperçu
 
 [&Tendency:]
 
+[&Personal key:]
+
 [&Advanced Settings...]
 
 [Rate Info]
 
-;file \plugins\CurrencyRates\src\Chart.h
+;file \protocols\CurrencyRates\src\Chart.h
 [There is nothing to show]
 
-;file \plugins\CurrencyRates\src\CommonOptionDlg.cpp
+;file \protocols\CurrencyRates\src\CommonOptionDlg.cpp
 [Seconds]
 secondes
 [Minutes]
@@ -124,24 +126,15 @@ Heures
 
 [Enter text to display in contact list.]
 
-;file \plugins\CurrencyRates\src\CurrencyConverter.cpp
+;file \protocols\CurrencyRates\src\CurrencyConverter.cpp
 [Info provided by]
 
 [Enter positive number.]
 
-;file \plugins\CurrencyRates\src\CurrencyRateInfoDlg.cpp
+;file \protocols\CurrencyRates\src\CurrencyRateInfoDlg.cpp
 [Currency Rate]
 
-;file \plugins\CurrencyRates\src\CurrencyRatesProviderCurrencyConverter.cpp
-[Error occurred during HTML parsing.]
-
-[Error occurred during site access.]
-
-;file \plugins\CurrencyRates\src\CurrencyRatesProviderVisitorFormatSpecificator.cpp
-[Currency Symbol]
-
-[Currency Name]
-
+;file \protocols\CurrencyRates\src\CurrencyRatesProviderBase.cpp
 [Source of Information]
 
 [Rate Value]
@@ -160,19 +153,10 @@ Heures
 
 [Left slash (\\)]
 
-[Open Price]
-
-[Percent Change to After Hours]
-
-[Percent Change to Yesterday Close]
-
-[Day's High]
-
-[Day's Low]
-
-[Previous Close]
+;file \protocols\CurrencyRates\src\CurrencyRatesProviderCurrencyConverter.cpp
+[Error occurred during HTML parsing.]
 
-[Change]
+[Error occurred during site access.]
 
 [From Currency Full Name]
 
@@ -184,7 +168,7 @@ Heures
 
 [Short notation for "%f/%i"]
 
-;file \plugins\CurrencyRates\src\Forex.cpp
+;file \protocols\CurrencyRates\src\Forex.cpp
 [Auto Update Enabled]
 
 [Auto Update Disabled]
@@ -215,12 +199,16 @@ Actualiser
 
 [Currency Rates Auto Update Disabled]
 
+[Currency Symbol]
+
 [Network]
 Réseau
-;file \plugins\CurrencyRates\src\HTTPSession.cpp
+;file \protocols\CurrencyRates\src\HTTPSession.cpp
+[This plugin requires a personal key. Press Yes to obtain it at the site and then enter the result in the Options dialog, otherwise this plugin will fail.]
+
 [CurrencyRates HTTP connections]
 Connexions HTTP de CurrencyRates
-;file \plugins\CurrencyRates\src\IconLib.cpp
+;file \protocols\CurrencyRates\src\IconLib.cpp
 [Protocol icon]
 
 [Currency Rate up]
@@ -237,17 +225,15 @@ Connexions HTTP de CurrencyRates
 
 [Import]
 
-;file \plugins\CurrencyRates\src\ImportExport.cpp
+;file \protocols\CurrencyRates\src\ImportExport.cpp
 [XML File (*.xml)]
 
 [All files (*.*)]
 Tous les fichiers (*.*)
-;file \plugins\CurrencyRates\src\ModuleInfo.cpp
-[Miranda could not load CurrencyRates plugin. XML parser is missing.]
-
+;file \protocols\CurrencyRates\src\ModuleInfo.cpp
 [Miranda could not load CurrencyRates plugin. Microsoft HTML parser is missing.]
 
-;file \plugins\CurrencyRates\src\SettingsDlg.cpp
+;file \protocols\CurrencyRates\src\SettingsDlg.cpp
 [Log Files (*.txt,*.log)]
 
 [Enter integer value]
diff --git a/langpacks/french/Plugins/Db_autobackups.txt b/langpacks/french/Plugins/Db_autobackups.txt
index 2ad0f7c8d1..33eb36a655 100644
--- a/langpacks/french/Plugins/Db_autobackups.txt
+++ b/langpacks/french/Plugins/Db_autobackups.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Db_autobackups.dll
 ;  Plugin: Db autobackuper
-;  Version: 0.1.0.2
+;  Version: 0.1.0.3
 ;  Authors: chaos.persei, sje, Kildor, Billy_Bons
 ;============================================================
 [Database autobackuper plugin.]
@@ -34,8 +34,6 @@ Dossier de sauvegarde :
 
 [Disable progress bar]
 Désactiver la barre de progression
-[Disable popups]
-
 [Use CloudFile]
 
 [Backup NOW]
@@ -58,6 +56,10 @@ Erreur
 [Database back up in process...]
 
 ;file \plugins\Db_autobackups\src\main.cpp
+[Enable &AutoBackups notification]
+
+[Disable &AutoBackups notification]
+
 [Miranda NG databases]
 
 [Compressed Miranda NG databases]
@@ -70,6 +72,8 @@ Tous les fichiers
 Sauvegarder votre profil
 [Save profile as...]
 
+[Popups]
+Popups
 [Database backups]
 Profil sauvegardé
 [Backup folder]
diff --git a/langpacks/french/Plugins/Discord.txt b/langpacks/french/Plugins/Discord.txt
index 8d06a0122a..64d96b440a 100644
--- a/langpacks/french/Plugins/Discord.txt
+++ b/langpacks/french/Plugins/Discord.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Discord.dll
 ;  Plugin: Discord protocol
-;  Version: 0.6.1.1
+;  Version: 0.6.2.1
 ;  Authors: George Hazan
 ;============================================================
 [Discord support for Miranda NG.]
@@ -18,9 +18,11 @@ Passe :
 Contacts
 [Default group:]
 Groupes :
+[Enable group chats]
+
 [Do not open chat windows on creation]
 
-[Use subgroups for guild's channels (requires restart)]
+[Use subgroups for server channels (requires restart)]
 
 [Nick:]
 Pseudo :
@@ -58,6 +60,10 @@ Groupe chats
 
 [Do you really want to leave the guild?]
 
+[Disable sync]
+
+[Enable sync]
+
 [Join guild]
 
 [Copy my Discord ID]
@@ -68,6 +74,10 @@ Groupe chats
 
 [Copy Discord ID]
 
+[Enable guild sync]
+
+[Load server history]
+
 ;file \protocols\Discord\src\options.cpp
 [Network]
 Réseau
diff --git a/langpacks/french/Plugins/FTPFile.txt b/langpacks/french/Plugins/FTPFile.txt
index 955db1ddb4..c5bda15c9f 100644
--- a/langpacks/french/Plugins/FTPFile.txt
+++ b/langpacks/french/Plugins/FTPFile.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: FTPFile.dll
 ;  Plugin: FTP File YM
-;  Version: 0.6.0.4
+;  Version: 0.6.0.5
 ;  Authors: yaho
 ;============================================================
 [FTP a file to a server and send the URL to your friend. Supported automatic zipping before upload and encryption via SFTP and FTPS.]
diff --git a/langpacks/french/Plugins/Facebook.txt b/langpacks/french/Plugins/Facebook.txt
index 8374bf460a..f326aa4a7e 100644
--- a/langpacks/french/Plugins/Facebook.txt
+++ b/langpacks/french/Plugins/Facebook.txt
@@ -142,14 +142,14 @@ Envoyer SMS
 
 [This will permanently delete the conversation history]
 
-[Former]
-
 [Myself]
 
 [Friend]
 
 [User]
 Utilisateur
+[Former]
+
 [Notifications]
 Notifications
 [%s and more (%d)]
diff --git a/langpacks/french/Plugins/GG.txt b/langpacks/french/Plugins/GG.txt
index 0897ed3867..e504fc1a2f 100644
--- a/langpacks/french/Plugins/GG.txt
+++ b/langpacks/french/Plugins/GG.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: GG.dll
 ;  Plugin: Gadu-Gadu protocol
-;  Version: 0.11.0.4
+;  Version: 0.95.11.1
 ;  Authors: Bartosz Bialek, Adam Strzelecki
 ;============================================================
 [Gadu-Gadu protocol support for Miranda NG.]
diff --git a/langpacks/french/Plugins/GmailNotifier.txt b/langpacks/french/Plugins/GmailNotifier.txt
index 74970f694f..eae2c7ade3 100644
--- a/langpacks/french/Plugins/GmailNotifier.txt
+++ b/langpacks/french/Plugins/GmailNotifier.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Check your Gmail inboxes locally.]
 
-;file \plugins\GmailNotifier\res\options.rc
+;file \protocols\GmailNotifier\res\options.rc
 [Gmail account]
 
 [Name:]
@@ -54,7 +54,7 @@ secondes
 
 [Log unread threads into database (enable history)]
 
-;file \plugins\GmailNotifier\src\check.cpp
+;file \protocols\GmailNotifier\src\check.cpp
 [Checking...]
 
 [Can't send account data!]
@@ -63,7 +63,7 @@ secondes
 
 [Can't get RSS feed!]
 
-;file \plugins\GmailNotifier\src\main.cpp
+;file \protocols\GmailNotifier\src\main.cpp
 [Other]
 Autre
 [Gmail: New thread(s)]
@@ -74,7 +74,7 @@ Autre
 
 [&Check Gmail inbox]
 
-;file \plugins\GmailNotifier\src\options.cpp
+;file \protocols\GmailNotifier\src\options.cpp
 [GmailNotifier]
 
 [Network]
diff --git a/langpacks/french/Plugins/ICQ.txt b/langpacks/french/Plugins/ICQ.txt
index 081dc5a836..514489321a 100644
--- a/langpacks/french/Plugins/ICQ.txt
+++ b/langpacks/french/Plugins/ICQ.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: ICQ.dll
 ;  Plugin: ICQ-WIM protocol
-;  Version: 0.95.11.1
+;  Version: 0.95.11.4
 ;  Authors: George Hazan
 ;============================================================
 [ICQ protocol support for Miranda NG.]
@@ -16,8 +16,12 @@ Passe :
 
 [Do not open chat windows on creation]
 
-[Advanced]
-Avancé
+[Use tray icon notifications]
+
+[E-mail]
+Courriel
+[Launch mailbox in a browser on click]
+
 [If a contact goes Offline, set this status instead and cache it for given timeout in seconds (0 - disabled)]
 
 [After that, set this status to a contact and move it offline after specified timeout in seconds (0 - disabled)]
@@ -59,6 +63,8 @@ Inscrit depuis :
 [Do you really want to remove it from ignore list?]
 
 ;file \protocols\ICQ-WIM\src\main.cpp
+[E-mail notification]
+
 [Ignore]
 Ignorer
 [Remove Ignore]
@@ -66,6 +72,15 @@ Ignorer
 ;file \protocols\ICQ-WIM\src\options.cpp
 [Network]
 Réseau
+[General]
+Général
+[Advanced]
+Avancé
+;file \protocols\ICQ-WIM\src\poll.cpp
+[You received e-mail from %s: %s]
+
+[You have %d unread emails]
+
 ;file \protocols\ICQ-WIM\src\proto.cpp
 [%s server connection]
 %s serveur connexion
diff --git a/langpacks/french/Plugins/Import.txt b/langpacks/french/Plugins/Import.txt
index 726d289175..74c46c6ea5 100644
--- a/langpacks/french/Plugins/Import.txt
+++ b/langpacks/french/Plugins/Import.txt
@@ -111,8 +111,6 @@ Nouveau compte
 
 [Skipping non-IM contact (%S)]
 
-[Skipping %S contact, ID not found]
-
 [Skipping duplicate %S contact %s]
 
 [Failed to add %S contact %s]
diff --git a/langpacks/french/Plugins/Jabber.txt b/langpacks/french/Plugins/Jabber.txt
index 568423f438..fa5285c0e3 100644
--- a/langpacks/french/Plugins/Jabber.txt
+++ b/langpacks/french/Plugins/Jabber.txt
@@ -326,6 +326,8 @@ Actualiser
 JID :
 [Node:]
 
+[Filter:]
+
 [Member Information]
 
 [Role:]
@@ -392,24 +394,10 @@ Raccourci du protocole Jabber
 [Jabber Mood]
 
 ;file \protocols\JabberG\src\jabber_adhoc.cpp
-[Error %s %s]
-Erreur %s %s
-[Select Command]
-Choississez une commande
-[Not supported]
-Non supporté
 [Done]
 Terminé
-[In progress. Please Wait...]
-En cours... Veuillez patienter...
 [Execute]
 Exécuter
-[Requesting command list. Please wait...]
-Demande de la liste de commande. Veuillez patienter...
-[Jabber Ad-Hoc commands at %s]
-
-[Sending Ad-Hoc command to %s]
-
 ;file \protocols\JabberG\src\jabber_agent.cpp
 [Jabber Agent Registration]
 Enregistrement des Services Jabber
@@ -544,32 +532,16 @@ Visiteur
 
 [Moderator]
 Modérateur
-[Visitors]
-Visiteurs
-[Participants]
+[Owners]
 
 [Moderators]
 Modérateurs
-[Owners]
-
-[User %s is now banned.]
-
-[User %s changed status to %s with message: %s]
-
-[User %s changed status to %s]
-
-[Room configuration was changed.]
-
-[Outcast]
-
-[Affiliation of %s was changed to '%s'.]
+[Participants]
 
+[Visitors]
+Visiteurs
 [Role of %s was changed to '%s'.]
 
-[because room is now members-only]
-
-[user banned]
-
 [Change &nickname]
 
 [&Invite a user]
@@ -668,10 +640,6 @@ Copier
 
 [%s (not on roster)]
 
-[%s from\n%s]
-%s de\n%s
-[Real JID not available]
-
 [Reason to kick %s]
 
 [Reason to ban %s]
@@ -742,26 +710,6 @@ Copier le JID
 
 [Copy node information]
 
-;file \protocols\JabberG\src\jabber_disco.h
-[Identities]
-
-[category]
-catégorie
-[type]
-
-[Category]
-Catégorie
-[Type]
-
-[Supported features]
-
-[Info request error]
-
-[Items request error]
-
-;file \protocols\JabberG\src\jabber_filterlist.cpp
-[Set filter...]
-
 ;file \protocols\JabberG\src\jabber_groupchat.cpp
 [Failed to retrieve room list from server.]
 
@@ -769,8 +717,6 @@ Catégorie
 
 [Room list request timed out.]
 
-[<no nick>]
-<aucun pseudo>
 [Loading...]
 Chargement...
 [Please wait for room list to download.]
@@ -781,8 +727,8 @@ Chargement...
 Favoris...
 [Change nickname in <%s>]
 
-[has set the subject to:]
-
+[Error]
+Erreur
 [Group chat invitation to\n%s]
 
 ;file \protocols\JabberG\src\jabber_icolib.cpp
@@ -877,8 +823,8 @@ Protocoles
 ;file \protocols\JabberG\src\jabber_iqid.cpp
 [Authentication failed for %s.]
 
-[Jabber Authentication]
-Authentification Jabber
+[Authentication]
+Authentification
 [Registration successful]
 Enregistrement réussi
 [Password is successfully changed. Don't forget to update your password in the Jabber protocol option.]
@@ -1469,18 +1415,6 @@ Rejoindre automatiquement une conférence à la connexion
 Changements d'état
 [Don't notify history messages]
 
-[Group]
-Groupe
-[Subscription]
-
-[Uploading...]
-Mise à jour...
-[Downloading...]
-Télécharge...
-[XML for MS Excel (UTF-8 encoded)]
-
-[Connecting...]
-Connexion en cours...
 [Network]
 Réseau
 [Account]
@@ -1514,8 +1448,6 @@ S.ms
 [Some changes will take effect the next time you connect to the Jabber network.]
 Certaines modifications prendront effet la prochaine fois que vous vous connecterez au réseau Jabber.
 ;file \protocols\JabberG\src\jabber_password.cpp
-[Set New Password for %s@%S]
-
 [New password does not match.]
 Nouveau passe non fonctionnel
 [Current password is incorrect.]
@@ -1543,6 +1475,46 @@ Le passe actuel est incorrect.
 
 [Allow]
 Autoriser
+[List has no rules, empty lists will be deleted then changes applied]
+
+[allow ]
+autoriser\s
+[deny ]
+
+[all.]
+tous.
+[messages]
+Messages
+[ and ]
+ et\s
+[incoming presences]
+
+[outgoing presences]
+
+[queries]
+recherches
+[Else ]
+Sinon\s
+[If Jabber ID is ']
+
+[ (nickname: ]
+
+[If group is ']
+Si le groupe est '
+[If subscription is ']
+
+[then ]
+puis\s
+[ (act., def.)]
+
+[ (active)]
+
+[ (default)]
+ (par défaut)
+[Ready.]
+Prêt.
+[Privacy lists are not saved, discard any changes and exit?]
+
 [Simple mode]
 Mode simple
 [Advanced mode]
@@ -1587,46 +1559,6 @@ Message
 
 [Query]
 
-[List has no rules, empty lists will be deleted then changes applied]
-
-[allow ]
-autoriser\s
-[deny ]
-
-[all.]
-tous.
-[messages]
-Messages
-[ and ]
- et\s
-[incoming presences]
-
-[outgoing presences]
-
-[queries]
-recherches
-[Else ]
-Sinon\s
-[If Jabber ID is ']
-
-[ (nickname: ]
-
-[If group is ']
-Si le groupe est '
-[If subscription is ']
-
-[then ]
-puis\s
-[ (act., def.)]
-
-[ (active)]
-
-[ (default)]
- (par défaut)
-[Ready.]
-Prêt.
-[Privacy lists are not saved, discard any changes and exit?]
-
 [Please save list before activating]
 
 [First, save the list]
@@ -1650,80 +1582,22 @@ Désolé
 
 [No valid OMEMO session exists]
 
-;file \protocols\JabberG\src\jabber_rc.cpp
-[Command completed successfully]
-
-[Error occurred during processing command]
-
-[Set status]
-
-[Set options]
-
-[Forward unread messages]
-
-[Leave group chats]
-
-[Lock workstation]
-
-[Quit Miranda NG]
-Quitter Miranda-IM
-[Change Status]
-Changerl'état
-[Choose the status and status message]
-
-[Status]
-État
-[Extended away (Not available)]
-
-[Invisible]
-Invisible
-[Offline]
-Hors ligne
-[Priority]
-
-[Status message]
-
-[Change global status]
-
-[Set Options]
-
-[Set the desired options]
-
-[Automatically Accept File Transfers]
-
-[Play sounds]
-Jouer des sons
-[Disable remote controlling (check twice what you are doing)]
-
-[There is no messages to forward]
-
-[Forward options]
-
-[%d message(s) to be forwarded]
-%d message(s) à envoyer
-[Mark messages as read]
-
-[%d message(s) forwarded]
-%d message(s) ont été envoyé
-[Workstation successfully locked]
-
-[Error %d occurred during workstation lock]
-
-[Confirmation needed]
-
-[Please confirm Miranda NG shutdown]
-Veuillez confirmer la fermeture de Miranda NG
-[There is no group chats to leave]
+;file \protocols\JabberG\src\jabber_roster.cpp
+[Group]
+Groupe
+[Subscription]
 
-[Choose the group chats you want to leave]
+[Uploading...]
+Mise à jour...
+[Downloading...]
+Télécharge...
+[Connecting...]
+Connexion en cours...
+[XML for MS Excel (UTF-8 encoded)]
 
 ;file \protocols\JabberG\src\jabber_search.cpp
-[Error %s %s\r\nPlease select other server]
-Erreur %s %s\r\nVeuiller choisir un autre serveur
 [Error: unknown reply received\r\nPlease select other server]
 Erreur : réponse inconnue\r\nVeuillez sélectionner un autre serveur
-[Error %s %s\r\nTry to specify more detailed]
-Erreur %s %s\r\nVeuillez indiquer plus de renseignement
 [Search error]
 Erreur dans la recherche
 [Select/type search service URL above and press <Go>]
@@ -1745,6 +1619,8 @@ session chat fermée
 
 [sent unknown presence type]
 
+[Outcast]
+
 [Nick:]
 Pseudo :
 [Status:]
@@ -1762,30 +1638,22 @@ Erreur : Connexion impossible au Serveur
 Erreur : Connexion perdue
 [Requesting registration instruction...]
 
-[Authentication failed for %s@%S.]
-
-[Message redirected from: %s\r\n%s]
+[Registration canceled]
 
 [Sending registration information...]
 Envoi des infos d'enregistrement...
 ;file \protocols\JabberG\src\jabber_userinfo.cpp
-[Resource]
-
 [<not specified>]
 <non spécifié>
+[Resource]
+
 [Software]
 Logiciel
 [Version]
 Version
 [System]
 Système
-[unknown]
-Inconnu
-[Idle since]
-Inactif depuis
-[Client capabilities]
-Capacités du client
-[Software information]
+[Last activity]
 
 [Operating system]
 Système d'exploitation
@@ -1801,26 +1669,14 @@ Version du logiciel
 
 [Tune]
 
-[both]
-les 2
-[to]
-Vers
-[from]
-de
-[none]
-Aucun
 [Last logoff time]
 
 [Uptime]
 
 [Logoff message]
 
-[<no information available>]
-<aucune information disponible>
 [Last active resource]
 
-[Please switch online to see more details.]
-
 [Copy]
 Copier
 [Copy only this value]
@@ -1870,10 +1726,10 @@ Service indisponible
 Délai du serveur distant dépassé
 [Unknown error]
 Erreur inconnue
-[Error]
-Erreur
 [Unknown error message]
 Erreur de message inconnu
+[Offline]
+Hors ligne
 [Advanced Status]
 
 [Set mood...]
diff --git a/langpacks/french/Plugins/LotusNotify.txt b/langpacks/french/Plugins/LotusNotify.txt
index 53393e3c19..d82c325c7f 100644
--- a/langpacks/french/Plugins/LotusNotify.txt
+++ b/langpacks/french/Plugins/LotusNotify.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Notify about new mail in Lotus Database]
 
-;file \plugins\LotusNotify\res\LotusNotify.rc
+;file \protocols\LotusNotify\res\LotusNotify.rc
 [Lotus connection settings]
 
 [Primary server:]
@@ -66,7 +66,7 @@ Texte
 
 [Offline status mean:]
 
-;file \plugins\LotusNotify\src\LotusNotify.cpp
+;file \protocols\LotusNotify\src\LotusNotify.cpp
 [Unable to load all required Lotus API functions]
 
 [Lotus Notes Client not detected. Check plugin configuration description at https://miranda-ng.org/p/LotusNotify]
diff --git a/langpacks/french/Plugins/MSN.txt b/langpacks/french/Plugins/MSN.txt
index 5c1ed07f70..22085728f7 100644
--- a/langpacks/french/Plugins/MSN.txt
+++ b/langpacks/french/Plugins/MSN.txt
@@ -132,8 +132,6 @@ Utilisateur
 [&Deop user]
 
 ;file \protocols\MSN\src\msn_commands.cpp
-[%I64u bytes]
-
 [MSN Alert]
 Alerte MSN
 ;file \protocols\MSN\src\msn_errors.cpp
diff --git a/langpacks/french/Plugins/MenuEx.txt b/langpacks/french/Plugins/MenuEx.txt
index b7bc99a741..17ccedb4a5 100644
--- a/langpacks/french/Plugins/MenuEx.txt
+++ b/langpacks/french/Plugins/MenuEx.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MenuEx.dll
 ;  Plugin: Menu item ext
-;  Version: 1.3.1.0
+;  Version: 1.3.2.0
 ;  Authors: Heiko Schillinger, Baloo, Billy_Bons, Robert Pösel
 ;============================================================
 [Adds some useful options to a contacts menu.]
@@ -20,8 +20,6 @@ Visibilité
 Ignorer
 [Copy to Account (Ctrl+click for move to Account)]
 
-[Request Authorization]
-Demander l'autorisation
 [Browse Received Files]
 Voir Les Fichiers Reçus
 [Copy IP]
@@ -79,14 +77,8 @@ Utilisateur en ligne
 
 [Typing Notify]
 Notification de frappe
-[Please authorize me to add you to my contact list.]
-
-[Do you want to send authorization request\nto new contact?]
-
 [Open ignore settings]
 
-[Request authorization]
-Demander l'autorisation
 [MenuItemEx]
 
 ;file \plugins\MenuItemEx\src\options.cpp
diff --git a/langpacks/french/Plugins/MinecraftDynmap.txt b/langpacks/french/Plugins/MinecraftDynmap.txt
index 9cc5384bdf..b0f57bd9c7 100644
--- a/langpacks/french/Plugins/MinecraftDynmap.txt
+++ b/langpacks/french/Plugins/MinecraftDynmap.txt
@@ -13,8 +13,6 @@ Serveur :
 [Visible name:]
 
 ;file \protocols\MinecraftDynmap\src\chat.cpp
-[Server]
-Serveur
 [Admin]
 
 [Normal]
diff --git a/langpacks/french/Plugins/MirOTR.txt b/langpacks/french/Plugins/MirOTR.txt
index 4c4606595c..b6cb0020ec 100644
--- a/langpacks/french/Plugins/MirOTR.txt
+++ b/langpacks/french/Plugins/MirOTR.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MirOTR.dll
 ;  Plugin: Miranda OTR
-;  Version: 0.14.1.17
+;  Version: 0.14.2.1
 ;  Authors: ProgAndy & CHEF-KOCH
 ;============================================================
 [OTR (Off-the-Record) plugin for Miranda NG (using some code and ideas from SecureIM, Pidgin-OTR and old Miranda OTR (by SJE)).]
@@ -80,6 +80,17 @@ Jamais
 
 [&Verify Fingerprint]
 
+;file \plugins\MirOTR\src\icons.cpp
+[OTR private]
+
+[OTR unverified]
+
+[OTR finished]
+
+[OTR not secure]
+
+[Refresh]
+Actualiser
 ;file \plugins\MirOTR\src\language.h
 [Start OTR]
 Cryptage OTR
@@ -99,8 +110,6 @@ Non
 
 [OTR Encryption: Finished]
 
-[&Convert HTML (for Pidgin)]
-
 [OTR encrypted session with '%s' has been terminated]
 
 [Requesting OTR encrypted session with '%s']
@@ -131,16 +140,6 @@ TOR - Informations
 
 [OTR encrypted session with '%s' is now using a NOT VERIFIED fingerprint]
 
-[OTR unverified]
-
-[OTR finished]
-
-[OTR private]
-
-[OTR not secure]
-
-[Refresh]
-Actualiser
 [Generating new private key for protocol '%s'.\nPlease Wait...]
 
 [General]
@@ -236,6 +235,8 @@ Mot de passe
 
 [OTR Status]
 
+[&Convert HTML (for Pidgin)]
+
 ;file \plugins\MirOTR\src\options.cpp
 [Private Data]
 
diff --git a/langpacks/french/Plugins/MirandaG15.txt b/langpacks/french/Plugins/MirandaG15.txt
index ef96492c23..d4d8c4b585 100644
--- a/langpacks/french/Plugins/MirandaG15.txt
+++ b/langpacks/french/Plugins/MirandaG15.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MirandaG15.dll
 ;  Plugin: MirandaG15
-;  Version: 0.1.2.0
+;  Version: 0.1.2.1
 ;  Authors: Martin Kleinhans
 ;============================================================
 [Provides an interface to use Miranda from the LCD of various Logitech devices.]
diff --git a/langpacks/french/Plugins/MsgPopup.txt b/langpacks/french/Plugins/MsgPopup.txt
index 3240c06dad..157a4d25e3 100644
--- a/langpacks/french/Plugins/MsgPopup.txt
+++ b/langpacks/french/Plugins/MsgPopup.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MsgPopup.dll
 ;  Plugin: Message popup
-;  Version: 0.1.2.1
+;  Version: 0.1.2.2
 ;  Authors: StDenis
 ;============================================================
 [Plugin replaces message boxes (those having only OK button) with popups.]
diff --git a/langpacks/french/Plugins/NewsAggregator.txt b/langpacks/french/Plugins/NewsAggregator.txt
index f1c860df64..09a1f02e8d 100644
--- a/langpacks/french/Plugins/NewsAggregator.txt
+++ b/langpacks/french/Plugins/NewsAggregator.txt
@@ -2,12 +2,12 @@
 ;============================================================
 ;  File: NewsAggregator.dll
 ;  Plugin: News aggregator
-;  Version: 0.1.0.4
+;  Version: 0.1.0.5
 ;  Authors: Mataes, FREAK_THEMIGHTY
 ;============================================================
 [RSS/Atom news aggregator.]
 
-;file \plugins\NewsAggregator\Res\Resource.rc
+;file \protocols\NewsAggregator\Res\Resource.rc
 [Add]
 Ajouter
 [Change]
@@ -72,14 +72,14 @@ ID
 
 [&Import]
 
-;file \plugins\NewsAggregator\Src\Authentication.cpp
+;file \protocols\NewsAggregator\Src\Authentication.cpp
 [Enter your username]
 
 [Error]
 Erreur
 [Enter your password]
 
-;file \plugins\NewsAggregator\Src\CheckFeed.cpp
+;file \protocols\NewsAggregator\Src\CheckFeed.cpp
 [%s\nis a valid feed's address.]
 %s\nest une adresse de flux valide.
 [News Aggregator]
@@ -88,7 +88,7 @@ Erreur
 
 [empty]
 
-;file \plugins\NewsAggregator\Src\Icons.cpp
+;file \protocols\NewsAggregator\Src\Icons.cpp
 [Protocol icon]
 
 [Check All Feeds]
@@ -103,13 +103,13 @@ Erreur
 
 [Auto Update Disabled]
 
-;file \plugins\NewsAggregator\Src\Menus.cpp
+;file \protocols\NewsAggregator\Src\Menus.cpp
 [Check feed]
 
 [Change feed]
 
-;file \plugins\NewsAggregator\Src\NewsAggregator.cpp
-;file \plugins\NewsAggregator\Src\Options.cpp
+;file \protocols\NewsAggregator\Src\NewsAggregator.cpp
+;file \protocols\NewsAggregator\Src\Options.cpp
 [OPML files]
 
 [Not valid import file.]
@@ -154,11 +154,11 @@ Flux
 
 [Network]
 Réseau
-;file \plugins\NewsAggregator\Src\Services.cpp
+;file \protocols\NewsAggregator\Src\Services.cpp
 [Avatars]
 Avatars
 [Enable/disable auto update]
 
-;file \plugins\NewsAggregator\Src\Utils.cpp
+;file \protocols\NewsAggregator\Src\Utils.cpp
 [NewsAggregator HTTP connections]
 Connexions HTTP de NewsAggregator
diff --git a/langpacks/french/Plugins/NimContact.txt b/langpacks/french/Plugins/NimContact.txt
index 43bc9b2948..37c720f756 100644
--- a/langpacks/french/Plugins/NimContact.txt
+++ b/langpacks/french/Plugins/NimContact.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Non-IM Contact allows you to add 'contacts' that can act as shortcuts to other programs, or links to web pages.\r\nThe contacts name can be read from a text file (includes any ASCII file).\r\nThis plugin is a combination of Favorites and Text Reader plugins both made by me)]
 
-;file \plugins\Non-IM Contact\res\resource.rc
+;file \protocols\Non-IM Contact\res\resource.rc
 [View/Edit Files]
 Voir/Éditer les fichiers
 [Add File]
@@ -108,7 +108,7 @@ Copier/Exporter le contact
 
 [EXAMPLE: %fn1,%fn2]
 EXEMPLE : %fn1,%fn2
-;file \plugins\Non-IM Contact\src\contactinfo.cpp
+;file \protocols\Non-IM Contact\src\contactinfo.cpp
 [Select Folder]
 Sélectionnez un répertoire
 [Non-IM Contact protocol timer is Disabled]
@@ -117,7 +117,7 @@ Sélectionnez un répertoire
 
 [New Non-IM Contact]
 Nouveau contact non-IM
-;file \plugins\Non-IM Contact\src\dialog.cpp
+;file \protocols\Non-IM Contact\src\dialog.cpp
 [String replacing variables...\r\nThe following are all the valid variables that can be used. Refer to the wiki.miranda-ng.org for a proper explanation.\r\n\r\nfile(X)\t\t<- specifies the file to read from. MUST be followed by either start() or end() or wholeline()\r\nfilename(X)\t<- copies the filename of file X.\r\nstart(...)\t\t<- specifies where to start copying from.\r\nend(...)\t\t<- specifies where to stop copying.\r\nwholeline(line(...))\t<- specifies a whole line to copy\r\n\r\nstart() and end() explained\r\n.........................\r\nMUST start with line() followed by a number or a string inside " marks, OR csv(separatorX) variable. The number specifies which character in the line to start/end copying. The string specifies a string in the line to start/end copying.\r\n\r\ncsv(seperatorX) explained...\r\nSeperator is either "tab" or "space" or any SINGLE character. X is the Xth separator to pass before copying, (or to stop before).\r\n\r\nLastly the line(...) variable...\r\nInside the brackets must be either a number (to specify the line number), or a string inside " marks (to use the line with that string), or lastline(X). The X in lastline is the Xth line above the last line, i.e., lastline(1) will use the 2nd last line of the file. If searching for a line with "some words" you may put a + or - X after the closing ), i.e., line("some words")+3 to go 3 lines after the line with "some words".\r\n\r\nSome examples...\r\nfilename(0)    <- will display the filename of the 0th file\r\nfile(0)wholeline(line(0)))    <- will display the whole first line of the 0th file\r\nfile(0)wholeline(line("hello")-1)))    <- the wholeline above the first occurrence of "hello" in the file\r\nfile(0)start(line(lastline(1))csv(tab2))end(line(lastline())csv(tab4)))    <- starts at the 2nd last line of the file, from the 2nd tab variable, until the 4th tab variable in the last line (in the 0th file)\r\nfile(0)start(line("hello")+1"zzzz")end(line(6)17))    <- starts from the first occurrence of zzzz in the line after the first occurrence of hello, until the 17th character in the 6th line (starting from line 0) of the 0th file.\r\n]
 
 [Contacts Display Info]
@@ -130,7 +130,7 @@ Nouveau contact non-IM
 Fichiers
 [Edit Non-IM Contact "%s"]
 
-;file \plugins\Non-IM Contact\src\files.cpp
+;file \protocols\Non-IM Contact\src\files.cpp
 [Do you want to overwrite the contents of the file?\r\n\r\nPressing No will append these contacts to the end of the file.]
 
 [File couldn't be opened]
@@ -139,10 +139,10 @@ Impossible d'ouvrir le fichier
 Impossible d'ouvrir le fichier,2
 [line(%-3d) = | %s]
 ligne(%-3d) = | %s
-;file \plugins\Non-IM Contact\src\http.cpp
+;file \protocols\Non-IM Contact\src\http.cpp
 [Non-IM Contacts]
 
-;file \plugins\Non-IM Contact\src\main.cpp
+;file \protocols\Non-IM Contact\src\main.cpp
 [Plugins]
 Plugins
 [Main Icon]
@@ -163,7 +163,7 @@ Plugins
 
 [E&dit Contact Settings]
 Modifier les réglages du contact
-;file \plugins\Non-IM Contact\src\namereplacing.cpp
+;file \protocols\Non-IM Contact\src\namereplacing.cpp
 [%s - ERROR: no line specified or line not found (in %s)]
 
 [%s - ERROR: file couldn't be opened (in %s)]
diff --git a/langpacks/french/Plugins/NotesReminders.txt b/langpacks/french/Plugins/NotesReminders.txt
index 8fd16f4e70..4b0512e030 100644
--- a/langpacks/french/Plugins/NotesReminders.txt
+++ b/langpacks/french/Plugins/NotesReminders.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: NotesReminders.dll
 ;  Plugin: Sticky Notes & Reminders
-;  Version: 0.1.0.1
+;  Version: 0.2.0.2
 ;  Authors: Joe Kucera, Lubomir Kolev Ivanov, Georg Fischer
 ;============================================================
 [Sticky Notes & Reminders Implementation for Miranda NG.]
@@ -50,12 +50,12 @@ Envoyer les Rappels par Courriel/SMS :
 
 [Add Reminder]
 Ajout d'un Rappel
-[Trigger On Time && Date:]
-Heure && Date d'alerte :
 [Date]
 
 [Time]
 Heure
+[Repeat each day]
+
 [Reminder Note:]
 Note de Rappel :
 [None]
@@ -102,8 +102,6 @@ Ajouter
 
 [D&elete All Reminders]
 
-[Context Menu Note Popup]
-
 [&Hide Note]
 
 [&Always On Top]
@@ -152,9 +150,6 @@ Co&uper
 
 [&Show / Hide Notes]
 &Afficher / Cacher les Notes
-;file \plugins\NotesAndReminders\src\globals.h
-[Notes & Reminders]
-Notes & Rappels
 ;file \plugins\NotesAndReminders\src\hotkeys.cpp
 [New Note]
 
@@ -165,10 +160,6 @@ Notes & Rappels
 [New Reminder]
 
 ;file \plugins\NotesAndReminders\src\main.cpp
-[Are you sure you want to delete all notes?]
-
-[Are you sure you want to delete all reminders?]
-
 [Delete All Notes]
 
 [Show/Hide Notes]
@@ -195,20 +186,10 @@ supprimer tous les rappels
 
 [Sticky Notes]
 
-[Plugins]
-Plugins
 [Add New Note]
 Ajouter une note
 [Add New Reminder]
 Nouveau rappel
-[Alerts]
-Notifications
-[Reminder triggered]
-
-[Reminder triggered (Alternative 1)]
-
-[Reminder triggered (Alternative 2)]
-
 [Notes && Reminders]
 Notes && Rappels
 [New &Note]
@@ -221,6 +202,14 @@ Notes && Rappels
 
 [Miranda could not load the Notes & Reminders plugin, Msftedit.dll is missing. If you are using WINE, please make sure you have Msftedit.dll installed. Press 'Yes' to continue loading Miranda.]
 
+[Alerts]
+Notifications
+[Reminder triggered]
+
+[Reminder triggered (Alternative 1)]
+
+[Reminder triggered (Alternative 2)]
+
 ;file \plugins\NotesAndReminders\src\notes.cpp
 [Black]
 
@@ -268,6 +257,8 @@ Notes
 Note/Info
 [Date/Title]
 
+[Are you sure you want to delete all notes?]
+
 ;file \plugins\NotesAndReminders\src\options.cpp
 [Sticky Note Caption]
 
@@ -279,11 +270,17 @@ Note/Info
 
 [Select Executable]
 
+[Plugins]
+Plugins
 ;file \plugins\NotesAndReminders\src\reminders.cpp
 [Minutes]
 Minutes
 [Hours]
 Heures
+[The specified time is invalid due to begin of daylight saving (summer time).]
+
+[The specified time is invalid.]
+
 [Hour]
 
 [Day]
@@ -292,10 +289,6 @@ jour
 Jours
 [Week]
 
-[The specified time is invalid due to begin of daylight saving (summer time).]
-
-[The specified time is invalid.]
-
 [The specified time offset is invalid.]
 
 [&Update Reminder]
@@ -316,5 +309,10 @@ Défaut
 Texte du rappel
 [Date of activation]
 Date d'activation
+[Are you sure you want to delete all reminders?]
+
 [Are you sure you want to delete this reminder?]
 
+;file \plugins\NotesAndReminders\src\stdafx.h
+[Notes & Reminders]
+Notes & Rappels
diff --git a/langpacks/french/Plugins/PasteIt.txt b/langpacks/french/Plugins/PasteIt.txt
index c26a4578f3..f019ce2e6f 100644
--- a/langpacks/french/Plugins/PasteIt.txt
+++ b/langpacks/french/Plugins/PasteIt.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: PasteIt.dll
 ;  Plugin: Paste it
-;  Version: 1.0.0.3
+;  Version: 1.0.0.4
 ;  Authors: Krzysztof Kral
 ;============================================================
 [Uploads the text to web page and sends the URL to your friends.]
@@ -142,12 +142,12 @@ Ne peut pas ouvrir le fichier '%s'
 [File '%s' is empty]
 Le fichier '%s' est vide
 ;file \plugins\PasteIt\src\PasteToWeb1.cpp
-[Error during sending text to web page: %s]
-Erreur lors de l'envoi du texte à la page Web : %s
+[Error during sending text to web page: %S]
+Erreur lors de l'envoi du texte à la page Web : %S
 [Error during sending text to web page]
 Erreur lors de l'envoi de texte à la page Web
-[Error during getting user key from web page: %s]
-Erreur lors de l'obtention de la clé d'utilisateur : %s
+[Error during getting user key from web page: %S]
+Erreur lors de l'obtention de la clé d'utilisateur : %S
 [Paste expire date]
 Date d'expiration
 [Never]
diff --git a/langpacks/french/Plugins/PluginUpdater.txt b/langpacks/french/Plugins/PluginUpdater.txt
index 30d2ba7bf0..fe3dbafd2f 100644
--- a/langpacks/french/Plugins/PluginUpdater.txt
+++ b/langpacks/french/Plugins/PluginUpdater.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: PluginUpdater.dll
 ;  Plugin: Plugin updater
-;  Version: 0.2.0.2
+;  Version: 0.2.0.3
 ;  Authors: Mataes, George Hazan
 ;============================================================
 [Installs and updates plugins and other Miranda NG components.]
diff --git a/langpacks/french/Plugins/PopupPlus.txt b/langpacks/french/Plugins/PopupPlus.txt
index 4f8df6cbad..f57a5d8b71 100644
--- a/langpacks/french/Plugins/PopupPlus.txt
+++ b/langpacks/french/Plugins/PopupPlus.txt
@@ -1,6 +1,6 @@
 #muuid {26a9125d-7863-4e01-af0e-d14ef95c5054}
 ;============================================================
-;  File: Popup.dll
+;  File: PopupPlus.dll
 ;  Plugin: Popup plus
 ;  Version: 2.1.1.15
 ;  Authors: MPK, Merlin_de (Luca Santarelli, Victor Pavlychko)
@@ -82,7 +82,7 @@ Paramètre du skin
 Aperçu
 [Download more skins]
 
-[Popup History]
+[Popup history]
 Historique des popups
 [Desktop]
 
@@ -263,15 +263,11 @@ Bordures
 [Avatar border]
 
 ;file \plugins\Popup\src\history.cpp
-[Popup History is disabled]
+[Popup history is disabled]
 
-[Popup History message]
+[Popup history message]
 
 ;file \plugins\Popup\src\icons.cpp
-[Popups are enabled]
-
-[Popups are disabled]
-
 [With "favorite" overlay]
 
 [With "fullscreen" overlay]
@@ -309,13 +305,13 @@ Actions
 Contacts
 [Advanced]
 Avancé
-[Toggle Popups]
+[Toggle popups]
 
-[Enable Popups]
+[Enable popups]
 
-[Disable Popups]
+[Disable popups]
 
-[Popup Plus]
+[Popup plus]
 
 [Error: I could not register the Popup Window class.\r\nThe plugin will not operate.]
 
diff --git a/langpacks/french/Plugins/SkypeWeb.txt b/langpacks/french/Plugins/SkypeWeb.txt
index 6b2f0d781d..383e4449b4 100644
--- a/langpacks/french/Plugins/SkypeWeb.txt
+++ b/langpacks/french/Plugins/SkypeWeb.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: SkypeWeb.dll
 ;  Plugin: Skype protocol (Web)
-;  Version: 0.12.3.1
+;  Version: 0.12.3.3
 ;  Authors: Miranda NG team
 ;============================================================
 [Skype protocol support for Miranda NG. Based on new Skype for Web.]
diff --git a/langpacks/french/Plugins/SmileyAdd.txt b/langpacks/french/Plugins/SmileyAdd.txt
index 7ba8c150d7..aa7fdd0670 100644
--- a/langpacks/french/Plugins/SmileyAdd.txt
+++ b/langpacks/french/Plugins/SmileyAdd.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: SmileyAdd.dll
 ;  Plugin: SmileyAdd
-;  Version: 0.3.1.0
+;  Version: 0.3.1.1
 ;  Authors: Peacow, nightwish, bid, borkra
 ;============================================================
 [Smiley support for Miranda NG.]
diff --git a/langpacks/french/Plugins/StatusManager.txt b/langpacks/french/Plugins/StatusManager.txt
index b939e99f96..0a257725f6 100644
--- a/langpacks/french/Plugins/StatusManager.txt
+++ b/langpacks/french/Plugins/StatusManager.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: StatusManager.dll
 ;  Plugin: Status manager
-;  Version: 1.2.0.4
+;  Version: 1.2.0.5
 ;  Authors: P Boon
 ;============================================================
 [A connection checker and auto away module. Also allows you to define the status Miranda should set on startup, configurable per protocol.]
diff --git a/langpacks/french/Plugins/TabSRMM.txt b/langpacks/french/Plugins/TabSRMM.txt
index 5cac6fd9bb..b7c622d8c9 100644
--- a/langpacks/french/Plugins/TabSRMM.txt
+++ b/langpacks/french/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: TabSRMM.dll
 ;  Plugin: TabSRMM
-;  Version: 3.5.0.12
+;  Version: 3.5.0.13
 ;  Authors: The Miranda developers team and contributors
 ;============================================================
 [IM and group chat module for Miranda NG.]
@@ -178,8 +178,6 @@ Chats
 Erreurs
 [Use the message log color theme for group chat popups]
 
-[No compatible popup plugin was found. The event notification\nsystem is not available.]
-
 [Dialog]
 Dialogue
 [Cancel]
@@ -1697,10 +1695,6 @@ Historique récent
 
 [Feature enabled (used as overlay)]
 
-[Enable typing notification]
-
-[Disable typing notification]
-
 ;file \plugins\TabSRMM\src\msgs.h
 [Message windows - IM]
 
@@ -1984,10 +1978,10 @@ Ajouter les contacts hors ligne à la liste de l'envoi groupé
 Désactiver la &notification de frappe
 [Enable &typing notification]
 Activer la &notification de frappe
-[...is typing a message.]
-... vous écrit un message.
 [...has stopped typing.]
 ... n'écrit plus.
+[...is typing a message.]
+... vous écrit un message.
 [Contact started typing]
 
 [Contact stopped typing]
diff --git a/langpacks/french/Plugins/UInfoEx.txt b/langpacks/french/Plugins/UInfoEx.txt
index 14d70b47e4..7621143113 100644
--- a/langpacks/french/Plugins/UInfoEx.txt
+++ b/langpacks/french/Plugins/UInfoEx.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: UInfoEx.dll
 ;  Plugin: User info ext
-;  Version: 0.8.5.1
+;  Version: 0.8.5.2
 ;  Authors: DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
 ;============================================================
 [Extended UserInfo module for Miranda NG. Provides interface to edit all contact information.]
@@ -1110,11 +1110,9 @@ Voir la page web
 
 [Abort Refreshing Contact Details]
 
-[Do you want to cancel the current refresh procedure?]
-
 [Miranda must be online for refreshing contact information!]
 
-[The function caused an exception!]
+[Do you want to cancel the current refresh procedure?]
 
 ;file \plugins\UserInfoEx\src\svc_reminder.cpp
 [%s has %s today.]
@@ -1216,16 +1214,8 @@ Importer les détails depuis un vCard
 ;file \plugins\UserInfoEx\src\ex_import\svc_ExImXML.cpp
 [Can't create xml file!\n%S]
 
-[Export took %f ms]
-
 [Contact: %s (%S)]
 Contact : %s (%S)
-[Importing %s caused error %d]
-
-[Loading contact %s from xml failed with error %d]
-
-[Importing Owner caused error %d]
-
 [Parser is unable to load XMLCard "%s"\nError: %d\nDescription: %s]
 
 [The selected file is no valid XMLCard]
@@ -1238,12 +1228,8 @@ Terminé
 
 [Selected XMLCard does not contain an owner contact!]
 
-[Import took %f ms]
-
 [added contacts: %u / %u\nadded settings: %u / %u\nadded events %u / %u\nduplicated events: %u]
 
-[FATAL: An exception was thrown while importing contacts from xmlCard!]
-
 ;file \plugins\UserInfoEx\src\Flags\svc_flags.cpp
 [Flags (UInfoEx)]
 
diff --git a/langpacks/french/Plugins/VKontakte.txt b/langpacks/french/Plugins/VKontakte.txt
index cc300558eb..abbc479a4b 100644
--- a/langpacks/french/Plugins/VKontakte.txt
+++ b/langpacks/french/Plugins/VKontakte.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: VKontakte.dll
 ;  Plugin: VKontakte protocol
-;  Version: 0.1.8.1
+;  Version: 0.1.9.0
 ;  Authors: Miranda NG team
 ;============================================================
 [VKontakte protocol support for Miranda NG.]
diff --git a/langpacks/french/Plugins/Weather.txt b/langpacks/french/Plugins/Weather.txt
index 9c1f03073a..8447a296ef 100644
--- a/langpacks/french/Plugins/Weather.txt
+++ b/langpacks/french/Plugins/Weather.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Retrieves weather information and displays it in your contact list.]
 
-;file \plugins\Weather\res\resource.rc
+;file \protocols\Weather\res\resource.rc
 [Update]
 Mise à jour
 [Brief Info]
@@ -254,7 +254,7 @@ Voir détails utilisateur
 Anciens réglages
 [To default]
 Par défaut
-;file \plugins\Weather\src\stdafx.h
+;file \protocols\Weather\src\stdafx.h
 [N/A]
 
 [Invalid ID format, missing "/" (10)]
@@ -337,7 +337,7 @@ Voici la liste des variables actuellement disponibles :
 L'adresse pour le forcast complet n'a pas été réglé. Vous pouvez le régler dans 'Modifier les réglages'.
 [The URL for weather map has not been set. You can set it from the Edit Settings dialog.]
 L'adresse pour la carte météo n'a pas été renseignées. Vous pouvez y remédier dans le menu d'édition des paramètres.
-;file \plugins\Weather\src\weather.cpp
+;file \protocols\Weather\src\weather.cpp
 [Enable/disable auto update]
 
 [Auto Update Enabled]
@@ -348,7 +348,7 @@ L'adresse pour la carte météo n'a pas été renseignées. Vous pouvez y reméd
 Conditions météo changées
 [Alert Issued]
 Alerte météo publiée
-;file \plugins\Weather\src\weather_addstn.cpp
+;file \protocols\Weather\src\weather_addstn.cpp
 [Current weather information for %s.]
 Information météo en cours pour %s.
 [%s is now the default weather station]
@@ -361,7 +361,7 @@ Veuillez recommencer après la MAJ terminée.
 <Entrez le nom de la Station>
 [<Enter station ID here>]
 <Entrez l'ID de la Station>
-;file \plugins\Weather\src\weather_contacts.cpp
+;file \protocols\Weather\src\weather_contacts.cpp
 [Weather condition was not logged.]
 Les conditions météo n'ont pas été enregistrées.
 [Get city name from ID]
@@ -378,7 +378,7 @@ Paramètres par défaut
 Fichiers txt
 [All Files]
 Tous les fichiers
-;file \plugins\Weather\src\weather_conv.cpp
+;file \protocols\Weather\src\weather_conv.cpp
 [mb]
 Mo
 [in]
@@ -391,15 +391,15 @@ Entrée
 <Erreur>
 [HTTP Error %i]
 Erreur HTTP %i
-;file \plugins\Weather\src\weather_data.cpp
+;file \protocols\Weather\src\weather_data.cpp
 [<Enter city name here>]
 <Entrez la ville ici>
 [Error when obtaining data: %s]
 Erreur à l'obtention des données : %s
-;file \plugins\Weather\src\weather_http.cpp
+;file \protocols\Weather\src\weather_http.cpp
 [Weather HTTP connections]
 Connexions HTTP de Weather
-;file \plugins\Weather\src\weather_icons.cpp
+;file \protocols\Weather\src\weather_icons.cpp
 [Protocol icon]
 
 [Update Disabled]
@@ -420,7 +420,7 @@ Connexions HTTP de Weather
 
 [Edit Settings]
 
-;file \plugins\Weather\src\weather_info.cpp
+;file \protocols\Weather\src\weather_info.cpp
 [Name]
 Nom
 [Author]
@@ -459,21 +459,21 @@ Mémoire utilisée :
 octets
 [Description:]
 Description :
-;file \plugins\Weather\src\weather_ini.cpp
+;file \protocols\Weather\src\weather_ini.cpp
 [All update data has been reloaded.]
 Toutes les données ont bien été mise à jour.
 [Invalid ini format for: %s]
 Format ini invalide de : %s
 [No update data file is found. Please check your Plugins\\Weather directory.]
 Aucun fichier de mise à jour trouvé. Vérifiez le dossier Plugins\\Weather.
-;file \plugins\Weather\src\weather_mwin.cpp
+;file \protocols\Weather\src\weather_mwin.cpp
 [Frame Font]
 
 [Frame Title Font]
 
 [Frame Background]
 
-;file \plugins\Weather\src\weather_opt.cpp
+;file \protocols\Weather\src\weather_opt.cpp
 [Weather Protocol Text Preview]
 Prévisualisation de Weather Protocole
 [Network]
@@ -484,8 +484,8 @@ Général
 
 [Popups]
 Popups
-;file \plugins\Weather\src\weather_popup.cpp
-;file \plugins\Weather\src\weather_svcs.cpp
+;file \protocols\Weather\src\weather_popup.cpp
+;file \protocols\Weather\src\weather_svcs.cpp
 [Station ID]
 Identifiant de la station
 [Disable &weather notification]
@@ -512,10 +512,10 @@ Effacer les anciennes données lors d'une MAJ totale
 Notification de Weather
 [Display in a frame]
 
-;file \plugins\Weather\src\weather_update.cpp
+;file \protocols\Weather\src\weather_update.cpp
 [Unable to retrieve weather information for %s]
 Impossible de retrouver la météo de %s
-;file \plugins\Weather\src\weather_userinfo.cpp
+;file \protocols\Weather\src\weather_userinfo.cpp
 [Variable]
 
 [Information]
diff --git a/langpacks/french/Plugins/WebView.txt b/langpacks/french/Plugins/WebView.txt
index ca8659eae5..ef91c98e95 100644
--- a/langpacks/french/Plugins/WebView.txt
+++ b/langpacks/french/Plugins/WebView.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Adds web pages as contacts to your contact list and can display text and/or issue change alerts from those pages in a window.]
 
-;file \plugins\WebView\res\webview.rc
+;file \protocols\WebView\res\webview.rc
 [Webview]
 
 [Update data every]
@@ -180,7 +180,7 @@ C&oller
 
 [C&lear all]
 
-;file \plugins\WebView\src\main.cpp
+;file \protocols\WebView\src\main.cpp
 [Alert event]
 
 [Auto update disabled]
@@ -207,14 +207,14 @@ C&oller
 
 [Stop data processing]
 
-;file \plugins\WebView\src\webview.cpp
+;file \protocols\WebView\src\webview.cpp
 [All Webview sites have been updated.]
 
 [Network]
 Réseau
 [Popups]
 Popups
-;file \plugins\WebView\src\webview_alerts.cpp
+;file \protocols\WebView\src\webview_alerts.cpp
 [Cannot write to file]
 
 [Last updated on]
@@ -245,7 +245,7 @@ Popups
 
 [Loaded from cache]
 
-;file \plugins\WebView\src\webview_datawnd.cpp
+;file \protocols\WebView\src\webview_datawnd.cpp
 [ERROR: You have two or more Webview contacts with the same URL and contact name.]
 
 [Alert options]
@@ -258,7 +258,7 @@ Popups
 
 [Disable stick to the front]
 
-;file \plugins\WebView\src\webview_getdata.cpp
+;file \protocols\WebView\src\webview_getdata.cpp
 [URL not supplied]
 
 [Download in progress, please wait...]
@@ -305,7 +305,7 @@ En ligne
 
 [Alert test conditions not met; press the refresh button to view content.]
 
-;file \plugins\WebView\src\webview_opts.cpp
+;file \protocols\WebView\src\webview_opts.cpp
 [No whitespace removal]
 
 [Minimal level of whitespace removal]
@@ -342,7 +342,7 @@ En ligne
 
 [Invalid symbol present in contact name.]
 
-;file \plugins\WebView\src\webview_services.cpp
+;file \protocols\WebView\src\webview_services.cpp
 [Cache folder does not exist.]
 
 [Missing "psite.bat" file.]
diff --git a/langpacks/french/Plugins/WhoUsesMyFiles.txt b/langpacks/french/Plugins/WhoUsesMyFiles.txt
index b72225d82d..5e215594b1 100644
--- a/langpacks/french/Plugins/WhoUsesMyFiles.txt
+++ b/langpacks/french/Plugins/WhoUsesMyFiles.txt
@@ -55,12 +55,10 @@ Utiliser les couleurs de Windows
 [Show current connections]
 
 ;file \plugins\WhoUsesMyFiles\src\options.cpp
-[Popup plugin not found!]
+[Common Dialog Error 0x%lx]
 
 [Error]
 Erreur
-[Common Dialog Error 0x%lx]
-
 [Not implemented yet...]
 
 [Who uses my files]
diff --git a/langpacks/french/Plugins/YAMN.txt b/langpacks/french/Plugins/YAMN.txt
index f03dbc4a30..90ed882c04 100644
--- a/langpacks/french/Plugins/YAMN.txt
+++ b/langpacks/french/Plugins/YAMN.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Mail notifier and browser for Miranda NG. Included POP3 protocol.]
 
-;file \plugins\YAMN\res\YAMN.rc
+;file \protocols\YAMN\res\YAMN.rc
 [Installed plugins]
 Plugins installés
 [Version:]
@@ -156,7 +156,7 @@ Aperçu
 Couleur de fond
 [Text color]
 Couleur du texte
-;file \plugins\YAMN\src\main.cpp
+;file \protocols\YAMN\src\main.cpp
 [Check &mail (All Account)]
 Relever les e-mail (tous les comptes)
 [Check &mail (This Account)]
@@ -171,17 +171,17 @@ Lancer le programme
 Vérif. des messages
 [Connect Fail]
 Échec de la connexion
-;file \plugins\YAMN\src\main.h
+;file \protocols\YAMN\src\main.h
 [New mail message]
 Nouvel e-mail
 [Connect failed]
 Échec connexion
-;file \plugins\YAMN\src\services.cpp
+;file \protocols\YAMN\src\services.cpp
 [Nick]
 Pseudo
 [No new mail message]
 Pas de nouveaux e-mail
-;file \plugins\YAMN\src\browser\badconnect.cpp
+;file \protocols\YAMN\src\browser\badconnect.cpp
 [%s - connection error]
 
 [An error occurred. Error code: %d]
@@ -190,7 +190,7 @@ Pas de nouveaux e-mail
 Erreur inconnue
 [ - connection error]
  - échec de connexion
-;file \plugins\YAMN\src\browser\mailbrowser.cpp
+;file \protocols\YAMN\src\browser\mailbrowser.cpp
 [%s - %d new mail messages, %d total]
 %s - %d nouveaux e-mail, %d au total
 [%s : %d new mail message(s), %d total]
@@ -229,15 +229,15 @@ Taille
 Voulez-vous vraiment supprimer les %d e-mails sélectionnés ?
 [Delete confirmation]
 Confirmer la suppression
-;file \plugins\YAMN\src\mails\mime.cpp
+;file \protocols\YAMN\src\mails\mime.cpp
 [Translate header error]
 
 [Part]
 
-;file \plugins\YAMN\src\proto\netlib.cpp
+;file \protocols\YAMN\src\proto\netlib.cpp
 [%s connection]
 
-;file \plugins\YAMN\src\proto\pop3\pop3comm.cpp
+;file \protocols\YAMN\src\proto\pop3\pop3comm.cpp
 [Disconnected]
 Déconnecté
 [POP3 protocol (internal)]
@@ -314,7 +314,7 @@ Le serveur rejette la connexion SSL.
 Lecture de données SSL impossible.
 [Error %d-%d-%d-%d:]
 Erreur %d-%d-%d-%d :
-;file \plugins\YAMN\src\proto\pop3\pop3opt.cpp
+;file \protocols\YAMN\src\proto\pop3\pop3opt.cpp
 [Network]
 Réseau
 [Accounts]
diff --git a/langpacks/french/Untranslated/=CORE=.txt b/langpacks/french/Untranslated/=CORE=.txt
index 10587f7b45..437653e896 100644
--- a/langpacks/french/Untranslated/=CORE=.txt
+++ b/langpacks/french/Untranslated/=CORE=.txt
@@ -1,6 +1,17 @@
 [Enable docking]
 [Send message on 'Ctrl+Enter']
 [(Setting timeout to 0 means default setting and -1 means indefinite time)]
+[Default timeout]
+[Opacity (%):]
+[Round corners (window)]
+[Avatar size:]
+[Global hover]
+[Sidebar width:]
+[Text indent:]
+[Padding:]
+[Round corners (avatar)]
+[Text color:]
+[Set timeout]
 [Use custom login (domain login picked up automatically)]
 [Insert submenu]
 [Error notifications]
@@ -44,6 +55,26 @@
 [Message send error]
 [Contact started typing]
 [Contact stopped typing]
+[Popups are enabled]
+[Popups are disabled]
+[Bottom right]
+[Bottom left]
+[Top right]
+[Top left]
+[Icon on left]
+[Icon on right]
+[No avatar]
+[Left avatar]
+[Right avatar]
+[No animate]
+[Horizontal animate]
+[Vertical animate]
+[Classes]
+[Disable popups]
+[Enable popups]
+[Toggle popups]
+[Sidebar]
+[Title underline]
 [Client cannot decode host message. Possible causes: host does not support SSL or requires not existing security package]
 [Host we are connecting to is not the one certificate was issued for]
 [Single]
@@ -151,9 +182,9 @@
 [Account name must be filled.]
 [Account error]
 [Icon sets]
-[Unused]
 [On]
 [Off]
+[Unused]
 [Add group]
 [Unselect all]
 [Western Sahara]
diff --git a/langpacks/french/Untranslated/Actman.txt b/langpacks/french/Untranslated/Actman.txt
index b9bd585570..0ebc502fec 100644
--- a/langpacks/french/Untranslated/Actman.txt
+++ b/langpacks/french/Untranslated/Actman.txt
@@ -265,13 +265,13 @@
 [with confirmation]
 [without confirmation]
 [Empty updater download folder]
-[Popup Plus (popup.dll) latest YAPP (yapp.dll)]
-[Enables or disables Popup windows]
+[Popup plus (PopupPlus.dll) latest StdPopup (StdPopup.dll)]
+[Enables or disables popup windows]
 [Notify]
-[YAPP or Popup]
+[StdPopup or Popup plus]
 [Popup window]
 [Unicode Text]
-[Enables or disables Popup windows (maybe deprecated)]
+[Enables or disables popup windows (maybe deprecated)]
 [result of protocol service call]
 [Send a general request through the protocol chain for a contact]
 [str, account name]
diff --git a/langpacks/french/Untranslated/ChangeKeyboardLayout.txt b/langpacks/french/Untranslated/ChangeKeyboardLayout.txt
index cfbe9ebe5d..d6c3db471d 100644
--- a/langpacks/french/Untranslated/ChangeKeyboardLayout.txt
+++ b/langpacks/french/Untranslated/ChangeKeyboardLayout.txt
@@ -18,5 +18,4 @@
 [Dismiss]
 [Changing Layout]
 [Changing Case]
-[Popup]
 [ChangeKeyboardLayout]
diff --git a/langpacks/french/Untranslated/Clist_modern.txt b/langpacks/french/Untranslated/Clist_modern.txt
index 200c19bd61..46fd6b1f1c 100644
--- a/langpacks/french/Untranslated/Clist_modern.txt
+++ b/langpacks/french/Untranslated/Clist_modern.txt
@@ -48,18 +48,17 @@
 [Selected menu text]
 [Frame title text]
 [3rd party frames transparent back color]
+[Last online]
 [Event area background]
 [Contact rate: none]
 [Contact rate: low]
 [Contact rate: medium]
 [Contact rate: high]
 [Icon]
-[Row design]
 [Show avatar]
 [Hide avatar]
 [Restore last status]
 [Show/Hide offline users]
-[ layered]
 [( unknown )]
 [reVista for Modern v0.5]
 [Angeli-Ka (graphics), FYR (template)]
diff --git a/langpacks/french/Untranslated/CmdLine.txt b/langpacks/french/Untranslated/CmdLine.txt
index 43d4cf079a..c002466483 100644
--- a/langpacks/french/Untranslated/CmdLine.txt
+++ b/langpacks/french/Untranslated/CmdLine.txt
@@ -89,4 +89,3 @@
 [Command '%s' is not currently supported.]
 [Could not create CommandLine listening server!]
 [You can only run one instance of CmdLine plugin.]
-[Notify]
diff --git a/langpacks/french/Untranslated/CurrencyRates.txt b/langpacks/french/Untranslated/CurrencyRates.txt
index 0484ebd635..db12985591 100644
--- a/langpacks/french/Untranslated/CurrencyRates.txt
+++ b/langpacks/french/Untranslated/CurrencyRates.txt
@@ -34,6 +34,7 @@
 [&Display in Contact List as:]
 [&Status Message:]
 [&Tendency:]
+[&Personal key:]
 [&Advanced Settings...]
 [Rate Info]
 [There is nothing to show]
@@ -43,10 +44,6 @@
 [Info provided by]
 [Enter positive number.]
 [Currency Rate]
-[Error occurred during HTML parsing.]
-[Error occurred during site access.]
-[Currency Symbol]
-[Currency Name]
 [Source of Information]
 [Rate Value]
 [Previous Rate Value]
@@ -56,13 +53,8 @@
 [Percentage Character (%)]
 [Tabulation]
 [Left slash (\\)]
-[Open Price]
-[Percent Change to After Hours]
-[Percent Change to Yesterday Close]
-[Day's High]
-[Day's Low]
-[Previous Close]
-[Change]
+[Error occurred during HTML parsing.]
+[Error occurred during site access.]
 [From Currency Full Name]
 [From Currency Short Name]
 [Into Currency Full Name]
@@ -82,6 +74,8 @@
 [Enable/Disable Currency Rates Auto Update]
 [Currency Rates Auto Update Enabled]
 [Currency Rates Auto Update Disabled]
+[Currency Symbol]
+[This plugin requires a personal key. Press Yes to obtain it at the site and then enter the result in the Options dialog, otherwise this plugin will fail.]
 [Protocol icon]
 [Currency Rate up]
 [Currency Rate down]
@@ -91,7 +85,6 @@
 [Swap button]
 [Import]
 [XML File (*.xml)]
-[Miranda could not load CurrencyRates plugin. XML parser is missing.]
 [Miranda could not load CurrencyRates plugin. Microsoft HTML parser is missing.]
 [Log Files (*.txt,*.log)]
 [Enter integer value]
diff --git a/langpacks/french/Untranslated/Db_autobackups.txt b/langpacks/french/Untranslated/Db_autobackups.txt
index eab9b256e1..a0c1a0fdeb 100644
--- a/langpacks/french/Untranslated/Db_autobackups.txt
+++ b/langpacks/french/Untranslated/Db_autobackups.txt
@@ -4,12 +4,13 @@
 [Backup file mask:]
 [Compress backup to zip-archive]
 [Backup profile folder]
-[Disable popups]
 [Use CloudFile]
 [Backup progress]
 [Uploading to cloud failed]
 [Database backed up]
 [Database back up in process...]
+[Enable &AutoBackups notification]
+[Disable &AutoBackups notification]
 [Miranda NG databases]
 [Compressed Miranda NG databases]
 [Database]
diff --git a/langpacks/french/Untranslated/Discord.txt b/langpacks/french/Untranslated/Discord.txt
index 048a840ff7..f20fc06073 100644
--- a/langpacks/french/Untranslated/Discord.txt
+++ b/langpacks/french/Untranslated/Discord.txt
@@ -1,6 +1,7 @@
 [Discord support for Miranda NG.]
+[Enable group chats]
 [Do not open chat windows on creation]
-[Use subgroups for guild's channels (requires restart)]
+[Use subgroups for server channels (requires restart)]
 [edited at]
 [Change &nickname]
 [Channel control]
@@ -15,11 +16,15 @@
 [Enter channel name]
 [Enter invitation code you received]
 [Do you really want to leave the guild?]
+[Disable sync]
+[Enable sync]
 [Join guild]
 [Copy my Discord ID]
 [Leave guild]
 [Create new channel]
 [Copy Discord ID]
+[Enable guild sync]
+[Load server history]
 [%s gateway connection]
 [User ID]
 [Protocol is offline or user isn't authorized yet]
diff --git a/langpacks/french/Untranslated/Facebook.txt b/langpacks/french/Untranslated/Facebook.txt
index 9acc5eeab0..b7d931b9fa 100644
--- a/langpacks/french/Untranslated/Facebook.txt
+++ b/langpacks/french/Untranslated/Facebook.txt
@@ -39,9 +39,9 @@
 [User &history]
 [Delete conversation]
 [This will permanently delete the conversation history]
-[Former]
 [Myself]
 [Friend]
+[Former]
 [%s and more (%d)]
 [Login error: %s]
 [Login error: Invalid request.]
diff --git a/langpacks/french/Untranslated/ICQ.txt b/langpacks/french/Untranslated/ICQ.txt
index 97cc80508a..5482bdceec 100644
--- a/langpacks/french/Untranslated/ICQ.txt
+++ b/langpacks/french/Untranslated/ICQ.txt
@@ -1,6 +1,8 @@
 [UIN/e-mail:]
 [Sign in/sign up using phone]
 [Do not open chat windows on creation]
+[Use tray icon notifications]
+[Launch mailbox in a browser on click]
 [If a contact goes Offline, set this status instead and cache it for given timeout in seconds (0 - disabled)]
 [After that, set this status to a contact and move it offline after specified timeout in seconds (0 - disabled)]
 [Account registration]
@@ -12,7 +14,10 @@
 [&Invite a user]
 [&Leave/destroy chat]
 [Do you really want to remove it from ignore list?]
+[E-mail notification]
 [Remove Ignore]
+[You received e-mail from %s: %s]
+[You have %d unread emails]
 [Synchronize server groups]
 [Edit ignore list]
 [UIN/e-mail/phone]
diff --git a/langpacks/french/Untranslated/Import.txt b/langpacks/french/Untranslated/Import.txt
index c80457324b..d6e13e07f2 100644
--- a/langpacks/french/Untranslated/Import.txt
+++ b/langpacks/french/Untranslated/Import.txt
@@ -20,7 +20,6 @@
 [Skipping contact, account %S cannot be mapped.]
 [Skipping contact, %S not installed.]
 [Skipping non-IM contact (%S)]
-[Skipping %S contact, ID not found]
 [Skipping duplicate %S contact %s]
 [Failed to add %S contact %s]
 [Added %S contact %s, '%s']
diff --git a/langpacks/french/Untranslated/Jabber.txt b/langpacks/french/Untranslated/Jabber.txt
index 492576a9a0..bf73f00fae 100644
--- a/langpacks/french/Untranslated/Jabber.txt
+++ b/langpacks/french/Untranslated/Jabber.txt
@@ -15,6 +15,7 @@
 [View as tree]
 [View as list]
 [Node:]
+[Filter:]
 [Member Information]
 [Role:]
 [Set role]
@@ -40,8 +41,6 @@
 [Frame text]
 [Jabber Activity]
 [Jabber Mood]
-[Jabber Ad-Hoc commands at %s]
-[Sending Ad-Hoc command to %s]
 [Please wait...]
 [Bytestream Proxy not available]
 [Supports Service Discovery info]
@@ -93,17 +92,9 @@
 [Enter the text you see]
 [Admin]
 [Participant]
-[Participants]
 [Owners]
-[User %s is now banned.]
-[User %s changed status to %s with message: %s]
-[User %s changed status to %s]
-[Room configuration was changed.]
-[Outcast]
-[Affiliation of %s was changed to '%s'.]
+[Participants]
 [Role of %s was changed to '%s'.]
-[because room is now members-only]
-[user banned]
 [Change &nickname]
 [&Invite a user]
 [&Roles]
@@ -145,7 +136,6 @@
 [Real &JID: %s]
 [Invite Users to\n%s]
 [%s (not on roster)]
-[Real JID not available]
 [Reason to kick %s]
 [Reason to ban %s]
 [Invite %s to %s]
@@ -172,20 +162,12 @@
 [Logoff]
 [Copy node name]
 [Copy node information]
-[Identities]
-[type]
-[Type]
-[Supported features]
-[Info request error]
-[Items request error]
-[Set filter...]
 [Failed to retrieve room list from server.]
 [No rooms available on server.]
 [Room list request timed out.]
 [Please wait for room list to download.]
 [Please specify group chat directory first.]
 [Change nickname in <%s>]
-[has set the subject to:]
 [Group chat invitation to\n%s]
 [Multi-User Conference]
 [Agents list]
@@ -374,8 +356,6 @@
 [Affiliation changes]
 [Role changes]
 [Don't notify history messages]
-[Subscription]
-[XML for MS Excel (UTF-8 encoded)]
 [Secure XMPP Network (old style)]
 [Hipchat]
 [LiveJournal Talk]
@@ -384,7 +364,6 @@
 [League Of Legends (Oceania)]
 [League Of Legends (US)]
 [Odnoklassniki]
-[Set New Password for %s@%S]
 [Sending request, please wait...]
 [Warning: privacy lists were changed on server.]
 [Error occurred while applying changes]
@@ -395,6 +374,16 @@
 [Privacy list %s set as default]
 [Default privacy list successfully declined]
 [Error occurred while setting default list]
+[List has no rules, empty lists will be deleted then changes applied]
+[deny ]
+[incoming presences]
+[outgoing presences]
+[If Jabber ID is ']
+[ (nickname: ]
+[If subscription is ']
+[ (act., def.)]
+[ (active)]
+[Privacy lists are not saved, discard any changes and exit?]
 [Add JID]
 [Set default]
 [Move rule up]
@@ -407,16 +396,6 @@
 [Presence (in)]
 [Presence (out)]
 [Query]
-[List has no rules, empty lists will be deleted then changes applied]
-[deny ]
-[incoming presences]
-[outgoing presences]
-[If Jabber ID is ']
-[ (nickname: ]
-[If subscription is ']
-[ (act., def.)]
-[ (active)]
-[Privacy lists are not saved, discard any changes and exit?]
 [Please save list before activating]
 [First, save the list]
 [Please save list before you make it the default list]
@@ -426,42 +405,20 @@
 [No compatible file transfer mechanism exists]
 [Protocol is offline or no JID]
 [No valid OMEMO session exists]
-[Command completed successfully]
-[Error occurred during processing command]
-[Set status]
-[Set options]
-[Forward unread messages]
-[Leave group chats]
-[Lock workstation]
-[Choose the status and status message]
-[Extended away (Not available)]
-[Priority]
-[Status message]
-[Change global status]
-[Set Options]
-[Set the desired options]
-[Automatically Accept File Transfers]
-[Disable remote controlling (check twice what you are doing)]
-[There is no messages to forward]
-[Forward options]
-[Mark messages as read]
-[Workstation successfully locked]
-[Error %d occurred during workstation lock]
-[Confirmation needed]
-[There is no group chats to leave]
-[Choose the group chats you want to leave]
+[Subscription]
+[XML for MS Excel (UTF-8 encoded)]
 [Select/type search service URL above and press <Go>]
 [sent subscription request]
 [approved subscription request]
 [declined subscription]
 [sent error presence]
 [sent unknown presence type]
+[Outcast]
 [Real JID:]
 [Requesting registration instruction...]
-[Authentication failed for %s@%S.]
-[Message redirected from: %s\r\n%s]
+[Registration canceled]
 [Resource]
-[Software information]
+[Last activity]
 [Miranda core version]
 [Mood]
 [Activity]
@@ -470,7 +427,6 @@
 [Uptime]
 [Logoff message]
 [Last active resource]
-[Please switch online to see more details.]
 [Copy only this value]
 [Advanced Status]
 [Set mood...]
diff --git a/langpacks/french/Untranslated/MSN.txt b/langpacks/french/Untranslated/MSN.txt
index 7961fb3f2c..e77e366ac3 100644
--- a/langpacks/french/Untranslated/MSN.txt
+++ b/langpacks/french/Untranslated/MSN.txt
@@ -28,7 +28,6 @@
 [&Kick user]
 [&Op user]
 [&Deop user]
-[%I64u bytes]
 [IID_IOleObject failed.]
 [RESULT]
 [IID_IOleInPlaceObject failed.]
diff --git a/langpacks/french/Untranslated/MenuEx.txt b/langpacks/french/Untranslated/MenuEx.txt
index 41fbb37a10..11ddf3c69e 100644
--- a/langpacks/french/Untranslated/MenuEx.txt
+++ b/langpacks/french/Untranslated/MenuEx.txt
@@ -23,7 +23,5 @@
 [Copy xStatus Message]
 [All]
 [Authorization]
-[Please authorize me to add you to my contact list.]
-[Do you want to send authorization request\nto new contact?]
 [Open ignore settings]
 [MenuItemEx]
diff --git a/langpacks/french/Untranslated/MirOTR.txt b/langpacks/french/Untranslated/MirOTR.txt
index 028d2defea..ad497f1392 100644
--- a/langpacks/french/Untranslated/MirOTR.txt
+++ b/langpacks/french/Untranslated/MirOTR.txt
@@ -26,12 +26,15 @@
 [&Refresh OTR session]
 [Sto&p OTR session]
 [&Verify Fingerprint]
+[OTR private]
+[OTR unverified]
+[OTR finished]
+[OTR not secure]
 [OTR status (Click for more options)]
 [OTR Encryption: Disabled]
 [OTR Encryption: UNVERIFIED]
 [OTR Encryption: Private]
 [OTR Encryption: Finished]
-[&Convert HTML (for Pidgin)]
 [OTR encrypted session with '%s' has been terminated]
 [Requesting OTR encrypted session with '%s']
 [Beginning OTR encrypted session with '%s']
@@ -46,10 +49,6 @@
 [OTR could not encrypt when sending message]
 [OTR encrypted session with '%s' is now using a VERIFIED fingerprint]
 [OTR encrypted session with '%s' is now using a NOT VERIFIED fingerprint]
-[OTR unverified]
-[OTR finished]
-[OTR private]
-[OTR not secure]
 [Generating new private key for protocol '%s'.\nPlease Wait...]
 [Fingerprints]
 [Verified]
@@ -87,6 +86,7 @@
 [You are using SecureIM. MirOTR will only work for contacts with SecureIM disabled]
 [MirOTR menu]
 [OTR Status]
+[&Convert HTML (for Pidgin)]
 [Private Data]
 [\nusing older protocol version %i]
 [Attempting to start a private conversation...]
diff --git a/langpacks/french/Untranslated/NotesReminders.txt b/langpacks/french/Untranslated/NotesReminders.txt
index 8f5e1f96c0..f44bd8a49d 100644
--- a/langpacks/french/Untranslated/NotesReminders.txt
+++ b/langpacks/french/Untranslated/NotesReminders.txt
@@ -13,6 +13,7 @@
 [Reset to defaults]
 [(Using MCI allows different sounds to be played simultaneously, may not be needed or desired when a custom sound plugin is installed.)]
 [Date]
+[Repeat each day]
 [Daily]
 [Weekly]
 [Monthly]
@@ -29,7 +30,6 @@
 [New &Reminder]
 [&Delete Reminder]
 [D&elete All Reminders]
-[Context Menu Note Popup]
 [&Hide Note]
 [&Always On Top]
 [&Delete Note]
@@ -45,8 +45,6 @@
 [Toggle Notes Visibility]
 [Bring All Notes to Front]
 [New Reminder]
-[Are you sure you want to delete all notes?]
-[Are you sure you want to delete all reminders?]
 [Delete All Notes]
 [Show/Hide Notes]
 [On Top Caption Icon]
@@ -59,13 +57,13 @@
 [Play Sound Icon]
 [View Notes]
 [Sticky Notes]
-[Reminder triggered]
-[Reminder triggered (Alternative 1)]
-[Reminder triggered (Alternative 2)]
 [New &Note]
 [Vie&w Notes]
 [&Bring All to Front]
 [Miranda could not load the Notes & Reminders plugin, Msftedit.dll is missing. If you are using WINE, please make sure you have Msftedit.dll installed. Press 'Yes' to continue loading Miranda.]
+[Reminder triggered]
+[Reminder triggered (Alternative 1)]
+[Reminder triggered (Alternative 2)]
 [Black]
 [Green]
 [Olive]
@@ -79,17 +77,19 @@
 [White]
 [Are you sure you want to delete this note?]
 [Date/Title]
+[Are you sure you want to delete all notes?]
 [Sticky Note Caption]
 [Sticky Note Background Color]
 [Sticky Note Body]
 [Executable Files\0*.exe\0All Files\0*.*\0\0]
 [Select Executable]
-[Hour]
-[Week]
 [The specified time is invalid due to begin of daylight saving (summer time).]
 [The specified time is invalid.]
+[Hour]
+[Week]
 [The specified time offset is invalid.]
 [&Update Reminder]
 [Alternative 1]
 [Alternative 2]
+[Are you sure you want to delete all reminders?]
 [Are you sure you want to delete this reminder?]
diff --git a/langpacks/french/Untranslated/PopupPlus.txt b/langpacks/french/Untranslated/PopupPlus.txt
index 8b252ed7f9..24850d651f 100644
--- a/langpacks/french/Untranslated/PopupPlus.txt
+++ b/langpacks/french/Untranslated/PopupPlus.txt
@@ -40,20 +40,18 @@
 [Sidebar]
 [Title underline]
 [Avatar border]
-[Popup History is disabled]
-[Popup History message]
-[Popups are enabled]
-[Popups are disabled]
+[Popup history is disabled]
+[Popup history message]
 [With "favorite" overlay]
 [With "fullscreen" overlay]
 [Popup group]
 [Favorite contact]
 [Show in fullscreen]
 [Classes]
-[Toggle Popups]
-[Enable Popups]
-[Disable Popups]
-[Popup Plus]
+[Toggle popups]
+[Enable popups]
+[Disable popups]
+[Popup plus]
 [Error: I could not register the Popup Window class.\r\nThe plugin will not operate.]
 [No effect]
 [Fade in/out]
diff --git a/langpacks/french/Untranslated/TabSRMM.txt b/langpacks/french/Untranslated/TabSRMM.txt
index 2ae2b0be45..cc5ad288a3 100644
--- a/langpacks/french/Untranslated/TabSRMM.txt
+++ b/langpacks/french/Untranslated/TabSRMM.txt
@@ -36,7 +36,6 @@
 [Popup options]
 [Default colors]
 [Use the message log color theme for group chat popups]
-[No compatible popup plugin was found. The event notification\nsystem is not available.]
 [Choose modes]
 [Message log view mode (does not affect open windows)]
 [Show avatar in message window]
@@ -359,8 +358,6 @@
 [Clock symbol (for the info panel clock)]
 [Feature disabled (used as overlay)]
 [Feature enabled (used as overlay)]
-[Enable typing notification]
-[Disable typing notification]
 [Message windows - IM]
 [Message windows - all]
 [Message windows - group chats]
diff --git a/langpacks/french/Untranslated/UInfoEx.txt b/langpacks/french/Untranslated/UInfoEx.txt
index 5670bc7861..10015c9d0b 100644
--- a/langpacks/french/Untranslated/UInfoEx.txt
+++ b/langpacks/french/Untranslated/UInfoEx.txt
@@ -251,9 +251,8 @@
 [Phone (UInfoEx)]
 [[b]%s (%S)...[/b]\n%d Contacts remaining]
 [Abort Refreshing Contact Details]
-[Do you want to cancel the current refresh procedure?]
 [Miranda must be online for refreshing contact information!]
-[The function caused an exception!]
+[Do you want to cancel the current refresh procedure?]
 [He/she has the following anniversaries:]
 [He has the following anniversaries:]
 [She has the following anniversaries:]
@@ -285,16 +284,10 @@
 [Added %d of %d contacts stored in the ini-file.]
 [The ini-file "%s"\nfor reading contact information could not be opened.]
 [Can't create xml file!\n%S]
-[Export took %f ms]
-[Importing %s caused error %d]
-[Loading contact %s from xml failed with error %d]
-[Importing Owner caused error %d]
 [Parser is unable to load XMLCard "%s"\nError: %d\nDescription: %s]
 [The selected file is no valid XMLCard]
 [The version of the XMLCard is not supported by UserInfoEx]
 [Owner contact successfully imported.]
 [Selected XMLCard does not contain an owner contact!]
-[Import took %f ms]
 [added contacts: %u / %u\nadded settings: %u / %u\nadded events %u / %u\nduplicated events: %u]
-[FATAL: An exception was thrown while importing contacts from xmlCard!]
 [Flags (UInfoEx)]
diff --git a/langpacks/french/Untranslated/WhoUsesMyFiles.txt b/langpacks/french/Untranslated/WhoUsesMyFiles.txt
index e7aa035668..b81acc0478 100644
--- a/langpacks/french/Untranslated/WhoUsesMyFiles.txt
+++ b/langpacks/french/Untranslated/WhoUsesMyFiles.txt
@@ -19,7 +19,6 @@
 [Alert computer name with username]
 [Disabled options will be available in the next version]
 [Show current connections]
-[Popup plugin not found!]
 [Common Dialog Error 0x%lx]
 [Not implemented yet...]
 [Who uses my files]
diff --git a/langpacks/german/Plugins/PopupPlus.txt b/langpacks/german/Plugins/PopupPlus.txt
index 7462d65e12..88f5ce6c6a 100644
--- a/langpacks/german/Plugins/PopupPlus.txt
+++ b/langpacks/german/Plugins/PopupPlus.txt
@@ -312,7 +312,7 @@ Popups aktivieren
 [Disable popups]
 Popups deaktivieren
 [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
diff --git a/langpacks/polish/=CORE=.txt b/langpacks/polish/=CORE=.txt
index b550659cdf..aab82dda72 100644
--- a/langpacks/polish/=CORE=.txt
+++ b/langpacks/polish/=CORE=.txt
@@ -570,6 +570,55 @@ Zaznacz &wszystko
 Wklej i wyślij
 [Delete]
 Usuń
+;file \src\core\stdpopup\res\resource.rc
+[Popup history]
+Historia popupów
+[Case sensitive]
+Wielkość liter ma znaczenie
+[Default timeout]
+Czas oczekiwania
+[Never timeout]
+Brak opóźnienia
+[Set timeout:]
+Ustaw opóźnienie:
+[Width:]
+Szerokość:
+[Maximum height:]
+Wysokość:
+[Opacity (%):]
+Krycie (%):
+[Border]
+Obramowanie
+[Round corners (window)]
+Zaokrąglone rogi (okna)
+[Preview]
+Podgląd
+[Transparent background]
+Przezroczyste tło
+[Layout]
+Układ
+[Avatar size:]
+Rozmiar:
+[Disable when]
+Wyłącz gdy
+[Global hover]
+Globalne przeciągnięcie
+[Sidebar width:]
+Boczny pasek:
+[Text indent:]
+Wcięcie tekstu:
+[Padding:]
+Wypełnienie:
+[Round corners (avatar)]
+Zaokrąglone rogi (awatara)
+[Text color:]
+Kolor tekstu:
+[Background color:]
+Kolor tła:
+[Set timeout]
+Ustaw czas oczekiwania
+[Timeout value (0 = default):]
+Wartość czasu oczekiwania (0 - domyślna):
 ;file \src\core\stduihist\res\resource.rc
 [Find]
 Szukaj
@@ -1749,6 +1798,88 @@ Kontakt przestał pisać
 ;file \src\core\stdmsg\src\msgtimedout.cpp
 [An unknown error has occurred.]
 Nieznany błąd.
+;file \src\core\stdpopup\src\icons.cpp
+[Popups are enabled]
+Popupy są włączone
+[Popups are disabled]
+Popupy są wyłączone
+;file \src\core\stdpopup\src\notify_imp.cpp
+;file \src\core\stdpopup\src\options.cpp
+[Example]
+Przykład
+[The quick brown fox jumped over the lazy dog.]
+Szybki, brązowy lis przeskoczył nad leniwym psem.
+[Example With a Long Title]
+Przykład z długim tytułem
+[Thequickbrownfoxjumpedoverthelazydog.]
+Szybki,_brązowy_lis_przeskoczył_nad_leniwym_psem.
+[An avatar.]
+Na awatarze.
+[Bottom right]
+Dolny prawy róg
+[Bottom left]
+Dolny lewy róg
+[Top right]
+Górny prawy róg
+[Top left]
+Górny lewy róg
+[Icon on left]
+Ikona po lewej
+[Icon on right]
+Ikona po prawej
+[No time]
+Bez czasu
+[Time on left]
+Czas po lewej
+[Time on right]
+Czas po prawej
+[Time above avatar]
+Czas powyżej awatara
+[No avatar]
+Brak awatara
+[Left avatar]
+Awatar po lewej
+[Right avatar]
+Awatar po prawej
+[Full-screen app running]
+Uruchomiona jest aplikacja pełnoekranowa
+[No animate]
+Brak animacji
+[Horizontal animate]
+Pozioma animacja
+[Vertical animate]
+Pionowa animacja
+[You cannot set a default timeout of 0.\nValue has been reset.]
+Nie możesz ustawić domyślnego czasu oczekiwania 0.\nWartość została zresetowana.
+[Settings]
+Ustawienia
+[Classes]
+Klasy
+;file \src\core\stdpopup\src\services.cpp
+[Disable popups]
+Wyłącz popupy
+[Enable popups]
+Włącz popupy
+;file \src\core\stdpopup\src\yapp.cpp
+[Toggle popups]
+Włącz/Wyłącz popupy
+[First line]
+Pierwsza linia
+[Second line]
+Druga linia
+[Time]
+Pokaż czas
+[Sidebar]
+Boczny pasek
+[Title underline]
+Podkreślony tytuł
+;file \src\core\stdpopup\src\yapp_history_dlg.cpp
+[Copy title to clipboard]
+Kopiuj tytuł do schowka
+[Copy message to clipboard]
+Kopiuj wiadomość do schowka
+[Copy timestamp to clipboard]
+Kopiuj czas do schowka
 ;file \src\core\stdssl\src\netlibssl.cpp
 [Client cannot decode host message. Possible causes: host does not support SSL or requires not existing security package]
 Klient nie może zdekodować wiadomości hosta. Możliwe przyczyny: host nie wspiera szyfrowania SSL lub wymaga nie istniejącego pakietu bezpieczeństwa.
@@ -2631,8 +2762,6 @@ Pusta kropka
 Wtyczka Unicode
 [ANSI plugin]
 Wtyczka ANSI
-[Unused]
-
 [Show/Hide]
 Pokaż/Ukryj
 [Exit]
@@ -2647,6 +2776,8 @@ Przenieś do grupy
 Wł.
 [Off]
 Wył.
+[Unused]
+
 [Frames]
 Ramki
 [Add group]
diff --git a/langpacks/polish/Plugins/Actman.txt b/langpacks/polish/Plugins/Actman.txt
index dab56ea94b..1969a87bfe 100644
--- a/langpacks/polish/Plugins/Actman.txt
+++ b/langpacks/polish/Plugins/Actman.txt
@@ -677,19 +677,19 @@ z potwierdzeniem
 bez potwierdzenia
 [Empty updater download folder]
 Opróżnij folder pobranych Updatera
-[Popup Plus (popup.dll) latest YAPP (yapp.dll)]
-Popup Plus (popup.dll) najnowszy YAPP (yapp.dll)
-[Enables or disables Popup windows]
+[Popup plus (PopupPlus.dll) latest StdPopup (StdPopup.dll)]
+Popup plus (PopupPlus.dll) najnowszy StdPopup (StdPopup.dll)
+[Enables or disables popup windows]
 Włącza lub wyłącza okienka popup
 [Notify]
 Powiadomienia
-[YAPP or Popup]
-YAPP lub Popup
+[StdPopup or Popup plus]
+StdPopup lub Popup plus
 [Popup window]
 Wyskakujące okno
 [Unicode Text]
 Tekst Unicode
-[Enables or disables Popup windows (maybe deprecated)]
+[Enables or disables popup windows (maybe deprecated)]
 Włącza lub wyłącza okienka typu popup (może być porzucone)
 [result of protocol service call]
 wynik wywołania usługi protokołu
diff --git a/langpacks/polish/Plugins/ChangeKeyboardLayout.txt b/langpacks/polish/Plugins/ChangeKeyboardLayout.txt
index 5047558d87..8b47e542bb 100644
--- a/langpacks/polish/Plugins/ChangeKeyboardLayout.txt
+++ b/langpacks/polish/Plugins/ChangeKeyboardLayout.txt
@@ -82,8 +82,6 @@ Okno rozmowy
 [Popups]
 Popupy
 ;file \plugins\ChangeKeyboardLayout\src\main.cpp
-[Popup]
-Popup
 ;file \plugins\ChangeKeyboardLayout\src\stdafx.h
 [ChangeKeyboardLayout]
 Układ klawiatury
diff --git a/langpacks/polish/Plugins/Clist_modern.txt b/langpacks/polish/Plugins/Clist_modern.txt
index c3691a99f8..fefbb32b7f 100644
--- a/langpacks/polish/Plugins/Clist_modern.txt
+++ b/langpacks/polish/Plugins/Clist_modern.txt
@@ -747,6 +747,8 @@ Czas ostatniej wiadomości
 Nazwa konta
 [Rate]
 Ocena
+[Last online]
+
 [-Nothing-]
 -Nic-
 [Hide to tray]
@@ -808,8 +810,6 @@ Wyśrodkuj nazwy grup
 Wyrównaj nazwy grup do prawej
 [Row]
 Wiersz
-[Row design]
-Ułożenie wiersza
 ;file \plugins\Clist_modern\src\modern_clistsettings.cpp
 [(Unknown contact)]
 (Nieznany kontakt)
@@ -835,21 +835,6 @@ Wyłącz Mirandę NG
 Przywróć ostatni status
 [Show/Hide offline users]
 Pokaż/Ukryj rozłączonych
-;file \plugins\Clist_modern\src\modern_rowtemplateopt.cpp
-[Empty %s cell]
-Pusta komórka %s
-[column]
-kolumna
-[line]
-linia
-[columns]
-kolumny
-[lines]
-linie
-[%s, contain %s]
-%s, zawiera %s
-[ layered]
- skórkowane
 ;file \plugins\Clist_modern\src\modern_skinopt.cpp
 [( unknown )]
 ( nieznany )
diff --git a/langpacks/polish/Plugins/CloudFile.txt b/langpacks/polish/Plugins/CloudFile.txt
index 20642554a1..0a304b177f 100644
--- a/langpacks/polish/Plugins/CloudFile.txt
+++ b/langpacks/polish/Plugins/CloudFile.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Allows you to transfer files via cloud services.]
 Pozwala na przesyłanie plików z wykorzystanie usług udostępniania plików w chmurze.
-;file \plugins\CloudFile\res\resource.rc
+;file \protocols\CloudFile\res\resource.rc
 [Default service]
 Domyślna usługa
 [General]
@@ -42,7 +42,7 @@ Otwórz ten link
 
 [Revoke access]
 
-;file \plugins\CloudFile\src\icons.cpp
+;file \protocols\CloudFile\src\icons.cpp
 [Upload file(s)]
 Wyślij plik(i)
 [Dropbox]
@@ -53,22 +53,22 @@ Dysk Google
 OneDrive
 [Yandex.Disk]
 Yandex.Disk
-;file \plugins\CloudFile\src\menus.cpp
+;file \protocols\CloudFile\src\menus.cpp
 [Upload to...]
 Wyślij do...
 [Upload]
 Wyślij
-;file \plugins\CloudFile\src\options.cpp
+;file \protocols\CloudFile\src\options.cpp
 [None]
 Brak
 [Services]
 Usługi
-;file \plugins\CloudFile\src\srmm.cpp
+;file \protocols\CloudFile\src\srmm.cpp
 [Upload files to...]
 Wyślij pliki do...
-;file \plugins\CloudFile\src\Services\dropbox_service.cpp
+;file \protocols\CloudFile\src\Services\dropbox_service.cpp
 [Server does not respond]
 serwer nie odpowiada
-;file \plugins\CloudFile\src\Services\google_service.cpp
-;file \plugins\CloudFile\src\Services\microsoft_service.cpp
-;file \plugins\CloudFile\src\Services\yandex_service.cpp
+;file \protocols\CloudFile\src\Services\google_service.cpp
+;file \protocols\CloudFile\src\Services\microsoft_service.cpp
+;file \protocols\CloudFile\src\Services\yandex_service.cpp
diff --git a/langpacks/polish/Plugins/CmdLine.txt b/langpacks/polish/Plugins/CmdLine.txt
index bd43bacf13..a199e85c35 100644
--- a/langpacks/polish/Plugins/CmdLine.txt
+++ b/langpacks/polish/Plugins/CmdLine.txt
@@ -195,8 +195,3 @@ Komenda "%s" nie jest obecnie obsługiwana.
 Nie udało się utworzyć serwera nasłuchu wiersza poleceń!
 [You can only run one instance of CmdLine plugin.]
 Możesz uruchomić tylko jedną instancję wtyczki CmdLine.
-;file \plugins\CmdLine\src\utils.cpp
-[Notify]
-Powiadomienia
-[Warning]
-Ostrzeżenie
diff --git a/langpacks/polish/Plugins/ConnectionNotify.txt b/langpacks/polish/Plugins/ConnectionNotify.txt
index 1e35991fe1..c0103b4863 100644
--- a/langpacks/polish/Plugins/ConnectionNotify.txt
+++ b/langpacks/polish/Plugins/ConnectionNotify.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Notify with popup if some connection established]
 Powiadamia popupem, gdy zostanie nawiązane połączenie.
-;file \plugins\ConnectionNotify\res\ConnectionNotify.rc
+;file \protocols\ConnectionNotify\res\ConnectionNotify.rc
 [Set popup colors]
 Ustaw kolory komunikatów
 [Popup options]
@@ -56,7 +56,7 @@ Anuluj
 Znaki * i ? są także dostępne (jako port podaj liczbę lub *)
 [Remote IP:Port]
 Zdalne IP:Port
-;file \plugins\ConnectionNotify\src\ConnectionNotify.cpp
+;file \protocols\ConnectionNotify\src\ConnectionNotify.cpp
 [Show]
 Pokaż
 [Hide]
@@ -79,6 +79,6 @@ Akcja
 Wtyczki
 [New Connection Notification]
 Powiadomienie o nowym połączeniu
-;file \plugins\ConnectionNotify\src\filter.cpp
+;file \protocols\ConnectionNotify\src\filter.cpp
 [First close options window]
 Najpierw zamknij okno opcji
diff --git a/langpacks/polish/Plugins/CrashDumper.txt b/langpacks/polish/Plugins/CrashDumper.txt
index 7efbf52f80..491eafe1d1 100644
--- a/langpacks/polish/Plugins/CrashDumper.txt
+++ b/langpacks/polish/Plugins/CrashDumper.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: CrashDumper.dll
 ;  Plugin: Crash dumper
-;  Version: 0.1.0.2
+;  Version: 0.1.0.3
 ;  Authors: borkra
 ;============================================================
 [Crash Dumper and Version Information for Miranda NG.]
diff --git a/langpacks/polish/Plugins/CurrencyRates.txt b/langpacks/polish/Plugins/CurrencyRates.txt
index 2905653416..94adff6f5d 100644
--- a/langpacks/polish/Plugins/CurrencyRates.txt
+++ b/langpacks/polish/Plugins/CurrencyRates.txt
@@ -2,12 +2,12 @@
 ;============================================================
 ;  File: CurrencyRates.dll
 ;  Plugin: Currency Rates
-;  Version: 0.1.0.101
+;  Version: 0.2.0.3
 ;  Authors: Dioksin
 ;============================================================
 [Shows currency rates.]
 Umożliwia monitorowanie zmian kursów walutowych.
-;file \plugins\CurrencyRates\res\Forex.rc
+;file \protocols\CurrencyRates\res\Forex.rc
 [Variable List]
 Lista zmiennych
 [Edit Settings]
@@ -104,14 +104,16 @@ Poprzedni wskaźnik:
 &Opis:
 [&Tendency:]
 &Tendencja:
+[&Personal key:]
+
 [&Advanced Settings...]
 &Zaawansowane ustawienia...
 [Rate Info]
 
-;file \plugins\CurrencyRates\src\Chart.h
+;file \protocols\CurrencyRates\src\Chart.h
 [There is nothing to show]
 Nie ma co pokazać
-;file \plugins\CurrencyRates\src\CommonOptionDlg.cpp
+;file \protocols\CurrencyRates\src\CommonOptionDlg.cpp
 [Seconds]
 Sekund
 [Minutes]
@@ -124,24 +126,15 @@ Wprowadź wartość liczbową pomiędzy 1, a 60.
 Wprowadź wartość liczbową pomiędzy 1, a 24.
 [Enter text to display in contact list.]
 Wprowadź tekst do wyświetlenia na liście kontaktów.
-;file \plugins\CurrencyRates\src\CurrencyConverter.cpp
+;file \protocols\CurrencyRates\src\CurrencyConverter.cpp
 [Info provided by]
 Informacje dostarczone przez
 [Enter positive number.]
 Wprowadź liczbę dodatnią.
-;file \plugins\CurrencyRates\src\CurrencyRateInfoDlg.cpp
+;file \protocols\CurrencyRates\src\CurrencyRateInfoDlg.cpp
 [Currency Rate]
 
-;file \plugins\CurrencyRates\src\CurrencyRatesProviderCurrencyConverter.cpp
-[Error occurred during HTML parsing.]
-Wystąpił błąd podczas przetwarzania HTML.
-[Error occurred during site access.]
-Wystąpił błąd podczas uzyskiwania dostępu do strony.
-;file \plugins\CurrencyRates\src\CurrencyRatesProviderVisitorFormatSpecificator.cpp
-[Currency Symbol]
-
-[Currency Name]
-
+;file \protocols\CurrencyRates\src\CurrencyRatesProviderBase.cpp
 [Source of Information]
 Źródło informacji
 [Rate Value]
@@ -160,20 +153,11 @@ Znak procenta (%)
 Tabulacja
 [Left slash (\\)]
 Lewy ukośnik (\\)
-[Open Price]
-Cena otwarta
-[Percent Change to After Hours]
-Zmiana procentowa na po godzinach
-[Percent Change to Yesterday Close]
-Zmiana procentowa w stosunku do wczorajszego zamknięcia
-[Day's High]
-Najwyższa wartość dzienna
-[Day's Low]
-Najniższa wartość dzienna
-[Previous Close]
-Poprzednie zamknięcie
-[Change]
-Zmień
+;file \protocols\CurrencyRates\src\CurrencyRatesProviderCurrencyConverter.cpp
+[Error occurred during HTML parsing.]
+Wystąpił błąd podczas przetwarzania HTML.
+[Error occurred during site access.]
+Wystąpił błąd podczas uzyskiwania dostępu do strony.
 [From Currency Full Name]
 Z waluty pełna nazwa
 [From Currency Short Name]
@@ -184,7 +168,7 @@ Na walutę pełna nazwa
 Na walutę skrót
 [Short notation for "%f/%i"]
 Skrócona notacja dla "%f/%i"
-;file \plugins\CurrencyRates\src\Forex.cpp
+;file \protocols\CurrencyRates\src\Forex.cpp
 [Auto Update Enabled]
 Auto-aktualizacja włączona
 [Auto Update Disabled]
@@ -215,12 +199,16 @@ Edytuj ustawienia...
 
 [Currency Rates Auto Update Disabled]
 
+[Currency Symbol]
+
 [Network]
 Protokoły
-;file \plugins\CurrencyRates\src\HTTPSession.cpp
+;file \protocols\CurrencyRates\src\HTTPSession.cpp
+[This plugin requires a personal key. Press Yes to obtain it at the site and then enter the result in the Options dialog, otherwise this plugin will fail.]
+
 [CurrencyRates HTTP connections]
 Połączenie HTTP CurrencyRates
-;file \plugins\CurrencyRates\src\IconLib.cpp
+;file \protocols\CurrencyRates\src\IconLib.cpp
 [Protocol icon]
 Ikona protokołu
 [Currency Rate up]
@@ -237,17 +225,15 @@ Eksportuj
 Przycisk zamiany
 [Import]
 Importuj
-;file \plugins\CurrencyRates\src\ImportExport.cpp
+;file \protocols\CurrencyRates\src\ImportExport.cpp
 [XML File (*.xml)]
 Plik XML (*.xml)
 [All files (*.*)]
 Wszystkie pliki (*.*)
-;file \plugins\CurrencyRates\src\ModuleInfo.cpp
-[Miranda could not load CurrencyRates plugin. XML parser is missing.]
-Miranda nie mogła załadować wtyczki CurrencyRates. Brak parsera XML.
+;file \protocols\CurrencyRates\src\ModuleInfo.cpp
 [Miranda could not load CurrencyRates plugin. Microsoft HTML parser is missing.]
 Miranda nie mogła załadować wtyczki CurrencyRates. Brak parsera Microsoft HTML.
-;file \plugins\CurrencyRates\src\SettingsDlg.cpp
+;file \protocols\CurrencyRates\src\SettingsDlg.cpp
 [Log Files (*.txt,*.log)]
 Pliki logu (*.txt, *.log)
 [Enter integer value]
diff --git a/langpacks/polish/Plugins/Db_autobackups.txt b/langpacks/polish/Plugins/Db_autobackups.txt
index 6b99295ecf..392e105cec 100644
--- a/langpacks/polish/Plugins/Db_autobackups.txt
+++ b/langpacks/polish/Plugins/Db_autobackups.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Db_autobackups.dll
 ;  Plugin: Db autobackuper
-;  Version: 0.1.0.2
+;  Version: 0.1.0.3
 ;  Authors: chaos.persei, sje, Kildor, Billy_Bons
 ;============================================================
 [Database autobackuper plugin.]
@@ -34,8 +34,6 @@ Kompresuj kopię do archiwum zip
 Kopia zapasowa folderu z profilem
 [Disable progress bar]
 Wyłącz okienko ze wskaźnikiem postępu kopiowania
-[Disable popups]
-Wyłącz popupy
 [Use CloudFile]
 Używaj CloudFile
 [Backup NOW]
@@ -58,6 +56,10 @@ Kopia zapasowa utworzona
 [Database back up in process...]
 Tworzenie kopii zapasowej bazy danych w toku...
 ;file \plugins\Db_autobackups\src\main.cpp
+[Enable &AutoBackups notification]
+
+[Disable &AutoBackups notification]
+
 [Miranda NG databases]
 Bazy danych Mirandy NG
 [Compressed Miranda NG databases]
@@ -70,6 +72,8 @@ Profil
 Kopia zapasowa profilu
 [Save profile as...]
 Zapisz profil w...
+[Popups]
+Popupy
 [Database backups]
 Kopia zapasowa
 [Backup folder]
diff --git a/langpacks/polish/Plugins/Discord.txt b/langpacks/polish/Plugins/Discord.txt
index 1e7015881e..7f4d83d2fc 100644
--- a/langpacks/polish/Plugins/Discord.txt
+++ b/langpacks/polish/Plugins/Discord.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Discord.dll
 ;  Plugin: Discord protocol
-;  Version: 0.6.1.1
+;  Version: 0.6.2.1
 ;  Authors: George Hazan
 ;============================================================
 [Discord support for Miranda NG.]
@@ -18,9 +18,11 @@ Hasło:
 Kontakty
 [Default group:]
 Domyślna grupa:
+[Enable group chats]
+
 [Do not open chat windows on creation]
 Nie otwieraj okien czatów po ich utworzeniu
-[Use subgroups for guild's channels (requires restart)]
+[Use subgroups for server channels (requires restart)]
 
 [Nick:]
 Nick:
@@ -58,6 +60,10 @@ Rozmowy grupowe
 
 [Do you really want to leave the guild?]
 
+[Disable sync]
+
+[Enable sync]
+
 [Join guild]
 
 [Copy my Discord ID]
@@ -68,6 +74,10 @@ Rozmowy grupowe
 
 [Copy Discord ID]
 
+[Enable guild sync]
+
+[Load server history]
+
 ;file \protocols\Discord\src\options.cpp
 [Network]
 Protokoły
diff --git a/langpacks/polish/Plugins/FTPFile.txt b/langpacks/polish/Plugins/FTPFile.txt
index 3b299fe04d..3f50146642 100644
--- a/langpacks/polish/Plugins/FTPFile.txt
+++ b/langpacks/polish/Plugins/FTPFile.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: FTPFile.dll
 ;  Plugin: FTP File YM
-;  Version: 0.6.0.4
+;  Version: 0.6.0.5
 ;  Authors: yaho
 ;============================================================
 [FTP a file to a server and send the URL to your friend. Supported automatic zipping before upload and encryption via SFTP and FTPS.]
diff --git a/langpacks/polish/Plugins/Facebook.txt b/langpacks/polish/Plugins/Facebook.txt
index 3fc68cf9f2..a9b342a5af 100644
--- a/langpacks/polish/Plugins/Facebook.txt
+++ b/langpacks/polish/Plugins/Facebook.txt
@@ -142,14 +142,14 @@ Opuść grupę
 Usuń konwersację
 [This will permanently delete the conversation history]
 To nieodwracalnie usunie historię konwersacji
-[Former]
-
 [Myself]
 Ja
 [Friend]
 Znajomy
 [User]
 Użytkownik
+[Former]
+
 [Notifications]
 Powiadomienia
 [%s and more (%d)]
diff --git a/langpacks/polish/Plugins/GG.txt b/langpacks/polish/Plugins/GG.txt
index f6f7aed033..20c15b806d 100644
--- a/langpacks/polish/Plugins/GG.txt
+++ b/langpacks/polish/Plugins/GG.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: GG.dll
 ;  Plugin: Gadu-Gadu protocol
-;  Version: 0.11.0.4
+;  Version: 0.95.11.1
 ;  Authors: Bartosz Bialek, Adam Strzelecki
 ;============================================================
 [Gadu-Gadu protocol support for Miranda NG.]
diff --git a/langpacks/polish/Plugins/GmailNotifier.txt b/langpacks/polish/Plugins/GmailNotifier.txt
index 8eb8ff5ef6..11d6f32a1d 100644
--- a/langpacks/polish/Plugins/GmailNotifier.txt
+++ b/langpacks/polish/Plugins/GmailNotifier.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Check your Gmail inboxes locally.]
 Lokalnie sprawdź swoje skrzynki Gmail
-;file \plugins\GmailNotifier\res\options.rc
+;file \protocols\GmailNotifier\res\options.rc
 [Gmail account]
 Konto Gmail
 [Name:]
@@ -54,7 +54,7 @@ Używaj wyboru ikon oraz ikon w pasku stanu (restart)
 To jest komputer współdzielony, więc wyłącz automatyczne logowanie
 [Log unread threads into database (enable history)]
 Zapisuj nieczytane wątki w bazie danych (włącz historię)
-;file \plugins\GmailNotifier\src\check.cpp
+;file \protocols\GmailNotifier\src\check.cpp
 [Checking...]
 Sprawdzanie...
 [Can't send account data!]
@@ -63,7 +63,7 @@ Nie udało się wysłać danych konta!
 Błędna nazwa użytkownika lub hasło!
 [Can't get RSS feed!]
 Nie można pobrać kanału RSS!
-;file \plugins\GmailNotifier\src\main.cpp
+;file \protocols\GmailNotifier\src\main.cpp
 [Other]
 Inne
 [Gmail: New thread(s)]
@@ -74,7 +74,7 @@ Połączenia Gmail Notifier
 Sprawdź wszystkie skrzynki Gmail
 [&Check Gmail inbox]
 Sprawdź skrzynkę Gmail
-;file \plugins\GmailNotifier\src\options.cpp
+;file \protocols\GmailNotifier\src\options.cpp
 [GmailNotifier]
 GmailNotifier
 [Network]
diff --git a/langpacks/polish/Plugins/ICQ.txt b/langpacks/polish/Plugins/ICQ.txt
index 0e3c77639d..7037f876de 100644
--- a/langpacks/polish/Plugins/ICQ.txt
+++ b/langpacks/polish/Plugins/ICQ.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: ICQ.dll
 ;  Plugin: ICQ-WIM protocol
-;  Version: 0.95.11.1
+;  Version: 0.95.11.4
 ;  Authors: George Hazan
 ;============================================================
 [ICQ protocol support for Miranda NG.]
@@ -16,8 +16,12 @@ Hasło:
 
 [Do not open chat windows on creation]
 Nie otwieraj okien czatów po ich utworzeniu
-[Advanced]
-Zaawansowane
+[Use tray icon notifications]
+
+[E-mail]
+E-mail
+[Launch mailbox in a browser on click]
+
 [If a contact goes Offline, set this status instead and cache it for given timeout in seconds (0 - disabled)]
 
 [After that, set this status to a contact and move it offline after specified timeout in seconds (0 - disabled)]
@@ -59,6 +63,8 @@ Ostatnio widziany:
 [Do you really want to remove it from ignore list?]
 
 ;file \protocols\ICQ-WIM\src\main.cpp
+[E-mail notification]
+
 [Ignore]
 Ignorowanie
 [Remove Ignore]
@@ -66,6 +72,15 @@ Ignorowanie
 ;file \protocols\ICQ-WIM\src\options.cpp
 [Network]
 Protokoły
+[General]
+Ogólne
+[Advanced]
+Zaawansowane
+;file \protocols\ICQ-WIM\src\poll.cpp
+[You received e-mail from %s: %s]
+
+[You have %d unread emails]
+
 ;file \protocols\ICQ-WIM\src\proto.cpp
 [%s server connection]
 Połączenie %s
diff --git a/langpacks/polish/Plugins/Import.txt b/langpacks/polish/Plugins/Import.txt
index 58b76d6daf..49c47157ce 100644
--- a/langpacks/polish/Plugins/Import.txt
+++ b/langpacks/polish/Plugins/Import.txt
@@ -111,8 +111,6 @@ Pomijanie kontaktu, konto %s nie może zostać przypisane.
 Pomijanie kontaktu, %S jest niezainstalowane.
 [Skipping non-IM contact (%S)]
 Pomijanie kontaktów nie-IM (%S)
-[Skipping %S contact, ID not found]
-Pomijanie kontaktu %S, nie znaleziono ID
 [Skipping duplicate %S contact %s]
 Pomijanie zduplikowanego %S kontaktu %s
 [Failed to add %S contact %s]
diff --git a/langpacks/polish/Plugins/Jabber.txt b/langpacks/polish/Plugins/Jabber.txt
index f60dbc8e82..2f1e1401b3 100644
--- a/langpacks/polish/Plugins/Jabber.txt
+++ b/langpacks/polish/Plugins/Jabber.txt
@@ -326,6 +326,8 @@ Odśwież
 JID:
 [Node:]
 Węzeł:
+[Filter:]
+
 [Member Information]
 Informacje o użytkowniku
 [Role:]
@@ -392,24 +394,10 @@ Aktywność
 [Jabber Mood]
 Nastrój
 ;file \protocols\JabberG\src\jabber_adhoc.cpp
-[Error %s %s]
-Błąd %s %s
-[Select Command]
-Wybierz polecenie
-[Not supported]
-Nie obsługiwane
 [Done]
 Gotowe
-[In progress. Please Wait...]
-Praca w toku. Proszę czekać...
 [Execute]
 Wykonaj
-[Requesting command list. Please wait...]
-Żądanie listy poleceń. Proszę czekać...
-[Jabber Ad-Hoc commands at %s]
-Polecenia Jabber Ad-Hoc w %s
-[Sending Ad-Hoc command to %s]
-Wysyłanie polecenia Ad-Hoc do %s
 ;file \protocols\JabberG\src\jabber_agent.cpp
 [Jabber Agent Registration]
 Rejestracja agenta Jabbera
@@ -544,32 +532,16 @@ Gość
 Uczestnik
 [Moderator]
 Moderator
-[Visitors]
-Goście
-[Participants]
-Uczestnicy
-[Moderators]
-Moderatorzy
 [Owners]
 Właściciel
-[User %s is now banned.]
-%s został zbanowany.
-[User %s changed status to %s with message: %s]
-Użytkownik %s zmienił status na %s wraz z opisem: %s
-[User %s changed status to %s]
-Użytkownik %s zmienił status na %s
-[Room configuration was changed.]
-Konfiguracja pokoju została zmieniona.
-[Outcast]
-Wygnaniec
-[Affiliation of %s was changed to '%s'.]
-Powiązanie %s zmieniono na "%s".
+[Moderators]
+Moderatorzy
+[Participants]
+Uczestnicy
+[Visitors]
+Goście
 [Role of %s was changed to '%s'.]
 Rolę %s zmieniono na "%s".
-[because room is now members-only]
-ponieważ pokój jest teraz dostępny tylko dla członków
-[user banned]
-użytkownik zbanowany
 [Change &nickname]
 Zmień &nick
 [&Invite a user]
@@ -668,10 +640,6 @@ Prawdziwy &JID: %s
 Zaproś użytkowników do\n%s
 [%s (not on roster)]
 %s (nie na liście)
-[%s from\n%s]
-%s od\n%s
-[Real JID not available]
-Prawdziwy JID niedostępny
 [Reason to kick %s]
 Powód wyrzucenia %s
 [Reason to ban %s]
@@ -742,26 +710,6 @@ Kopiuj JID
 Kopiuj nazwę węzła
 [Copy node information]
 Kopiuj informację węzła
-;file \protocols\JabberG\src\jabber_disco.h
-[Identities]
-Elementy
-[category]
-kategoria
-[type]
-typ
-[Category]
-Kategoria
-[Type]
-Typ
-[Supported features]
-Obsługiwane funkcje
-[Info request error]
-Informacje o błędach
-[Items request error]
-Błąd żądania elementów
-;file \protocols\JabberG\src\jabber_filterlist.cpp
-[Set filter...]
-Wybierz filtr...
 ;file \protocols\JabberG\src\jabber_groupchat.cpp
 [Failed to retrieve room list from server.]
 Nie udało się pobrać listy pokoi z serwera.
@@ -769,8 +717,6 @@ Nie udało się pobrać listy pokoi z serwera.
 Brak dostępnych pokoi na serwerze.
 [Room list request timed out.]
 Upłynął limit czasu żądania listy pokojów.
-[<no nick>]
-<brak nicku>
 [Loading...]
 Wczytywanie...
 [Please wait for room list to download.]
@@ -781,8 +727,8 @@ Proszę określić folder konferencji.
 Zakładki...
 [Change nickname in <%s>]
 Zmień nick w <%s>
-[has set the subject to:]
-ustawił temat na:
+[Error]
+Błąd
 [Group chat invitation to\n%s]
 Zaproszenie do czatu\n%s
 ;file \protocols\JabberG\src\jabber_icolib.cpp
@@ -877,8 +823,8 @@ Prywatność
 ;file \protocols\JabberG\src\jabber_iqid.cpp
 [Authentication failed for %s.]
 Autoryzacja nieudana dla %s.
-[Jabber Authentication]
-Jabber - Autoryzacja
+[Authentication]
+
 [Registration successful]
 Rejestracja zakończona sukcesem.
 [Password is successfully changed. Don't forget to update your password in the Jabber protocol option.]
@@ -1469,18 +1415,6 @@ Zmiany roli
 Zmiany statusu
 [Don't notify history messages]
 Filtruj historię wiadomości
-[Group]
-Grupa
-[Subscription]
-Autoryzacja
-[Uploading...]
-Przesyłanie...
-[Downloading...]
-Pobieranie...
-[XML for MS Excel (UTF-8 encoded)]
-XML dla MS Excel (UTF-8 encoded)
-[Connecting...]
-Łączenie...
 [Network]
 Protokoły
 [Account]
@@ -1514,8 +1448,6 @@ S.ms
 [Some changes will take effect the next time you connect to the Jabber network.]
 Niektóre zmiany zostaną wprowadzone gdy ponownie połączysz się z siecią Jabber.
 ;file \protocols\JabberG\src\jabber_password.cpp
-[Set New Password for %s@%S]
-Ustaw nowe hasło dla %s@%S
 [New password does not match.]
 Nowe hasło nie pasuje.
 [Current password is incorrect.]
@@ -1543,6 +1475,46 @@ Domyślna lista została wyłączona
 Wystąpił błąd w czasie ustawiania domyślnej listy
 [Allow]
 Zezwól
+[List has no rules, empty lists will be deleted then changes applied]
+Lista nie ma żadnych zasad, puste listy zostaną usunięte, a zmiany zatwierdzone
+[allow ]
+zezwól\s
+[deny ]
+odmów\s
+[all.]
+wszystko.
+[messages]
+wiadomości
+[ and ]
+ i\s
+[incoming presences]
+przychodzącą obecność
+[outgoing presences]
+wychodzącą obecność
+[queries]
+zapytania
+[Else ]
+W przeciwnym razie\s
+[If Jabber ID is ']
+Jeśli ID Jabber'a to '
+[ (nickname: ]
+ (pseudonim:\s
+[If group is ']
+Jeśli grupa jest '
+[If subscription is ']
+Jeśli autoryzacja jest '
+[then ]
+to\s
+[ (act., def.)]
+ (akt., dom.)
+[ (active)]
+ (aktywna)
+[ (default)]
+ (domyślna)
+[Ready.]
+Gotowe.
+[Privacy lists are not saved, discard any changes and exit?]
+Nie zapisałeś listy prywatności, odrzucić zmiany i wyjść?
 [Simple mode]
 Tryb podstawowy
 [Advanced mode]
@@ -1587,46 +1559,6 @@ Obecność (przych.)
 Obecność (wych.)
 [Query]
 Kolejka
-[List has no rules, empty lists will be deleted then changes applied]
-Lista nie ma żadnych zasad, puste listy zostaną usunięte, a zmiany zatwierdzone
-[allow ]
-zezwól\s
-[deny ]
-odmów\s
-[all.]
-wszystko.
-[messages]
-wiadomości
-[ and ]
- i\s
-[incoming presences]
-przychodzącą obecność
-[outgoing presences]
-wychodzącą obecność
-[queries]
-zapytania
-[Else ]
-W przeciwnym razie\s
-[If Jabber ID is ']
-Jeśli ID Jabber'a to '
-[ (nickname: ]
- (pseudonim:\s
-[If group is ']
-Jeśli grupa jest '
-[If subscription is ']
-Jeśli autoryzacja jest '
-[then ]
-to\s
-[ (act., def.)]
- (akt., dom.)
-[ (active)]
- (aktywna)
-[ (default)]
- (domyślna)
-[Ready.]
-Gotowe.
-[Privacy lists are not saved, discard any changes and exit?]
-Nie zapisałeś listy prywatności, odrzucić zmiany i wyjść?
 [Please save list before activating]
 Proszę zapisać listę przed aktywowaniem!
 [First, save the list]
@@ -1650,80 +1582,22 @@ Nie istnieje żaden kompatybilny mechanizm transferu plików
 Protokół jest Rozłączony lub brak JID
 [No valid OMEMO session exists]
 Nie istnieje żadna ważna sesja OMEMO
-;file \protocols\JabberG\src\jabber_rc.cpp
-[Command completed successfully]
-Komenda zakończona poprawnie
-[Error occurred during processing command]
-Wystąpił błąd podczas przetwarzania komendy
-[Set status]
-Wybierz status
-[Set options]
-Wybierz opcje
-[Forward unread messages]
-Przekaż nieprzeczytane wiadomości
-[Leave group chats]
-Opuść czat
-[Lock workstation]
-Zablokuj komputer
-[Quit Miranda NG]
-Zamknij Mirandę NG
-[Change Status]
-Zmień status
-[Choose the status and status message]
-Zmień status i opis
-[Status]
-Status
-[Extended away (Not available)]
-Wrócę później
-[Invisible]
-Niewidoczny
-[Offline]
-Rozłączony
-[Priority]
-Priorytet
-[Status message]
-Opis
-[Change global status]
-Zmień globalnie status
-[Set Options]
-Ustaw opcje
-[Set the desired options]
-Ustaw opcje
-[Automatically Accept File Transfers]
-Automatycznie akceptuj transfery
-[Play sounds]
-Graj dźwięki
-[Disable remote controlling (check twice what you are doing)]
-Wyłącz zdalne sterowanie (sprawdź dwa razy co robisz)
-[There is no messages to forward]
-Nie ma wiadomości do przekazania
-[Forward options]
-Opcje przekierowania
-[%d message(s) to be forwarded]
-%d wiadomości, które mają być przekazywane
-[Mark messages as read]
-Oznacz wiadomości jako przeczytane
-[%d message(s) forwarded]
-%d wiadomości
-[Workstation successfully locked]
-Komputer został pomyślnie zabezpieczony
-[Error %d occurred during workstation lock]
-Wystąpił błąd %d podczas blokowania stacji roboczej
-[Confirmation needed]
-Potrzebne zatwierdzenie
-[Please confirm Miranda NG shutdown]
-Proszę zatwierdzić wyłączenie Mirandy NG
-[There is no group chats to leave]
-Nie ma pokoi do opuszczenia
-[Choose the group chats you want to leave]
-Wybierz czat który chcesz opuścić
+;file \protocols\JabberG\src\jabber_roster.cpp
+[Group]
+Grupa
+[Subscription]
+Autoryzacja
+[Uploading...]
+Przesyłanie...
+[Downloading...]
+Pobieranie...
+[Connecting...]
+Łączenie...
+[XML for MS Excel (UTF-8 encoded)]
+XML dla MS Excel (UTF-8 encoded)
 ;file \protocols\JabberG\src\jabber_search.cpp
-[Error %s %s\r\nPlease select other server]
-Błąd %s %s\r\nProszę wybrać inny serwer
 [Error: unknown reply received\r\nPlease select other server]
 Błąd: otrzymano nieznaną odpowiedź\r\nProszę wybrać inny serwer
-[Error %s %s\r\nTry to specify more detailed]
-Błąd %s %s\r\nSpróbuj podać więcej szczegółów
 [Search error]
 Błąd wyszukiwania
 [Select/type search service URL above and press <Go>]
@@ -1745,6 +1619,8 @@ Odrzucono żądanie subskrypcji
 Informacja: Odnotowano obecność błędów
 [sent unknown presence type]
 wysłał nieznany typ obecności
+[Outcast]
+Wygnaniec
 [Nick:]
 Nick:
 [Status:]
@@ -1762,31 +1638,23 @@ Błąd: Nie można połączyć się z serwerem
 Błąd: Utracono połączenie
 [Requesting registration instruction...]
 Żądanie instrukcji rejestracji...
-[Authentication failed for %s@%S.]
-Nieudane uwierzytelnianie dla %s@%S.
-[Message redirected from: %s\r\n%s]
-Wiadomość przekierowana z: %s\r\n%s
+[Registration canceled]
+
 [Sending registration information...]
 Wysyłanie informacji rejestracyjnych...
 ;file \protocols\JabberG\src\jabber_userinfo.cpp
-[Resource]
-Zasób
 [<not specified>]
 <nieokreślone>
+[Resource]
+Zasób
 [Software]
 Komunikator
 [Version]
 Wersja
 [System]
 System
-[unknown]
-nieznany
-[Idle since]
-Bezczynny od
-[Client capabilities]
-Możliwości klienta
-[Software information]
-Informacje o oprogramowaniu
+[Last activity]
+
 [Operating system]
 System operacyjny
 [Operating system version]
@@ -1801,26 +1669,14 @@ Nastrój
 Aktywność
 [Tune]
 Teraz odtwarzane
-[both]
-Obustronna
-[to]
-Do
-[from]
-Od
-[none]
-brak
 [Last logoff time]
 Ostatnio wylogowany
 [Uptime]
 Dostępny od
 [Logoff message]
 Ostatni opis
-[<no information available>]
-<brak dostępnych informacji>
 [Last active resource]
 Ostatnio aktywny zasób
-[Please switch online to see more details.]
-Proszę się połączyć aby zobaczyć informacje.
 [Copy]
 Kopiuj
 [Copy only this value]
@@ -1870,10 +1726,10 @@ Usługa niedostępna
 Czas oczekiwania serwera
 [Unknown error]
 Nieznany błąd
-[Error]
-Błąd
 [Unknown error message]
 Nieznany błąd
+[Offline]
+Rozłączony
 [Advanced Status]
 Zaawansowany status
 [Set mood...]
diff --git a/langpacks/polish/Plugins/LotusNotify.txt b/langpacks/polish/Plugins/LotusNotify.txt
index ea65d48d5c..8e857c1a24 100644
--- a/langpacks/polish/Plugins/LotusNotify.txt
+++ b/langpacks/polish/Plugins/LotusNotify.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Notify about new mail in Lotus Database]
 Powiadamiaj o nowej poczcie w bazie Lotusa
-;file \plugins\LotusNotify\res\LotusNotify.rc
+;file \protocols\LotusNotify\res\LotusNotify.rc
 [Lotus connection settings]
 Ustawienia połączenia z serwerem Lotus
 [Primary server:]
@@ -66,7 +66,7 @@ Temat
 Do/Kopia do
 [Offline status mean:]
 Status niepołączony gdy:
-;file \plugins\LotusNotify\src\LotusNotify.cpp
+;file \protocols\LotusNotify\src\LotusNotify.cpp
 [Unable to load all required Lotus API functions]
 Załadowanie wymaganych funkcji API biblioteki Lotus nie powiodło się.
 [Lotus Notes Client not detected. Check plugin configuration description at https://miranda-ng.org/p/LotusNotify]
diff --git a/langpacks/polish/Plugins/MSN.txt b/langpacks/polish/Plugins/MSN.txt
index f33dc3cdab..f3f3e6e3f5 100644
--- a/langpacks/polish/Plugins/MSN.txt
+++ b/langpacks/polish/Plugins/MSN.txt
@@ -132,8 +132,6 @@ Czat #
 [&Deop user]
 &zdejmij opa
 ;file \protocols\MSN\src\msn_commands.cpp
-[%I64u bytes]
-%I64u bajtów
 [MSN Alert]
 Alert MSN
 ;file \protocols\MSN\src\msn_errors.cpp
diff --git a/langpacks/polish/Plugins/MenuEx.txt b/langpacks/polish/Plugins/MenuEx.txt
index f084a69a82..f243f844c6 100644
--- a/langpacks/polish/Plugins/MenuEx.txt
+++ b/langpacks/polish/Plugins/MenuEx.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MenuEx.dll
 ;  Plugin: Menu item ext
-;  Version: 1.3.1.0
+;  Version: 1.3.2.0
 ;  Authors: Heiko Schillinger, Baloo, Billy_Bons, Robert Pösel
 ;============================================================
 [Adds some useful options to a contacts menu.]
@@ -20,8 +20,6 @@ Ukryj na liście
 Ignorowanie
 [Copy to Account (Ctrl+click for move to Account)]
 Kopiuj do Konta (Ctrl+click alby przejść do Konta)
-[Request Authorization]
-Poproś o autoryzację
 [Browse Received Files]
 Przeglądaj otrzymane pliki
 [Copy IP]
@@ -79,14 +77,8 @@ Połączony użytkownik
 Autoryzacja
 [Typing Notify]
 Pisanie
-[Please authorize me to add you to my contact list.]
-Proszę autoryzuj mnie, bym mógł dodać cię do swoich kontaktów.
-[Do you want to send authorization request\nto new contact?]
-Czy chcesz wysłać prośbę o autoryzacje?\ndo nowego kontaktu?
 [Open ignore settings]
 Otwórz opcje ignorowania
-[Request authorization]
-Poproś o autoryzację
 [MenuItemEx]
 Rozszerzone menu
 ;file \plugins\MenuItemEx\src\options.cpp
diff --git a/langpacks/polish/Plugins/MinecraftDynmap.txt b/langpacks/polish/Plugins/MinecraftDynmap.txt
index 92f86adaf8..f6f2e337a8 100644
--- a/langpacks/polish/Plugins/MinecraftDynmap.txt
+++ b/langpacks/polish/Plugins/MinecraftDynmap.txt
@@ -13,8 +13,6 @@ Serwer:
 [Visible name:]
 Widoczna nazwa:
 ;file \protocols\MinecraftDynmap\src\chat.cpp
-[Server]
-Serwer
 [Admin]
 Admin
 [Normal]
diff --git a/langpacks/polish/Plugins/MirOTR.txt b/langpacks/polish/Plugins/MirOTR.txt
index 1bfe4c9976..6fd5ab2d15 100644
--- a/langpacks/polish/Plugins/MirOTR.txt
+++ b/langpacks/polish/Plugins/MirOTR.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MirOTR.dll
 ;  Plugin: Miranda OTR
-;  Version: 0.14.1.17
+;  Version: 0.14.2.1
 ;  Authors: ProgAndy & CHEF-KOCH
 ;============================================================
 [OTR (Off-the-Record) plugin for Miranda NG (using some code and ideas from SecureIM, Pidgin-OTR and old Miranda OTR (by SJE)).]
@@ -80,6 +80,17 @@ Status OTR
 Zatr&zymaj sesję OTR
 [&Verify Fingerprint]
 Z&weryfikuj Odcisk Palca
+;file \plugins\MirOTR\src\icons.cpp
+[OTR private]
+OTR prywatny
+[OTR unverified]
+OTR niezweryfikowany
+[OTR finished]
+OTR zakończono
+[OTR not secure]
+OTR bez szyfrowania
+[Refresh]
+Odśwież
 ;file \plugins\MirOTR\src\language.h
 [Start OTR]
 Rozpocznij OTR
@@ -99,8 +110,6 @@ Szyfrowanie OTR: Niezweryfikowane
 Szyfrowanie OTR: Prywatne
 [OTR Encryption: Finished]
 Szyfrowanie OTR: Zakończone
-[&Convert HTML (for Pidgin)]
-&Konwertuj HTML (dla Pidgina)
 [OTR encrypted session with '%s' has been terminated]
 Szyfrowana sesja OTR z "%s" została przerwana
 [Requesting OTR encrypted session with '%s']
@@ -131,16 +140,6 @@ Informacje OTR
 Szyfrowana sesja OTR z "%s" używa teraz zweryfikowanego odcisku palca
 [OTR encrypted session with '%s' is now using a NOT VERIFIED fingerprint]
 Szyfrowana sesja OTR z "%s" używa teraz niezweryfikowanego odcisku palca
-[OTR unverified]
-OTR niezweryfikowany
-[OTR finished]
-OTR zakończono
-[OTR private]
-OTR prywatny
-[OTR not secure]
-OTR bez szyfrowania
-[Refresh]
-Odśwież
 [Generating new private key for protocol '%s'.\nPlease Wait...]
 Generowanie nowego klucza prywatnego dla protokołu "%s".\nProszę czekać...
 [General]
@@ -236,6 +235,8 @@ Używasz SecureIM. MirOTR zadziała tylko z kontaktami, dla których SecureIM je
 Menu MirOTR
 [OTR Status]
 Status OTR
+[&Convert HTML (for Pidgin)]
+&Konwertuj HTML (dla Pidgina)
 ;file \plugins\MirOTR\src\options.cpp
 [Private Data]
 Dane Prywatne
diff --git a/langpacks/polish/Plugins/MirandaG15.txt b/langpacks/polish/Plugins/MirandaG15.txt
index 426d7643af..18ebf40cab 100644
--- a/langpacks/polish/Plugins/MirandaG15.txt
+++ b/langpacks/polish/Plugins/MirandaG15.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MirandaG15.dll
 ;  Plugin: MirandaG15
-;  Version: 0.1.2.0
+;  Version: 0.1.2.1
 ;  Authors: Martin Kleinhans
 ;============================================================
 [Provides an interface to use Miranda from the LCD of various Logitech devices.]
diff --git a/langpacks/polish/Plugins/MsgPopup.txt b/langpacks/polish/Plugins/MsgPopup.txt
index 46bc04e0eb..b384e7893e 100644
--- a/langpacks/polish/Plugins/MsgPopup.txt
+++ b/langpacks/polish/Plugins/MsgPopup.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MsgPopup.dll
 ;  Plugin: Message popup
-;  Version: 0.1.2.1
+;  Version: 0.1.2.2
 ;  Authors: StDenis
 ;============================================================
 [Plugin replaces message boxes (those having only OK button) with popups.]
diff --git a/langpacks/polish/Plugins/NewsAggregator.txt b/langpacks/polish/Plugins/NewsAggregator.txt
index 3fc46e9d63..538f73a107 100644
--- a/langpacks/polish/Plugins/NewsAggregator.txt
+++ b/langpacks/polish/Plugins/NewsAggregator.txt
@@ -2,12 +2,12 @@
 ;============================================================
 ;  File: NewsAggregator.dll
 ;  Plugin: News aggregator
-;  Version: 0.1.0.4
+;  Version: 0.1.0.5
 ;  Authors: Mataes, FREAK_THEMIGHTY
 ;============================================================
 [RSS/Atom news aggregator.]
 Czytnik kanałów RSS/Atom.
-;file \plugins\NewsAggregator\Res\Resource.rc
+;file \protocols\NewsAggregator\Res\Resource.rc
 [Add]
 Dodaj
 [Change]
@@ -72,14 +72,14 @@ Importuj z:
 Kanały importowane:
 [&Import]
 &Importuj
-;file \plugins\NewsAggregator\Src\Authentication.cpp
+;file \protocols\NewsAggregator\Src\Authentication.cpp
 [Enter your username]
 Wprowadź swój login
 [Error]
 Błąd
 [Enter your password]
 Wprowadź swoje hasło
-;file \plugins\NewsAggregator\Src\CheckFeed.cpp
+;file \protocols\NewsAggregator\Src\CheckFeed.cpp
 [%s\nis a valid feed's address.]
 %s\njest poprawnym adresem RSS.
 [News Aggregator]
@@ -88,7 +88,7 @@ RSS/Atom
 %s\nnie jest poprawnym adresem RSS.
 [empty]
 pusty
-;file \plugins\NewsAggregator\Src\Icons.cpp
+;file \protocols\NewsAggregator\Src\Icons.cpp
 [Protocol icon]
 Ikona protokołu
 [Check All Feeds]
@@ -103,13 +103,13 @@ Eksportuj kanały
 Auto-aktualizacja włączona
 [Auto Update Disabled]
 Auto-aktualizacja wyłączona
-;file \plugins\NewsAggregator\Src\Menus.cpp
+;file \protocols\NewsAggregator\Src\Menus.cpp
 [Check feed]
 Sprawdź kanał
 [Change feed]
 Zmień ustawienia kanału
-;file \plugins\NewsAggregator\Src\NewsAggregator.cpp
-;file \plugins\NewsAggregator\Src\Options.cpp
+;file \protocols\NewsAggregator\Src\NewsAggregator.cpp
+;file \protocols\NewsAggregator\Src\Options.cpp
 [OPML files]
 Pliki OPML
 [Not valid import file.]
@@ -154,11 +154,11 @@ Kanał
 Usuwanie kontaktu
 [Network]
 Protokoły
-;file \plugins\NewsAggregator\Src\Services.cpp
+;file \protocols\NewsAggregator\Src\Services.cpp
 [Avatars]
 Awatary
 [Enable/disable auto update]
 Włącz/Wyłącz autoaktualizacje
-;file \plugins\NewsAggregator\Src\Utils.cpp
+;file \protocols\NewsAggregator\Src\Utils.cpp
 [NewsAggregator HTTP connections]
 Połączenie HTTP NewsAggregator
diff --git a/langpacks/polish/Plugins/NimContact.txt b/langpacks/polish/Plugins/NimContact.txt
index 3888ce832d..259f3db779 100644
--- a/langpacks/polish/Plugins/NimContact.txt
+++ b/langpacks/polish/Plugins/NimContact.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Non-IM Contact allows you to add 'contacts' that can act as shortcuts to other programs, or links to web pages.\r\nThe contacts name can be read from a text file (includes any ASCII file).\r\nThis plugin is a combination of Favorites and Text Reader plugins both made by me)]
 Pozwala dodać "kontakty", które mogą działać jako skróty do innych programów lub linki do stron internetowych.\r\nNazwy kontaktów można odczytywać z pliku tekstowego (w tym dowolnego pliku ASCII).
-;file \plugins\Non-IM Contact\res\resource.rc
+;file \protocols\Non-IM Contact\res\resource.rc
 [View/Edit Files]
 Pokaż/Edytuj pliki
 [Add File]
@@ -108,7 +108,7 @@ Ko&piuj kontakt Non-IM
 Wpisz 1 ciąg zastępczy na linię w formacie "oryginalny tekst,nowy tekst"
 [EXAMPLE: %fn1,%fn2]
 PRZYKŁAD: %fn1,%fn2
-;file \plugins\Non-IM Contact\src\contactinfo.cpp
+;file \protocols\Non-IM Contact\src\contactinfo.cpp
 [Select Folder]
 Wybierz folder
 [Non-IM Contact protocol timer is Disabled]
@@ -117,7 +117,7 @@ Timer protokołu Non-IM Contact jest wyłączony
 przedziałów czasowych... Przedział czasowy protokołu wynosi %d sekund
 [New Non-IM Contact]
 Nowy kontakt Non-IM
-;file \plugins\Non-IM Contact\src\dialog.cpp
+;file \protocols\Non-IM Contact\src\dialog.cpp
 [String replacing variables...\r\nThe following are all the valid variables that can be used. Refer to the wiki.miranda-ng.org for a proper explanation.\r\n\r\nfile(X)\t\t<- specifies the file to read from. MUST be followed by either start() or end() or wholeline()\r\nfilename(X)\t<- copies the filename of file X.\r\nstart(...)\t\t<- specifies where to start copying from.\r\nend(...)\t\t<- specifies where to stop copying.\r\nwholeline(line(...))\t<- specifies a whole line to copy\r\n\r\nstart() and end() explained\r\n.........................\r\nMUST start with line() followed by a number or a string inside " marks, OR csv(separatorX) variable. The number specifies which character in the line to start/end copying. The string specifies a string in the line to start/end copying.\r\n\r\ncsv(seperatorX) explained...\r\nSeperator is either "tab" or "space" or any SINGLE character. X is the Xth separator to pass before copying, (or to stop before).\r\n\r\nLastly the line(...) variable...\r\nInside the brackets must be either a number (to specify the line number), or a string inside " marks (to use the line with that string), or lastline(X). The X in lastline is the Xth line above the last line, i.e., lastline(1) will use the 2nd last line of the file. If searching for a line with "some words" you may put a + or - X after the closing ), i.e., line("some words")+3 to go 3 lines after the line with "some words".\r\n\r\nSome examples...\r\nfilename(0)    <- will display the filename of the 0th file\r\nfile(0)wholeline(line(0)))    <- will display the whole first line of the 0th file\r\nfile(0)wholeline(line("hello")-1)))    <- the wholeline above the first occurrence of "hello" in the file\r\nfile(0)start(line(lastline(1))csv(tab2))end(line(lastline())csv(tab4)))    <- starts at the 2nd last line of the file, from the 2nd tab variable, until the 4th tab variable in the last line (in the 0th file)\r\nfile(0)start(line("hello")+1"zzzz")end(line(6)17))    <- starts from the first occurrence of zzzz in the line after the first occurrence of hello, until the 17th character in the 6th line (starting from line 0) of the 0th file.\r\n]
 Zmienne zastępujące ciąg...\r\nPoniżej znajdują się wszystkie możliwe do użycia zmienne. Skorzystaj z wiki.miranda-ng.org w celu uzyskania dokładnego objaśnienia.\r\n\r\nfile(X)\t\t<- określa plik, z którego nastąpi odczyt. Po nim MUSI nastąpić start(), end() lub wholeline()\r\n\filename(X)\t<- kopiuje nazwę pliku X.\r\nstart(...)\t\t<- określa, z którego miejsca rozpocząć kopiowanie.\r\nend(...)\t\t<- określa, gdzie należy zaprzestać kopiowania.\r\nwholeline(line(...))\t<- określa całą linię do skopiowania.\r\n\r\nObjaśnienie start() i end()\r\n.........................\r\nMUSZĄ zaczynać się od line(), następnie numer lub ciąg w cudzysłowie lub zmienna csv(seperatorX). Numer określa znak, od którego należy zacząć lub na którym zakończyć kopiowanie. Ciąg określa ciąg w linii, od którego należy zacząć lub na którym zakończyć kopiowanie.\r\n\r\nObjaśnienie csv(seperatorX)...\r\nSeparator to tabulacja, spacja lub inny pojedynczy znak. X to x-owy separator, który należy podać przed kopiowaniem (lub, po którym należy je zakończyć)\r\n\r\nNa koniec zmienna line(...) ...\r\nW nawiasach musi znajdować się liczba (określająca numer linii), ciąg w cudzysłowie (by użyta została linia zawierająca ten ciąg) lub lastline(X). X w lastline() to X-owa linia powyżej ostatniej linii, czyli lastline(1) użyje drugiej linii od końca pliku. Jeśli szukasz linii z "jakimiś wyrazami", możesz umieścić znak "+" lub "-" za zamykającym nawiasem, czyli line("jakieś wyrazy")+3 żeby przejść do 3 linii po tej z "jakimiś wyrazami".\r\n\r\nKilka przykładów...\r\n\filename(0)    <- wyświetli nazwę zerowego pliku\r\nfile(0)wholeline(line(0)))    <- wyświetli całą pierwszą linię zerowego pliku\r\nfile(0)wholeline(line("hello")-1)))    <- wyświetli całą linię powyżej pierwszej linii z wyrazem "hello" w  pliku 0\r\nfile(0)start(line(lastline(1))csv(tab2))end(line(lastline())csv(tab4)))    <- rozpocznie na przedostatniej linii w pliku, od drugiej tabulacji, a skończy na czwartej tabulacji w linii ostatniej (w pliku 0)\r\nfile(0)start(line("hello")+1"zzzz")end(line(6)17))    <- rozpocznie od pierwszego wystąpienia słowa "zzzz" występującego w linii po linii z pierwszym wystąpieniem słowa "hello", kończąc na 17 znaku w 6 linii (licząc od 0) w pliku 0\r\n
 [Contacts Display Info]
@@ -130,7 +130,7 @@ Kopiuj kontakt
 Pliki
 [Edit Non-IM Contact "%s"]
 Edytuj Non-IM kontakt "%s"
-;file \plugins\Non-IM Contact\src\files.cpp
+;file \protocols\Non-IM Contact\src\files.cpp
 [Do you want to overwrite the contents of the file?\r\n\r\nPressing No will append these contacts to the end of the file.]
 Czy chcesz nadpisać zawartość pliku?\r\n\r\nWciśnięcie "Nie" doda kontakty do końca pliku.
 [File couldn't be opened]
@@ -139,10 +139,10 @@ Plik nie mógł zostać otwarty
 Plik nie mógł zostać otwarty,2
 [line(%-3d) = | %s]
 line(%-3d) = | %s
-;file \plugins\Non-IM Contact\src\http.cpp
+;file \protocols\Non-IM Contact\src\http.cpp
 [Non-IM Contacts]
 Kontakty Non-IM
-;file \plugins\Non-IM Contact\src\main.cpp
+;file \protocols\Non-IM Contact\src\main.cpp
 [Plugins]
 Wtyczki
 [Main Icon]
@@ -163,7 +163,7 @@ Kontakt &Non-IM
 &Kreator Ciągów
 [E&dit Contact Settings]
 E&dytuj ustawienia kontaktu
-;file \plugins\Non-IM Contact\src\namereplacing.cpp
+;file \protocols\Non-IM Contact\src\namereplacing.cpp
 [%s - ERROR: no line specified or line not found (in %s)]
 %s -BŁĄD: nie ustalono lub nie odnaleziono linii (w %s)
 [%s - ERROR: file couldn't be opened (in %s)]
diff --git a/langpacks/polish/Plugins/NotesReminders.txt b/langpacks/polish/Plugins/NotesReminders.txt
index fca39680a9..6bdff63eb4 100644
--- a/langpacks/polish/Plugins/NotesReminders.txt
+++ b/langpacks/polish/Plugins/NotesReminders.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: NotesReminders.dll
 ;  Plugin: Sticky Notes & Reminders
-;  Version: 0.1.0.1
+;  Version: 0.2.0.2
 ;  Authors: Joe Kucera, Lubomir Kolev Ivanov, Georg Fischer
 ;============================================================
 [Sticky Notes & Reminders Implementation for Miranda NG.]
@@ -50,12 +50,12 @@ Przywróć domyślne
 (Używanie MCI pozwala na odtwarzanie jednocześnie wielu dźwięków, może być zastąpiona przez inną wtyczkę.)
 [Add Reminder]
 Dodaj przypomnienie
-[Trigger On Time && Date:]
-Wywołaj...
 [Date]
 Data
 [Time]
 Czas
+[Repeat each day]
+
 [Reminder Note:]
 Treść notatki:
 [None]
@@ -102,8 +102,6 @@ Nowe &przypomnienie
 &Usuń przypomnienie
 [D&elete All Reminders]
 U&suń wszystkie przypomnienia
-[Context Menu Note Popup]
-Popup menu kontekstowego notatki
 [&Hide Note]
 &Ukryj notatkę
 [&Always On Top]
@@ -152,9 +150,6 @@ Zawsze &na wierzchu
 Usuń &wszystkie notatki
 [&Show / Hide Notes]
 &Pokaż/Ukryj notatkę
-;file \plugins\NotesAndReminders\src\globals.h
-[Notes & Reminders]
-Notatki i przypomnienia
 ;file \plugins\NotesAndReminders\src\hotkeys.cpp
 [New Note]
 Nowa notatka
@@ -165,10 +160,6 @@ Pokaż wszystkie notatki na wierzchu
 [New Reminder]
 Nowe przypomnienie
 ;file \plugins\NotesAndReminders\src\main.cpp
-[Are you sure you want to delete all notes?]
-Czy na pewno chcesz usunąć wszystkie notatki?
-[Are you sure you want to delete all reminders?]
-Czy na pewno chcesz usunąć wszystkie przypomnienia?
 [Delete All Notes]
 Usuń wszystkie notatki
 [Show/Hide Notes]
@@ -195,20 +186,10 @@ Ikona odtwarzania dźwięku
 Pokaż notatki
 [Sticky Notes]
 Notatki
-[Plugins]
-Wtyczki
 [Add New Note]
 Dodaj nową notatkę
 [Add New Reminder]
 Dodaj nowe przypomnienie
-[Alerts]
-Alarmy
-[Reminder triggered]
-Przypomnienie uruchomione
-[Reminder triggered (Alternative 1)]
-Przypomnienie uruchomione (Alternatywa 1)
-[Reminder triggered (Alternative 2)]
-Przypomnienie uruchomione (Alternatywa 2)
 [Notes && Reminders]
 Notatki i przypomnienia
 [New &Note]
@@ -221,6 +202,14 @@ Po&każ notatki
 &Pokaż wszystkie na wierzchu
 [Miranda could not load the Notes & Reminders plugin, Msftedit.dll is missing. If you are using WINE, please make sure you have Msftedit.dll installed. Press 'Yes' to continue loading Miranda.]
 Miranda nie mogła załadować wtyczki Notes & Reminders, brak pliku Msftedit.dll. Jeśli używasz WINE, upewnij się, że posiadasz zainstalowaną bibliotekę Msftedit.dll. Naciśnij "Tak", aby kontynuować ładowanie Mirandy.
+[Alerts]
+Alarmy
+[Reminder triggered]
+Przypomnienie uruchomione
+[Reminder triggered (Alternative 1)]
+Przypomnienie uruchomione (Alternatywa 1)
+[Reminder triggered (Alternative 2)]
+Przypomnienie uruchomione (Alternatywa 2)
 ;file \plugins\NotesAndReminders\src\notes.cpp
 [Black]
 Czarny
@@ -268,6 +257,8 @@ Notatki
 Tekst notatki
 [Date/Title]
 Data/Tytuł
+[Are you sure you want to delete all notes?]
+Czy na pewno chcesz usunąć wszystkie notatki?
 ;file \plugins\NotesAndReminders\src\options.cpp
 [Sticky Note Caption]
 Opis notatki
@@ -279,11 +270,17 @@ Treść notatki
 Pliki wykonywalne\0*.exe\0Wszystkie pliki \0*.*\0\0
 [Select Executable]
 Wybierz plik wykonywalny
+[Plugins]
+Wtyczki
 ;file \plugins\NotesAndReminders\src\reminders.cpp
 [Minutes]
 Minut
 [Hours]
 Godzin
+[The specified time is invalid due to begin of daylight saving (summer time).]
+Podany czas jest niepoprawny z powodu rozpoczęcia czasu letniego.
+[The specified time is invalid.]
+Podany czas jest niepoprawny.
 [Hour]
 Godzina
 [Day]
@@ -292,10 +289,6 @@ Dzień
 Dni
 [Week]
 Tydzień
-[The specified time is invalid due to begin of daylight saving (summer time).]
-Podany czas jest niepoprawny z powodu rozpoczęcia czasu letniego.
-[The specified time is invalid.]
-Podany czas jest niepoprawny.
 [The specified time offset is invalid.]
 Podana różnica czasu jest niepoprawna.
 [&Update Reminder]
@@ -316,5 +309,10 @@ Alternatywny 2
 Tekst przypomnienia
 [Date of activation]
 Data aktywacji
+[Are you sure you want to delete all reminders?]
+Czy na pewno chcesz usunąć wszystkie przypomnienia?
 [Are you sure you want to delete this reminder?]
 Czy na pewno chcesz usunąć to przypomnienie?
+;file \plugins\NotesAndReminders\src\stdafx.h
+[Notes & Reminders]
+Notatki i przypomnienia
diff --git a/langpacks/polish/Plugins/PasteIt.txt b/langpacks/polish/Plugins/PasteIt.txt
index a23657ca8d..82136e8efe 100644
--- a/langpacks/polish/Plugins/PasteIt.txt
+++ b/langpacks/polish/Plugins/PasteIt.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: PasteIt.dll
 ;  Plugin: Paste it
-;  Version: 1.0.0.3
+;  Version: 1.0.0.4
 ;  Authors: Krzysztof Kral
 ;============================================================
 [Uploads the text to web page and sends the URL to your friends.]
@@ -142,12 +142,12 @@ Nie można otworzyć pliku "%s"
 [File '%s' is empty]
 Plik "%s" jest pusty
 ;file \plugins\PasteIt\src\PasteToWeb1.cpp
-[Error during sending text to web page: %s]
-Błąd podczas wysyłania tekstu do strony www: %s
+[Error during sending text to web page: %S]
+Błąd podczas wysyłania tekstu do strony www: %S
 [Error during sending text to web page]
 Błąd podczas wysyłania tekstu do strony www
-[Error during getting user key from web page: %s]
-Błąd podczas pobierania klucza użytkownika ze strony www: %s
+[Error during getting user key from web page: %S]
+Błąd podczas pobierania klucza użytkownika ze strony www: %S
 [Paste expire date]
 Data ważności wklejki
 [Never]
diff --git a/langpacks/polish/Plugins/PluginUpdater.txt b/langpacks/polish/Plugins/PluginUpdater.txt
index 803c92debd..61fb9f7266 100644
--- a/langpacks/polish/Plugins/PluginUpdater.txt
+++ b/langpacks/polish/Plugins/PluginUpdater.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: PluginUpdater.dll
 ;  Plugin: Plugin updater
-;  Version: 0.2.0.2
+;  Version: 0.2.0.3
 ;  Authors: Mataes, George Hazan
 ;============================================================
 [Installs and updates plugins and other Miranda NG components.]
diff --git a/langpacks/polish/Plugins/PopupPlus.txt b/langpacks/polish/Plugins/PopupPlus.txt
index 4f65e754f3..ea629ccc23 100644
--- a/langpacks/polish/Plugins/PopupPlus.txt
+++ b/langpacks/polish/Plugins/PopupPlus.txt
@@ -1,6 +1,6 @@
 #muuid {26a9125d-7863-4e01-af0e-d14ef95c5054}
 ;============================================================
-;  File: Popup.dll
+;  File: PopupPlus.dll
 ;  Plugin: Popup plus
 ;  Version: 2.1.1.15
 ;  Authors: MPK, Merlin_de (Luca Santarelli, Victor Pavlychko)
@@ -82,7 +82,7 @@ Opcje skórki
 Podgląd
 [Download more skins]
 Pobierz więcej skórek
-[Popup History]
+[Popup history]
 Historia popupów
 [Desktop]
 Pulpit
@@ -263,15 +263,11 @@ Podkreślony tytuł
 [Avatar border]
 Granica awatara
 ;file \plugins\Popup\src\history.cpp
-[Popup History is disabled]
+[Popup history is disabled]
 Historia popupów jest wyłączona
-[Popup History message]
+[Popup history message]
 Historia popupów
 ;file \plugins\Popup\src\icons.cpp
-[Popups are enabled]
-Popupy są włączone
-[Popups are disabled]
-Popupy są wyłączone
 [With "favorite" overlay]
 Nakładka "ulubione"
 [With "fullscreen" overlay]
@@ -309,13 +305,13 @@ Akcje
 Kontakty
 [Advanced]
 Zaawansowane
-[Toggle Popups]
+[Toggle popups]
 Włącz/Wyłącz popupy
-[Enable Popups]
+[Enable popups]
 Włącz popupy
-[Disable Popups]
+[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ć.
diff --git a/langpacks/polish/Plugins/SkypeWeb.txt b/langpacks/polish/Plugins/SkypeWeb.txt
index 8b9bc514f6..2cced02f1e 100644
--- a/langpacks/polish/Plugins/SkypeWeb.txt
+++ b/langpacks/polish/Plugins/SkypeWeb.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: SkypeWeb.dll
 ;  Plugin: Skype protocol (Web)
-;  Version: 0.12.3.1
+;  Version: 0.12.3.3
 ;  Authors: Miranda NG team
 ;============================================================
 [Skype protocol support for Miranda NG. Based on new Skype for Web.]
diff --git a/langpacks/polish/Plugins/SmileyAdd.txt b/langpacks/polish/Plugins/SmileyAdd.txt
index 12d72c2533..3fcf9f9f71 100644
--- a/langpacks/polish/Plugins/SmileyAdd.txt
+++ b/langpacks/polish/Plugins/SmileyAdd.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: SmileyAdd.dll
 ;  Plugin: SmileyAdd
-;  Version: 0.3.1.0
+;  Version: 0.3.1.1
 ;  Authors: Peacow, nightwish, bid, borkra
 ;============================================================
 [Smiley support for Miranda NG.]
diff --git a/langpacks/polish/Plugins/StatusManager.txt b/langpacks/polish/Plugins/StatusManager.txt
index e1596c4e28..6a1cae1fe4 100644
--- a/langpacks/polish/Plugins/StatusManager.txt
+++ b/langpacks/polish/Plugins/StatusManager.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: StatusManager.dll
 ;  Plugin: Status manager
-;  Version: 1.2.0.4
+;  Version: 1.2.0.5
 ;  Authors: P Boon
 ;============================================================
 [A connection checker and auto away module. Also allows you to define the status Miranda should set on startup, configurable per protocol.]
diff --git a/langpacks/polish/Plugins/TabSRMM.txt b/langpacks/polish/Plugins/TabSRMM.txt
index a04fe5c7a3..f1385f43e9 100644
--- a/langpacks/polish/Plugins/TabSRMM.txt
+++ b/langpacks/polish/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: TabSRMM.dll
 ;  Plugin: TabSRMM
-;  Version: 3.5.0.12
+;  Version: 3.5.0.13
 ;  Authors: The Miranda developers team and contributors
 ;============================================================
 [IM and group chat module for Miranda NG.]
@@ -178,8 +178,6 @@ Rozmowy grupowe
 Błędy
 [Use the message log color theme for group chat popups]
 Użyj koloru wiadomości skórki dla popupów czatowych
-[No compatible popup plugin was found. The event notification\nsystem is not available.]
-Nie znaleziono kompatybilnego wtyczki popup. Powiadomienia\nsystemowe nie są dostępne.
 [Dialog]
 Okno
 [Cancel]
@@ -1697,10 +1695,6 @@ Symbol zegara (w panelu informacyjnym)
 Funkcja wyłączona (używany jako nakładka)
 [Feature enabled (used as overlay)]
 Funkcja włączona (używany jako nakładka)
-[Enable typing notification]
-Włącz powiadomienia o pisaniu
-[Disable typing notification]
-Wyłącz powiadomienia o pisaniu
 ;file \plugins\TabSRMM\src\msgs.h
 [Message windows - IM]
 Okno rozmowy - IM
@@ -1984,10 +1978,10 @@ Dodaj rozłączone kontakty na listę wysyłania do wielu naraz
 Wyłącz powiadomienie o &pisaniu
 [Enable &typing notification]
 Włącz powiadomienie o &pisaniu
-[...is typing a message.]
-...pisze wiadomość
 [...has stopped typing.]
 ...przestał pisać.
+[...is typing a message.]
+...pisze wiadomość
 [Contact started typing]
 Kontakt pisze wiadomość
 [Contact stopped typing]
diff --git a/langpacks/polish/Plugins/UInfoEx.txt b/langpacks/polish/Plugins/UInfoEx.txt
index 94e2a968eb..f1f86a8c01 100644
--- a/langpacks/polish/Plugins/UInfoEx.txt
+++ b/langpacks/polish/Plugins/UInfoEx.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: UInfoEx.dll
 ;  Plugin: User info ext
-;  Version: 0.8.5.1
+;  Version: 0.8.5.2
 ;  Authors: DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
 ;============================================================
 [Extended UserInfo module for Miranda NG. Provides interface to edit all contact information.]
@@ -1110,12 +1110,10 @@ Telefon (UInfoEx)
 \[b]%s (%S)...[/b]\nPozostało %d kontaktów
 [Abort Refreshing Contact Details]
 Przerwij odświeżanie danych kontaktu
-[Do you want to cancel the current refresh procedure?]
-Czy chcesz anulować aktualną procedurę odświeżania?
 [Miranda must be online for refreshing contact information!]
 Miranda musi być online, aby odświeżyć dane kontaktu!
-[The function caused an exception!]
-Funkcja spowodowała wyjątek!
+[Do you want to cancel the current refresh procedure?]
+Czy chcesz anulować aktualną procedurę odświeżania?
 ;file \plugins\UserInfoEx\src\svc_reminder.cpp
 [%s has %s today.]
 %s ma %s dziś.
@@ -1216,16 +1214,8 @@ Importuj dane użytkownika z wizytówki
 ;file \plugins\UserInfoEx\src\ex_import\svc_ExImXML.cpp
 [Can't create xml file!\n%S]
 Nie można utworzyć pliku xml!\n%S
-[Export took %f ms]
-Eksport zajął %f ms
 [Contact: %s (%S)]
 Kontakt: %s (%S)
-[Importing %s caused error %d]
-Importowanie %s spowodowało błąd %d
-[Loading contact %s from xml failed with error %d]
-Błąd wczytywania kontaktu %s z pliku xml z błędem %d
-[Importing Owner caused error %d]
-Importowanie właściciela spowodowało błąd %d
 [Parser is unable to load XMLCard "%s"\nError: %d\nDescription: %s]
 Parser nie jest w stanie załadować wizytówki XML "%s"\nBłąd: %d\nOpis: %s
 [The selected file is no valid XMLCard]
@@ -1238,12 +1228,8 @@ Zakończony
 Kontakt właściciela zaimportowany pomyślnie.
 [Selected XMLCard does not contain an owner contact!]
 Wybrana wizytówka XML nie zawiera informacji o właścicielu!
-[Import took %f ms]
-Importowanie zajęło %f ms
 [added contacts: %u / %u\nadded settings: %u / %u\nadded events %u / %u\nduplicated events: %u]
 Dodano kontaktów: %u / %u\nDodano ustawień: %u / %u\nDodano zdarzeń: %u / %u\nPowielonych zdarzeń: %u
-[FATAL: An exception was thrown while importing contacts from xmlCard!]
-Krytyczny: wyjątek został zwrócony podczas importowania kontaktów z wizytówki XML!
 ;file \plugins\UserInfoEx\src\Flags\svc_flags.cpp
 [Flags (UInfoEx)]
 Flagi (UInfoEx)
diff --git a/langpacks/polish/Plugins/VKontakte.txt b/langpacks/polish/Plugins/VKontakte.txt
index 8a95e0eee1..ed39e3e58a 100644
--- a/langpacks/polish/Plugins/VKontakte.txt
+++ b/langpacks/polish/Plugins/VKontakte.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: VKontakte.dll
 ;  Plugin: VKontakte protocol
-;  Version: 0.1.8.1
+;  Version: 0.1.9.0
 ;  Authors: Miranda NG team
 ;============================================================
 [VKontakte protocol support for Miranda NG.]
diff --git a/langpacks/polish/Plugins/Weather.txt b/langpacks/polish/Plugins/Weather.txt
index 0d467dace9..fce91fa389 100644
--- a/langpacks/polish/Plugins/Weather.txt
+++ b/langpacks/polish/Plugins/Weather.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Retrieves weather information and displays it in your contact list.]
 Pobiera informacje o pogodzie wyświetlając je na twojej liście kontaktów.
-;file \plugins\Weather\res\resource.rc
+;file \protocols\Weather\res\resource.rc
 [Update]
 Aktualizacja
 [Brief Info]
@@ -254,7 +254,7 @@ Pokaż dane użytkownika
 Do poprzednich ustawień
 [To default]
 Do domyślnych
-;file \plugins\Weather\src\stdafx.h
+;file \protocols\Weather\src\stdafx.h
 [N/A]
 Niedostępny
 [Invalid ID format, missing "/" (10)]
@@ -337,7 +337,7 @@ Poniżej znajduje się lista niestandardowych zmiennych, które są obecnie dost
 Nie ustawiono adresu strony z kompletną prognozą. Możesz go ustawić w okienku edycji ustawień.
 [The URL for weather map has not been set. You can set it from the Edit Settings dialog.]
 Nie ustawiono adresu mapy pogodowej. Możesz go ustawić w okienku edycji ustawień.
-;file \plugins\Weather\src\weather.cpp
+;file \protocols\Weather\src\weather.cpp
 [Enable/disable auto update]
 Włącz/Wyłącz autoaktualizacje
 [Auto Update Enabled]
@@ -348,7 +348,7 @@ Auto-aktualizacja wyłączona
 Warunki pogodowe uległy zmianie
 [Alert Issued]
 Ogłoszono alarm pogodowy
-;file \plugins\Weather\src\weather_addstn.cpp
+;file \protocols\Weather\src\weather_addstn.cpp
 [Current weather information for %s.]
 Aktualne informacje o pogodzie dla miejscowości %s.
 [%s is now the default weather station]
@@ -361,7 +361,7 @@ Proszę spróbować ponownie po aktualizacji pogody.
 <Wpisz nazwę stacji tutaj>
 [<Enter station ID here>]
 <Wpisz ID stacji tutaj>
-;file \plugins\Weather\src\weather_contacts.cpp
+;file \protocols\Weather\src\weather_contacts.cpp
 [Weather condition was not logged.]
 Nie zarejestrowano sytuacji pogodowej.
 [Get city name from ID]
@@ -378,7 +378,7 @@ Domyślne ustawienia
 Pliki tekstowe
 [All Files]
 Wszystkie pliki
-;file \plugins\Weather\src\weather_conv.cpp
+;file \protocols\Weather\src\weather_conv.cpp
 [mb]
 mb
 [in]
@@ -391,15 +391,15 @@ mm
 <Błąd>
 [HTTP Error %i]
 Błąd HTTP %i
-;file \plugins\Weather\src\weather_data.cpp
+;file \protocols\Weather\src\weather_data.cpp
 [<Enter city name here>]
 <Wpisz nazwę miasta tutaj>
 [Error when obtaining data: %s]
 Błąd podczas odczytywania danych: %s
-;file \plugins\Weather\src\weather_http.cpp
+;file \protocols\Weather\src\weather_http.cpp
 [Weather HTTP connections]
 Połączenie HTTP Weather
-;file \plugins\Weather\src\weather_icons.cpp
+;file \protocols\Weather\src\weather_icons.cpp
 [Protocol icon]
 Ikona protokołu
 [Update Disabled]
@@ -420,7 +420,7 @@ Popup
 Brak Popupu
 [Edit Settings]
 Edytuj ustawienia
-;file \plugins\Weather\src\weather_info.cpp
+;file \protocols\Weather\src\weather_info.cpp
 [Name]
 Nazwa
 [Author]
@@ -459,21 +459,21 @@ Pamięć używana:
 bajty
 [Description:]
 Opis:
-;file \plugins\Weather\src\weather_ini.cpp
+;file \protocols\Weather\src\weather_ini.cpp
 [All update data has been reloaded.]
 Wszystkie aktualizacje danych zostały przeładowane.
 [Invalid ini format for: %s]
 Niepoprawny format INI dla: %s
 [No update data file is found. Please check your Plugins\\Weather directory.]
 Nie znaleziono plików aktualizacji. Proszę sprawdzić folder Plugins\\Weather.
-;file \plugins\Weather\src\weather_mwin.cpp
+;file \protocols\Weather\src\weather_mwin.cpp
 [Frame Font]
 Czcionka tekstu ramki
 [Frame Title Font]
 Czcionka tekstu tytułu ramki
 [Frame Background]
 Tło ramki
-;file \plugins\Weather\src\weather_opt.cpp
+;file \protocols\Weather\src\weather_opt.cpp
 [Weather Protocol Text Preview]
 Podgląd tekstu protokołu pogody
 [Network]
@@ -484,8 +484,8 @@ Ogólne
 Wyświetlanie
 [Popups]
 Popupy
-;file \plugins\Weather\src\weather_popup.cpp
-;file \plugins\Weather\src\weather_svcs.cpp
+;file \protocols\Weather\src\weather_popup.cpp
+;file \protocols\Weather\src\weather_svcs.cpp
 [Station ID]
 ID stacji
 [Disable &weather notification]
@@ -512,10 +512,10 @@ Usuń stare dane po aktualizacji
 Powiadomienie o pogodzie
 [Display in a frame]
 Ekran w ramce
-;file \plugins\Weather\src\weather_update.cpp
+;file \protocols\Weather\src\weather_update.cpp
 [Unable to retrieve weather information for %s]
 Nie można pobrać informacji o pogodzie dla %s
-;file \plugins\Weather\src\weather_userinfo.cpp
+;file \protocols\Weather\src\weather_userinfo.cpp
 [Variable]
 Zmienna
 [Information]
diff --git a/langpacks/polish/Plugins/WebView.txt b/langpacks/polish/Plugins/WebView.txt
index 0c58ec8b43..0b0bae7b8a 100644
--- a/langpacks/polish/Plugins/WebView.txt
+++ b/langpacks/polish/Plugins/WebView.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Adds web pages as contacts to your contact list and can display text and/or issue change alerts from those pages in a window.]
 Dodaje strony internetowe jako kontakty do listy i może wyświetlać ich tekst lub generować powiadomienia o zmianach na nich w oknie.
-;file \plugins\WebView\res\webview.rc
+;file \protocols\WebView\res\webview.rc
 [Webview]
 Webview
 [Update data every]
@@ -180,7 +180,7 @@ Ko&piuj wszystko
 &Wszystkie
 [C&lear all]
 W&yczyść wszystko
-;file \plugins\WebView\src\main.cpp
+;file \protocols\WebView\src\main.cpp
 [Alert event]
 Zdarzenie do powiadomienia
 [Auto update disabled]
@@ -207,14 +207,14 @@ Opcje powiadomień kontaktu
 Pinguj stronę
 [Stop data processing]
 Zakończ przetwarzanie danych
-;file \plugins\WebView\src\webview.cpp
+;file \protocols\WebView\src\webview.cpp
 [All Webview sites have been updated.]
 Wszystkie strony w Webview zostały zaktualizowane.
 [Network]
 Protokoły
 [Popups]
 Popupy
-;file \plugins\WebView\src\webview_alerts.cpp
+;file \protocols\WebView\src\webview_alerts.cpp
 [Cannot write to file]
 Nie można zapisać w pliku
 [Last updated on]
@@ -245,7 +245,7 @@ Określona część strony zmieniła się.
 Nie można odczytać z pliku Cache
 [Loaded from cache]
 Załadowano z Cache
-;file \plugins\WebView\src\webview_datawnd.cpp
+;file \protocols\WebView\src\webview_datawnd.cpp
 [ERROR: You have two or more Webview contacts with the same URL and contact name.]
 Błąd: masz dwa lub więcej kontaktów w Webview o tym samym adresie i nazwie.
 [Alert options]
@@ -258,7 +258,7 @@ Kliknij tu, aby otworzyć ten adres w oknie przeglądarki.
 Trzymaj się wierzchu
 [Disable stick to the front]
 Wyłącz utrzymywanie na wierzchu
-;file \plugins\WebView\src\webview_getdata.cpp
+;file \protocols\WebView\src\webview_getdata.cpp
 [URL not supplied]
 Nie podano adresu
 [Download in progress, please wait...]
@@ -305,7 +305,7 @@ bajtów wyświetlanych
 bajtów pobranych
 [Alert test conditions not met; press the refresh button to view content.]
 Nie spełniono warunków testowych powiadomienia; naciśnij przycisk odśwież, by przejrzeć zawartość.
-;file \plugins\WebView\src\webview_opts.cpp
+;file \protocols\WebView\src\webview_opts.cpp
 [No whitespace removal]
 Brak usuwania białych spacji
 [Minimal level of whitespace removal]
@@ -342,7 +342,7 @@ Musisz podać adres.
 Musisz podać nazwę kontaktu.
 [Invalid symbol present in contact name.]
 Nieprawidłowy symbol znajduje się w nazwie kontaktu.
-;file \plugins\WebView\src\webview_services.cpp
+;file \protocols\WebView\src\webview_services.cpp
 [Cache folder does not exist.]
 Folder Cache nie istnieje.
 [Missing "psite.bat" file.]
diff --git a/langpacks/polish/Plugins/WhoUsesMyFiles.txt b/langpacks/polish/Plugins/WhoUsesMyFiles.txt
index 3d540cf9ea..ac0d128fc5 100644
--- a/langpacks/polish/Plugins/WhoUsesMyFiles.txt
+++ b/langpacks/polish/Plugins/WhoUsesMyFiles.txt
@@ -55,12 +55,10 @@ Wyłączone opcje będą dostępne w następnej wersji
 [Show current connections]
 Pokaż aktualne połączenia
 ;file \plugins\WhoUsesMyFiles\src\options.cpp
-[Popup plugin not found!]
-Nie znaleziono wtyczki Popup!
-[Error]
-Błąd
 [Common Dialog Error 0x%lx]
 Powszechny błąd dialogu 0x%lx
+[Error]
+Błąd
 [Not implemented yet...]
 Jeszcze nie zaimplementowano...
 [Who uses my files]
diff --git a/langpacks/polish/Plugins/YAMN.txt b/langpacks/polish/Plugins/YAMN.txt
index 395a9c03f5..d9b70e154f 100644
--- a/langpacks/polish/Plugins/YAMN.txt
+++ b/langpacks/polish/Plugins/YAMN.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Mail notifier and browser for Miranda NG. Included POP3 protocol.]
 Powiadomienia o poczcie i przeglądarka dla Mirandy NG. Dołączona obsługa POP3.
-;file \plugins\YAMN\res\YAMN.rc
+;file \protocols\YAMN\res\YAMN.rc
 [Installed plugins]
 Zainstalowane wtyczki
 [Version:]
@@ -156,7 +156,7 @@ Podgląd
 Kolor tła
 [Text color]
 Kolor tekstu
-;file \plugins\YAMN\src\main.cpp
+;file \protocols\YAMN\src\main.cpp
 [Check &mail (All Account)]
 Sprawdź wiadomości e-&mail
 [Check &mail (This Account)]
@@ -171,17 +171,17 @@ Folder kont YAMN
 Sprawdź wiadomości e-mail
 [Connect Fail]
 Błąd połączenia
-;file \plugins\YAMN\src\main.h
+;file \protocols\YAMN\src\main.h
 [New mail message]
 Nowa wiadomość e-mail
 [Connect failed]
 Połączenie nieudane
-;file \plugins\YAMN\src\services.cpp
+;file \protocols\YAMN\src\services.cpp
 [Nick]
 Nick
 [No new mail message]
 Brak nowych wiadomości e-mail
-;file \plugins\YAMN\src\browser\badconnect.cpp
+;file \protocols\YAMN\src\browser\badconnect.cpp
 [%s - connection error]
 %s - błąd połączenia
 [An error occurred. Error code: %d]
@@ -190,7 +190,7 @@ Błąd. Kod błędu: %d
 Nieznany błąd
 [ - connection error]
  - błąd połączenia
-;file \plugins\YAMN\src\browser\mailbrowser.cpp
+;file \protocols\YAMN\src\browser\mailbrowser.cpp
 [%s - %d new mail messages, %d total]
 Konto: %s, Nowych wiadomości: %d, Łącznie: %d
 [%s : %d new mail message(s), %d total]
@@ -229,15 +229,15 @@ Data
 Naprawdę chcesz usunąć %d zaznaczonych e-maili?
 [Delete confirmation]
 Potwierdzenie usunięcia
-;file \plugins\YAMN\src\mails\mime.cpp
+;file \protocols\YAMN\src\mails\mime.cpp
 [Translate header error]
 Błąd tłumaczenia nagłówka
 [Part]
 Część
-;file \plugins\YAMN\src\proto\netlib.cpp
+;file \protocols\YAMN\src\proto\netlib.cpp
 [%s connection]
 Połączenie %s
-;file \plugins\YAMN\src\proto\pop3\pop3comm.cpp
+;file \protocols\YAMN\src\proto\pop3\pop3comm.cpp
 [Disconnected]
 Rozłączony
 [POP3 protocol (internal)]
@@ -314,7 +314,7 @@ Nie można zapisać danych SSL.
 Nie można odczytać danych SSL.
 [Error %d-%d-%d-%d:]
 Błąd %d-%d-%d-%d:
-;file \plugins\YAMN\src\proto\pop3\pop3opt.cpp
+;file \protocols\YAMN\src\proto\pop3\pop3opt.cpp
 [Network]
 Protokoły
 [Accounts]
diff --git a/langpacks/polish/Untranslated/Clist_modern.txt b/langpacks/polish/Untranslated/Clist_modern.txt
new file mode 100644
index 0000000000..9551e7ec34
--- /dev/null
+++ b/langpacks/polish/Untranslated/Clist_modern.txt
@@ -0,0 +1 @@
+[Last online]
diff --git a/langpacks/polish/Untranslated/CurrencyRates.txt b/langpacks/polish/Untranslated/CurrencyRates.txt
index d7e694c28c..d499bbc5cb 100644
--- a/langpacks/polish/Untranslated/CurrencyRates.txt
+++ b/langpacks/polish/Untranslated/CurrencyRates.txt
@@ -1,7 +1,6 @@
+[&Personal key:]
 [Rate Info]
 [Currency Rate]
-[Currency Symbol]
-[Currency Name]
 [Currency Rates]
 [Refresh All Rates]
 [Export All Currency Rates]
@@ -9,6 +8,8 @@
 [Enable/Disable Currency Rates Auto Update]
 [Currency Rates Auto Update Enabled]
 [Currency Rates Auto Update Disabled]
+[Currency Symbol]
+[This plugin requires a personal key. Press Yes to obtain it at the site and then enter the result in the Options dialog, otherwise this plugin will fail.]
 [Currency Rate up]
 [Currency Rate down]
 [Currency Rate not changed]
diff --git a/langpacks/polish/Untranslated/Db_autobackups.txt b/langpacks/polish/Untranslated/Db_autobackups.txt
index 648e6f872d..4682892553 100644
--- a/langpacks/polish/Untranslated/Db_autobackups.txt
+++ b/langpacks/polish/Untranslated/Db_autobackups.txt
@@ -1 +1,3 @@
 [Backup file mask:]
+[Enable &AutoBackups notification]
+[Disable &AutoBackups notification]
diff --git a/langpacks/polish/Untranslated/Discord.txt b/langpacks/polish/Untranslated/Discord.txt
index 749009d682..7e8a2f520a 100644
--- a/langpacks/polish/Untranslated/Discord.txt
+++ b/langpacks/polish/Untranslated/Discord.txt
@@ -1,5 +1,6 @@
 [Discord support for Miranda NG.]
-[Use subgroups for guild's channels (requires restart)]
+[Enable group chats]
+[Use subgroups for server channels (requires restart)]
 [edited at]
 [Channel control]
 [Change &topic]
@@ -12,11 +13,15 @@
 [Enter channel name]
 [Enter invitation code you received]
 [Do you really want to leave the guild?]
+[Disable sync]
+[Enable sync]
 [Join guild]
 [Copy my Discord ID]
 [Leave guild]
 [Create new channel]
 [Copy Discord ID]
+[Enable guild sync]
+[Load server history]
 [%s gateway connection]
 [Protocol is offline or user isn't authorized yet]
 [Attachment]
diff --git a/langpacks/polish/Untranslated/ICQ.txt b/langpacks/polish/Untranslated/ICQ.txt
index 7535dce295..8caeb3c1dd 100644
--- a/langpacks/polish/Untranslated/ICQ.txt
+++ b/langpacks/polish/Untranslated/ICQ.txt
@@ -1,5 +1,7 @@
 [UIN/e-mail:]
 [Sign in/sign up using phone]
+[Use tray icon notifications]
+[Launch mailbox in a browser on click]
 [If a contact goes Offline, set this status instead and cache it for given timeout in seconds (0 - disabled)]
 [After that, set this status to a contact and move it offline after specified timeout in seconds (0 - disabled)]
 [Send group chat invitation]
@@ -13,7 +15,10 @@
 [&Invite a user]
 [&Leave/destroy chat]
 [Do you really want to remove it from ignore list?]
+[E-mail notification]
 [Remove Ignore]
+[You received e-mail from %s: %s]
+[You have %d unread emails]
 [Synchronize server groups]
 [Edit ignore list]
 [UIN/e-mail/phone]
diff --git a/langpacks/polish/Untranslated/Jabber.txt b/langpacks/polish/Untranslated/Jabber.txt
new file mode 100644
index 0000000000..009d220a5e
--- /dev/null
+++ b/langpacks/polish/Untranslated/Jabber.txt
@@ -0,0 +1,4 @@
+[Filter:]
+[Authentication]
+[Registration canceled]
+[Last activity]
diff --git a/langpacks/polish/Untranslated/NotesReminders.txt b/langpacks/polish/Untranslated/NotesReminders.txt
new file mode 100644
index 0000000000..54b4805ac7
--- /dev/null
+++ b/langpacks/polish/Untranslated/NotesReminders.txt
@@ -0,0 +1 @@
+[Repeat each day]
diff --git a/langpacks/serbian/=CORE=.txt b/langpacks/serbian/=CORE=.txt
index ee4dc2b042..30342278a8 100644
--- a/langpacks/serbian/=CORE=.txt
+++ b/langpacks/serbian/=CORE=.txt
@@ -570,6 +570,55 @@ Ko&piranje svega
 Ubaci i pošalji
 [Delete]
 Briši
+;file \src\core\stdpopup\res\resource.rc
+[Popup history]
+
+[Case sensitive]
+
+[Default timeout]
+
+[Never timeout]
+
+[Set timeout:]
+
+[Width:]
+
+[Maximum height:]
+
+[Opacity (%):]
+
+[Border]
+
+[Round corners (window)]
+
+[Preview]
+
+[Transparent background]
+
+[Layout]
+
+[Avatar size:]
+
+[Disable when]
+
+[Global hover]
+
+[Sidebar width:]
+
+[Text indent:]
+
+[Padding:]
+
+[Round corners (avatar)]
+
+[Text color:]
+
+[Background color:]
+
+[Set timeout]
+
+[Timeout value (0 = default):]
+
 ;file \src\core\stduihist\res\resource.rc
 [Find]
 Pronađi
@@ -1749,6 +1798,88 @@ Kontakt prestaje sa kucanjem
 ;file \src\core\stdmsg\src\msgtimedout.cpp
 [An unknown error has occurred.]
 Desila se nepoznata greška.
+;file \src\core\stdpopup\src\icons.cpp
+[Popups are enabled]
+
+[Popups are disabled]
+
+;file \src\core\stdpopup\src\notify_imp.cpp
+;file \src\core\stdpopup\src\options.cpp
+[Example]
+
+[The quick brown fox jumped over the lazy dog.]
+
+[Example With a Long Title]
+
+[Thequickbrownfoxjumpedoverthelazydog.]
+
+[An avatar.]
+
+[Bottom right]
+
+[Bottom left]
+
+[Top right]
+
+[Top left]
+
+[Icon on left]
+
+[Icon on right]
+
+[No time]
+
+[Time on left]
+
+[Time on right]
+
+[Time above avatar]
+
+[No avatar]
+
+[Left avatar]
+
+[Right avatar]
+
+[Full-screen app running]
+
+[No animate]
+
+[Horizontal animate]
+
+[Vertical animate]
+
+[You cannot set a default timeout of 0.\nValue has been reset.]
+
+[Settings]
+
+[Classes]
+
+;file \src\core\stdpopup\src\services.cpp
+[Disable popups]
+
+[Enable popups]
+
+;file \src\core\stdpopup\src\yapp.cpp
+[Toggle popups]
+
+[First line]
+
+[Second line]
+
+[Time]
+
+[Sidebar]
+
+[Title underline]
+
+;file \src\core\stdpopup\src\yapp_history_dlg.cpp
+[Copy title to clipboard]
+
+[Copy message to clipboard]
+
+[Copy timestamp to clipboard]
+
 ;file \src\core\stdssl\src\netlibssl.cpp
 [Client cannot decode host message. Possible causes: host does not support SSL or requires not existing security package]
 Klijent ne razume poruku host-a. Postoji mogućnost da host ne podržava SSL ili podržava drugi oblik sigurnosti
@@ -2631,8 +2762,6 @@ Nepopunjeno
 Unicode plug-in
 [ANSI plugin]
 ANSI plug-in
-[Unused]
-
 [Show/Hide]
 Prikaži/sakrij
 [Exit]
@@ -2647,6 +2776,8 @@ Ubaci u grupu
 Uklj.
 [Off]
 Isklj.
+[Unused]
+
 [Frames]
 Okviri
 [Add group]
diff --git a/langpacks/serbian/Plugins/Actman.txt b/langpacks/serbian/Plugins/Actman.txt
index 1b267eefea..42adb8946e 100644
--- a/langpacks/serbian/Plugins/Actman.txt
+++ b/langpacks/serbian/Plugins/Actman.txt
@@ -677,19 +677,19 @@ Protokol
 
 [Empty updater download folder]
 
-[Popup Plus (popup.dll) latest YAPP (yapp.dll)]
+[Popup plus (PopupPlus.dll) latest StdPopup (StdPopup.dll)]
 
-[Enables or disables Popup windows]
+[Enables or disables popup windows]
 
 [Notify]
 
-[YAPP or Popup]
+[StdPopup or Popup plus]
 
 [Popup window]
 
 [Unicode Text]
 
-[Enables or disables Popup windows (maybe deprecated)]
+[Enables or disables popup windows (maybe deprecated)]
 
 [result of protocol service call]
 
diff --git a/langpacks/serbian/Plugins/ChangeKeyboardLayout.txt b/langpacks/serbian/Plugins/ChangeKeyboardLayout.txt
index 5ba7376052..ec959220da 100644
--- a/langpacks/serbian/Plugins/ChangeKeyboardLayout.txt
+++ b/langpacks/serbian/Plugins/ChangeKeyboardLayout.txt
@@ -82,8 +82,6 @@ Celi razgovori
 [Popups]
 Balončići
 ;file \plugins\ChangeKeyboardLayout\src\main.cpp
-[Popup]
-
 ;file \plugins\ChangeKeyboardLayout\src\stdafx.h
 [ChangeKeyboardLayout]
 
diff --git a/langpacks/serbian/Plugins/Clist_modern.txt b/langpacks/serbian/Plugins/Clist_modern.txt
index da7152f9b8..65d8196227 100644
--- a/langpacks/serbian/Plugins/Clist_modern.txt
+++ b/langpacks/serbian/Plugins/Clist_modern.txt
@@ -747,6 +747,8 @@ Naziv
 
 [Rate]
 
+[Last online]
+
 [-Nothing-]
 
 [Hide to tray]
@@ -808,8 +810,6 @@ Dodatne ikonice
 
 [Row]
 
-[Row design]
-
 ;file \plugins\Clist_modern\src\modern_clistsettings.cpp
 [(Unknown contact)]
 (Nepoznat kontakt)
@@ -835,21 +835,6 @@ Dodatne ikonice
 
 [Show/Hide offline users]
 
-;file \plugins\Clist_modern\src\modern_rowtemplateopt.cpp
-[Empty %s cell]
-
-[column]
-
-[line]
-
-[columns]
-
-[lines]
-
-[%s, contain %s]
-
-[ layered]
-
 ;file \plugins\Clist_modern\src\modern_skinopt.cpp
 [( unknown )]
 
diff --git a/langpacks/serbian/Plugins/CloudFile.txt b/langpacks/serbian/Plugins/CloudFile.txt
index 969f109150..ff4b84e1c0 100644
--- a/langpacks/serbian/Plugins/CloudFile.txt
+++ b/langpacks/serbian/Plugins/CloudFile.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Allows you to transfer files via cloud services.]
 
-;file \plugins\CloudFile\res\resource.rc
+;file \protocols\CloudFile\res\resource.rc
 [Default service]
 
 [General]
@@ -42,7 +42,7 @@ Otkazivanje
 
 [Revoke access]
 
-;file \plugins\CloudFile\src\icons.cpp
+;file \protocols\CloudFile\src\icons.cpp
 [Upload file(s)]
 
 [Dropbox]
@@ -53,22 +53,22 @@ Otkazivanje
 
 [Yandex.Disk]
 
-;file \plugins\CloudFile\src\menus.cpp
+;file \protocols\CloudFile\src\menus.cpp
 [Upload to...]
 
 [Upload]
 
-;file \plugins\CloudFile\src\options.cpp
+;file \protocols\CloudFile\src\options.cpp
 [None]
 Nema
 [Services]
 
-;file \plugins\CloudFile\src\srmm.cpp
+;file \protocols\CloudFile\src\srmm.cpp
 [Upload files to...]
 
-;file \plugins\CloudFile\src\Services\dropbox_service.cpp
+;file \protocols\CloudFile\src\Services\dropbox_service.cpp
 [Server does not respond]
 
-;file \plugins\CloudFile\src\Services\google_service.cpp
-;file \plugins\CloudFile\src\Services\microsoft_service.cpp
-;file \plugins\CloudFile\src\Services\yandex_service.cpp
+;file \protocols\CloudFile\src\Services\google_service.cpp
+;file \protocols\CloudFile\src\Services\microsoft_service.cpp
+;file \protocols\CloudFile\src\Services\yandex_service.cpp
diff --git a/langpacks/serbian/Plugins/CmdLine.txt b/langpacks/serbian/Plugins/CmdLine.txt
index 66bda205d1..0b038d4b4a 100644
--- a/langpacks/serbian/Plugins/CmdLine.txt
+++ b/langpacks/serbian/Plugins/CmdLine.txt
@@ -195,8 +195,3 @@ Greška
 
 [You can only run one instance of CmdLine plugin.]
 
-;file \plugins\CmdLine\src\utils.cpp
-[Notify]
-
-[Warning]
-Upozorenje
diff --git a/langpacks/serbian/Plugins/ConnectionNotify.txt b/langpacks/serbian/Plugins/ConnectionNotify.txt
index 0b63565a1b..91a83e79cb 100644
--- a/langpacks/serbian/Plugins/ConnectionNotify.txt
+++ b/langpacks/serbian/Plugins/ConnectionNotify.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Notify with popup if some connection established]
 
-;file \plugins\ConnectionNotify\res\ConnectionNotify.rc
+;file \protocols\ConnectionNotify\res\ConnectionNotify.rc
 [Set popup colors]
 
 [Popup options]
@@ -56,7 +56,7 @@ Otkazivanje
 
 [Remote IP:Port]
 
-;file \plugins\ConnectionNotify\src\ConnectionNotify.cpp
+;file \protocols\ConnectionNotify\src\ConnectionNotify.cpp
 [Show]
 Prikaz
 [Hide]
@@ -79,6 +79,6 @@ Status
 Plug-inovi
 [New Connection Notification]
 
-;file \plugins\ConnectionNotify\src\filter.cpp
+;file \protocols\ConnectionNotify\src\filter.cpp
 [First close options window]
 
diff --git a/langpacks/serbian/Plugins/CrashDumper.txt b/langpacks/serbian/Plugins/CrashDumper.txt
index 5592af5f0b..abca9b6180 100644
--- a/langpacks/serbian/Plugins/CrashDumper.txt
+++ b/langpacks/serbian/Plugins/CrashDumper.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: CrashDumper.dll
 ;  Plugin: Crash dumper
-;  Version: 0.1.0.2
+;  Version: 0.1.0.3
 ;  Authors: borkra
 ;============================================================
 [Crash Dumper and Version Information for Miranda NG.]
diff --git a/langpacks/serbian/Plugins/CurrencyRates.txt b/langpacks/serbian/Plugins/CurrencyRates.txt
index 8adc8f62cc..7746986990 100644
--- a/langpacks/serbian/Plugins/CurrencyRates.txt
+++ b/langpacks/serbian/Plugins/CurrencyRates.txt
@@ -2,12 +2,12 @@
 ;============================================================
 ;  File: CurrencyRates.dll
 ;  Plugin: Currency Rates
-;  Version: 0.1.0.101
+;  Version: 0.2.0.3
 ;  Authors: Dioksin
 ;============================================================
 [Shows currency rates.]
 
-;file \plugins\CurrencyRates\res\Forex.rc
+;file \protocols\CurrencyRates\res\Forex.rc
 [Variable List]
 
 [Edit Settings]
@@ -104,14 +104,16 @@ Izmenjeno
 
 [&Tendency:]
 
+[&Personal key:]
+
 [&Advanced Settings...]
 
 [Rate Info]
 
-;file \plugins\CurrencyRates\src\Chart.h
+;file \protocols\CurrencyRates\src\Chart.h
 [There is nothing to show]
 
-;file \plugins\CurrencyRates\src\CommonOptionDlg.cpp
+;file \protocols\CurrencyRates\src\CommonOptionDlg.cpp
 [Seconds]
 sekundi
 [Minutes]
@@ -124,24 +126,15 @@ sekundi
 
 [Enter text to display in contact list.]
 
-;file \plugins\CurrencyRates\src\CurrencyConverter.cpp
+;file \protocols\CurrencyRates\src\CurrencyConverter.cpp
 [Info provided by]
 
 [Enter positive number.]
 
-;file \plugins\CurrencyRates\src\CurrencyRateInfoDlg.cpp
+;file \protocols\CurrencyRates\src\CurrencyRateInfoDlg.cpp
 [Currency Rate]
 
-;file \plugins\CurrencyRates\src\CurrencyRatesProviderCurrencyConverter.cpp
-[Error occurred during HTML parsing.]
-
-[Error occurred during site access.]
-
-;file \plugins\CurrencyRates\src\CurrencyRatesProviderVisitorFormatSpecificator.cpp
-[Currency Symbol]
-
-[Currency Name]
-
+;file \protocols\CurrencyRates\src\CurrencyRatesProviderBase.cpp
 [Source of Information]
 
 [Rate Value]
@@ -160,19 +153,10 @@ sekundi
 
 [Left slash (\\)]
 
-[Open Price]
-
-[Percent Change to After Hours]
-
-[Percent Change to Yesterday Close]
-
-[Day's High]
-
-[Day's Low]
-
-[Previous Close]
+;file \protocols\CurrencyRates\src\CurrencyRatesProviderCurrencyConverter.cpp
+[Error occurred during HTML parsing.]
 
-[Change]
+[Error occurred during site access.]
 
 [From Currency Full Name]
 
@@ -184,7 +168,7 @@ sekundi
 
 [Short notation for "%f/%i"]
 
-;file \plugins\CurrencyRates\src\Forex.cpp
+;file \protocols\CurrencyRates\src\Forex.cpp
 [Auto Update Enabled]
 
 [Auto Update Disabled]
@@ -215,12 +199,16 @@ sekundi
 
 [Currency Rates Auto Update Disabled]
 
+[Currency Symbol]
+
 [Network]
 Mreža
-;file \plugins\CurrencyRates\src\HTTPSession.cpp
+;file \protocols\CurrencyRates\src\HTTPSession.cpp
+[This plugin requires a personal key. Press Yes to obtain it at the site and then enter the result in the Options dialog, otherwise this plugin will fail.]
+
 [CurrencyRates HTTP connections]
 
-;file \plugins\CurrencyRates\src\IconLib.cpp
+;file \protocols\CurrencyRates\src\IconLib.cpp
 [Protocol icon]
 
 [Currency Rate up]
@@ -237,17 +225,15 @@ Mreža
 
 [Import]
 
-;file \plugins\CurrencyRates\src\ImportExport.cpp
+;file \protocols\CurrencyRates\src\ImportExport.cpp
 [XML File (*.xml)]
 
 [All files (*.*)]
 
-;file \plugins\CurrencyRates\src\ModuleInfo.cpp
-[Miranda could not load CurrencyRates plugin. XML parser is missing.]
-
+;file \protocols\CurrencyRates\src\ModuleInfo.cpp
 [Miranda could not load CurrencyRates plugin. Microsoft HTML parser is missing.]
 
-;file \plugins\CurrencyRates\src\SettingsDlg.cpp
+;file \protocols\CurrencyRates\src\SettingsDlg.cpp
 [Log Files (*.txt,*.log)]
 
 [Enter integer value]
diff --git a/langpacks/serbian/Plugins/Db_autobackups.txt b/langpacks/serbian/Plugins/Db_autobackups.txt
index b241b242c8..d7f2af9929 100644
--- a/langpacks/serbian/Plugins/Db_autobackups.txt
+++ b/langpacks/serbian/Plugins/Db_autobackups.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Db_autobackups.dll
 ;  Plugin: Db autobackuper
-;  Version: 0.1.0.2
+;  Version: 0.1.0.3
 ;  Authors: chaos.persei, sje, Kildor, Billy_Bons
 ;============================================================
 [Database autobackuper plugin.]
@@ -34,8 +34,6 @@
 
 [Disable progress bar]
 
-[Disable popups]
-
 [Use CloudFile]
 
 [Backup NOW]
@@ -58,6 +56,10 @@ Greška
 [Database back up in process...]
 
 ;file \plugins\Db_autobackups\src\main.cpp
+[Enable &AutoBackups notification]
+
+[Disable &AutoBackups notification]
+
 [Miranda NG databases]
 
 [Compressed Miranda NG databases]
@@ -70,6 +72,8 @@ Sve datoteke
 
 [Save profile as...]
 
+[Popups]
+Balončići
 [Database backups]
 
 [Backup folder]
diff --git a/langpacks/serbian/Plugins/Discord.txt b/langpacks/serbian/Plugins/Discord.txt
index 03e0a39a3b..6f9f9cc124 100644
--- a/langpacks/serbian/Plugins/Discord.txt
+++ b/langpacks/serbian/Plugins/Discord.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Discord.dll
 ;  Plugin: Discord protocol
-;  Version: 0.6.1.1
+;  Version: 0.6.2.1
 ;  Authors: George Hazan
 ;============================================================
 [Discord support for Miranda NG.]
@@ -18,9 +18,11 @@ E-mail:
 Kontakti
 [Default group:]
 
+[Enable group chats]
+
 [Do not open chat windows on creation]
 
-[Use subgroups for guild's channels (requires restart)]
+[Use subgroups for server channels (requires restart)]
 
 [Nick:]
 Nadimak:
@@ -58,6 +60,10 @@ Sobe za razgovor
 
 [Do you really want to leave the guild?]
 
+[Disable sync]
+
+[Enable sync]
+
 [Join guild]
 
 [Copy my Discord ID]
@@ -68,6 +74,10 @@ Sobe za razgovor
 
 [Copy Discord ID]
 
+[Enable guild sync]
+
+[Load server history]
+
 ;file \protocols\Discord\src\options.cpp
 [Network]
 Mreža
diff --git a/langpacks/serbian/Plugins/FTPFile.txt b/langpacks/serbian/Plugins/FTPFile.txt
index 09da92e3fa..5032589c36 100644
--- a/langpacks/serbian/Plugins/FTPFile.txt
+++ b/langpacks/serbian/Plugins/FTPFile.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: FTPFile.dll
 ;  Plugin: FTP File YM
-;  Version: 0.6.0.4
+;  Version: 0.6.0.5
 ;  Authors: yaho
 ;============================================================
 [FTP a file to a server and send the URL to your friend. Supported automatic zipping before upload and encryption via SFTP and FTPS.]
diff --git a/langpacks/serbian/Plugins/Facebook.txt b/langpacks/serbian/Plugins/Facebook.txt
index 677745ccbd..40e04c5d54 100644
--- a/langpacks/serbian/Plugins/Facebook.txt
+++ b/langpacks/serbian/Plugins/Facebook.txt
@@ -142,14 +142,14 @@ Detalji &korisnika
 
 [This will permanently delete the conversation history]
 
-[Former]
-
 [Myself]
 
 [Friend]
 
 [User]
 
+[Former]
+
 [Notifications]
 
 [%s and more (%d)]
diff --git a/langpacks/serbian/Plugins/GG.txt b/langpacks/serbian/Plugins/GG.txt
index 349227fe58..ab588cd5b5 100644
--- a/langpacks/serbian/Plugins/GG.txt
+++ b/langpacks/serbian/Plugins/GG.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: GG.dll
 ;  Plugin: Gadu-Gadu protocol
-;  Version: 0.11.0.4
+;  Version: 0.95.11.1
 ;  Authors: Bartosz Bialek, Adam Strzelecki
 ;============================================================
 [Gadu-Gadu protocol support for Miranda NG.]
diff --git a/langpacks/serbian/Plugins/GmailNotifier.txt b/langpacks/serbian/Plugins/GmailNotifier.txt
index 986d688f45..e808e5054b 100644
--- a/langpacks/serbian/Plugins/GmailNotifier.txt
+++ b/langpacks/serbian/Plugins/GmailNotifier.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Check your Gmail inboxes locally.]
 
-;file \plugins\GmailNotifier\res\options.rc
+;file \protocols\GmailNotifier\res\options.rc
 [Gmail account]
 
 [Name:]
@@ -54,7 +54,7 @@ sekundi
 
 [Log unread threads into database (enable history)]
 
-;file \plugins\GmailNotifier\src\check.cpp
+;file \protocols\GmailNotifier\src\check.cpp
 [Checking...]
 
 [Can't send account data!]
@@ -63,7 +63,7 @@ sekundi
 
 [Can't get RSS feed!]
 
-;file \plugins\GmailNotifier\src\main.cpp
+;file \protocols\GmailNotifier\src\main.cpp
 [Other]
 Ostalo
 [Gmail: New thread(s)]
@@ -74,7 +74,7 @@ Ostalo
 
 [&Check Gmail inbox]
 
-;file \plugins\GmailNotifier\src\options.cpp
+;file \protocols\GmailNotifier\src\options.cpp
 [GmailNotifier]
 
 [Network]
diff --git a/langpacks/serbian/Plugins/ICQ.txt b/langpacks/serbian/Plugins/ICQ.txt
index 5261287074..59ff69e3e6 100644
--- a/langpacks/serbian/Plugins/ICQ.txt
+++ b/langpacks/serbian/Plugins/ICQ.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: ICQ.dll
 ;  Plugin: ICQ-WIM protocol
-;  Version: 0.95.11.1
+;  Version: 0.95.11.4
 ;  Authors: George Hazan
 ;============================================================
 [ICQ protocol support for Miranda NG.]
@@ -16,8 +16,12 @@
 
 [Do not open chat windows on creation]
 
-[Advanced]
-Napredno
+[Use tray icon notifications]
+
+[E-mail]
+E-mail
+[Launch mailbox in a browser on click]
+
 [If a contact goes Offline, set this status instead and cache it for given timeout in seconds (0 - disabled)]
 
 [After that, set this status to a contact and move it offline after specified timeout in seconds (0 - disabled)]
@@ -59,6 +63,8 @@ Poslednji put primećen(a):
 [Do you really want to remove it from ignore list?]
 
 ;file \protocols\ICQ-WIM\src\main.cpp
+[E-mail notification]
+
 [Ignore]
 Ignorisati
 [Remove Ignore]
@@ -66,6 +72,15 @@ Ignorisati
 ;file \protocols\ICQ-WIM\src\options.cpp
 [Network]
 Mreža
+[General]
+Uopšteno
+[Advanced]
+Napredno
+;file \protocols\ICQ-WIM\src\poll.cpp
+[You received e-mail from %s: %s]
+
+[You have %d unread emails]
+
 ;file \protocols\ICQ-WIM\src\proto.cpp
 [%s server connection]
 
diff --git a/langpacks/serbian/Plugins/Import.txt b/langpacks/serbian/Plugins/Import.txt
index e5f15a6fad..38a9e71f4b 100644
--- a/langpacks/serbian/Plugins/Import.txt
+++ b/langpacks/serbian/Plugins/Import.txt
@@ -111,8 +111,6 @@ Novi nalog
 
 [Skipping non-IM contact (%S)]
 
-[Skipping %S contact, ID not found]
-
 [Skipping duplicate %S contact %s]
 
 [Failed to add %S contact %s]
diff --git a/langpacks/serbian/Plugins/Jabber.txt b/langpacks/serbian/Plugins/Jabber.txt
index 0fd92cec95..7896d15695 100644
--- a/langpacks/serbian/Plugins/Jabber.txt
+++ b/langpacks/serbian/Plugins/Jabber.txt
@@ -326,6 +326,8 @@ Poruke
 
 [Node:]
 
+[Filter:]
+
 [Member Information]
 
 [Role:]
@@ -392,24 +394,10 @@ Zahtev za autorizaciju.
 [Jabber Mood]
 
 ;file \protocols\JabberG\src\jabber_adhoc.cpp
-[Error %s %s]
-
-[Select Command]
-
-[Not supported]
-
 [Done]
 
-[In progress. Please Wait...]
-
 [Execute]
 
-[Requesting command list. Please wait...]
-
-[Jabber Ad-Hoc commands at %s]
-
-[Sending Ad-Hoc command to %s]
-
 ;file \protocols\JabberG\src\jabber_agent.cpp
 [Jabber Agent Registration]
 
@@ -544,32 +532,16 @@ Vlasnik
 
 [Moderator]
 
-[Visitors]
-
-[Participants]
-
-[Moderators]
-
 [Owners]
 
-[User %s is now banned.]
-
-[User %s changed status to %s with message: %s]
-
-[User %s changed status to %s]
-
-[Room configuration was changed.]
+[Moderators]
 
-[Outcast]
+[Participants]
 
-[Affiliation of %s was changed to '%s'.]
+[Visitors]
 
 [Role of %s was changed to '%s'.]
 
-[because room is now members-only]
-
-[user banned]
-
 [Change &nickname]
 
 [&Invite a user]
@@ -668,10 +640,6 @@ Detalji &korisnika
 
 [%s (not on roster)]
 
-[%s from\n%s]
-
-[Real JID not available]
-
 [Reason to kick %s]
 
 [Reason to ban %s]
@@ -742,26 +710,6 @@ Detalji &korisnika
 
 [Copy node information]
 
-;file \protocols\JabberG\src\jabber_disco.h
-[Identities]
-
-[category]
-
-[type]
-
-[Category]
-
-[Type]
-
-[Supported features]
-
-[Info request error]
-
-[Items request error]
-
-;file \protocols\JabberG\src\jabber_filterlist.cpp
-[Set filter...]
-
 ;file \protocols\JabberG\src\jabber_groupchat.cpp
 [Failed to retrieve room list from server.]
 
@@ -769,8 +717,6 @@ Detalji &korisnika
 
 [Room list request timed out.]
 
-[<no nick>]
-
 [Loading...]
 
 [Please wait for room list to download.]
@@ -781,8 +727,8 @@ Detalji &korisnika
 
 [Change nickname in <%s>]
 
-[has set the subject to:]
-
+[Error]
+Greška
 [Group chat invitation to\n%s]
 
 ;file \protocols\JabberG\src\jabber_icolib.cpp
@@ -877,7 +823,7 @@ Dodaj kontakt
 ;file \protocols\JabberG\src\jabber_iqid.cpp
 [Authentication failed for %s.]
 
-[Jabber Authentication]
+[Authentication]
 
 [Registration successful]
 
@@ -1469,18 +1415,6 @@ Uopšteno
 Izmene statusa
 [Don't notify history messages]
 
-[Group]
-Grupa
-[Subscription]
-
-[Uploading...]
-
-[Downloading...]
-
-[XML for MS Excel (UTF-8 encoded)]
-
-[Connecting...]
-Uspostavljanje veze...
 [Network]
 Mreža
 [Account]
@@ -1514,8 +1448,6 @@ Napredno
 [Some changes will take effect the next time you connect to the Jabber network.]
 
 ;file \protocols\JabberG\src\jabber_password.cpp
-[Set New Password for %s@%S]
-
 [New password does not match.]
 
 [Current password is incorrect.]
@@ -1543,50 +1475,6 @@ Napredno
 
 [Allow]
 
-[Simple mode]
-
-[Advanced mode]
-
-[Add JID]
-
-[Activate]
-
-[Set default]
-
-[Edit rule]
-
-[Add rule]
-
-[Delete rule]
-
-[Move rule up]
-
-[Move rule down]
-
-[Add list...]
-
-[Remove list]
-
-[** Default **]
-
-[** Subscription: both **]
-
-[** Subscription: to **]
-
-[** Subscription: from **]
-
-[** Subscription: none **]
-
-[<none>]
-<ništa>
-[Message]
-Poruka
-[Presence (in)]
-
-[Presence (out)]
-
-[Query]
-
 [List has no rules, empty lists will be deleted then changes applied]
 
 [allow ]
@@ -1627,103 +1515,89 @@ Poruke
 
 [Privacy lists are not saved, discard any changes and exit?]
 
-[Please save list before activating]
-
-[First, save the list]
-
-[Please save list before you make it the default list]
-
-[No list selected]
-
-[Can't remove active or default list]
-
-[Sorry]
+[Simple mode]
 
-[Unable to save list because you are currently offline.]
+[Advanced mode]
 
-[List Editor...]
+[Add JID]
 
-;file \protocols\JabberG\src\jabber_proto.cpp
-[No compatible file transfer mechanism exists]
+[Activate]
 
-[Protocol is offline or no JID]
+[Set default]
 
-[No valid OMEMO session exists]
+[Edit rule]
 
-;file \protocols\JabberG\src\jabber_rc.cpp
-[Command completed successfully]
+[Add rule]
 
-[Error occurred during processing command]
+[Delete rule]
 
-[Set status]
+[Move rule up]
 
-[Set options]
+[Move rule down]
 
-[Forward unread messages]
+[Add list...]
 
-[Leave group chats]
+[Remove list]
 
-[Lock workstation]
+[** Default **]
 
-[Quit Miranda NG]
+[** Subscription: both **]
 
-[Change Status]
+[** Subscription: to **]
 
-[Choose the status and status message]
+[** Subscription: from **]
 
-[Status]
-Status
-[Extended away (Not available)]
-Nedostupan
-[Invisible]
-Nevidljiv
-[Offline]
-Odsutan
-[Priority]
+[** Subscription: none **]
 
-[Status message]
+[<none>]
+<ništa>
+[Message]
+Poruka
+[Presence (in)]
 
-[Change global status]
+[Presence (out)]
 
-[Set Options]
+[Query]
 
-[Set the desired options]
+[Please save list before activating]
 
-[Automatically Accept File Transfers]
+[First, save the list]
 
-[Play sounds]
+[Please save list before you make it the default list]
 
-[Disable remote controlling (check twice what you are doing)]
+[No list selected]
 
-[There is no messages to forward]
+[Can't remove active or default list]
 
-[Forward options]
+[Sorry]
 
-[%d message(s) to be forwarded]
+[Unable to save list because you are currently offline.]
 
-[Mark messages as read]
+[List Editor...]
 
-[%d message(s) forwarded]
+;file \protocols\JabberG\src\jabber_proto.cpp
+[No compatible file transfer mechanism exists]
 
-[Workstation successfully locked]
+[Protocol is offline or no JID]
 
-[Error %d occurred during workstation lock]
+[No valid OMEMO session exists]
 
-[Confirmation needed]
+;file \protocols\JabberG\src\jabber_roster.cpp
+[Group]
+Grupa
+[Subscription]
 
-[Please confirm Miranda NG shutdown]
+[Uploading...]
 
-[There is no group chats to leave]
+[Downloading...]
 
-[Choose the group chats you want to leave]
+[Connecting...]
+Uspostavljanje veze...
+[XML for MS Excel (UTF-8 encoded)]
 
 ;file \protocols\JabberG\src\jabber_search.cpp
-[Error %s %s\r\nPlease select other server]
-
 [Error: unknown reply received\r\nPlease select other server]
 
-[Error %s %s\r\nTry to specify more detailed]
-
 [Search error]
 
 [Select/type search service URL above and press <Go>]
@@ -1745,6 +1619,8 @@ Odsutan
 
 [sent unknown presence type]
 
+[Outcast]
+
 [Nick:]
 Nadimak:
 [Status:]
@@ -1762,30 +1638,22 @@ Nadimak:
 
 [Requesting registration instruction...]
 
-[Authentication failed for %s@%S.]
-
-[Message redirected from: %s\r\n%s]
+[Registration canceled]
 
 [Sending registration information...]
 
 ;file \protocols\JabberG\src\jabber_userinfo.cpp
-[Resource]
-
 [<not specified>]
 <neodređeno>
+[Resource]
+
 [Software]
 
 [Version]
 Verzija
 [System]
 Sistem
-[unknown]
-Nepoznati
-[Idle since]
-
-[Client capabilities]
-
-[Software information]
+[Last activity]
 
 [Operating system]
 
@@ -1801,26 +1669,14 @@ Nepoznati
 
 [Tune]
 
-[both]
-
-[to]
-U
-[from]
-
-[none]
-Nema
 [Last logoff time]
 
 [Uptime]
 
 [Logoff message]
 
-[<no information available>]
-
 [Last active resource]
 
-[Please switch online to see more details.]
-
 [Copy]
 Kopiranje
 [Copy only this value]
@@ -1870,10 +1726,10 @@ Kopiranje
 
 [Unknown error]
 
-[Error]
-Greška
 [Unknown error message]
 
+[Offline]
+Odsutan
 [Advanced Status]
 
 [Set mood...]
diff --git a/langpacks/serbian/Plugins/LotusNotify.txt b/langpacks/serbian/Plugins/LotusNotify.txt
index a3124e0804..4d1c949244 100644
--- a/langpacks/serbian/Plugins/LotusNotify.txt
+++ b/langpacks/serbian/Plugins/LotusNotify.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Notify about new mail in Lotus Database]
 
-;file \plugins\LotusNotify\res\LotusNotify.rc
+;file \protocols\LotusNotify\res\LotusNotify.rc
 [Lotus connection settings]
 
 [Primary server:]
@@ -66,7 +66,7 @@ Pošiljalac
 
 [Offline status mean:]
 
-;file \plugins\LotusNotify\src\LotusNotify.cpp
+;file \protocols\LotusNotify\src\LotusNotify.cpp
 [Unable to load all required Lotus API functions]
 
 [Lotus Notes Client not detected. Check plugin configuration description at https://miranda-ng.org/p/LotusNotify]
diff --git a/langpacks/serbian/Plugins/MSN.txt b/langpacks/serbian/Plugins/MSN.txt
index 5f5179dd7f..cd62b83580 100644
--- a/langpacks/serbian/Plugins/MSN.txt
+++ b/langpacks/serbian/Plugins/MSN.txt
@@ -132,8 +132,6 @@ Detalji &korisnika
 [&Deop user]
 
 ;file \protocols\MSN\src\msn_commands.cpp
-[%I64u bytes]
-
 [MSN Alert]
 
 ;file \protocols\MSN\src\msn_errors.cpp
diff --git a/langpacks/serbian/Plugins/MenuEx.txt b/langpacks/serbian/Plugins/MenuEx.txt
index 22203ea80f..4eb71cd4e3 100644
--- a/langpacks/serbian/Plugins/MenuEx.txt
+++ b/langpacks/serbian/Plugins/MenuEx.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MenuEx.dll
 ;  Plugin: Menu item ext
-;  Version: 1.3.1.0
+;  Version: 1.3.2.0
 ;  Authors: Heiko Schillinger, Baloo, Billy_Bons, Robert Pösel
 ;============================================================
 [Adds some useful options to a contacts menu.]
@@ -20,8 +20,6 @@ Vidljivost
 Ignorisati
 [Copy to Account (Ctrl+click for move to Account)]
 
-[Request Authorization]
-Zatraži autorizaciju
 [Browse Received Files]
 
 [Copy IP]
@@ -79,14 +77,8 @@ Korisnik na vezi
 
 [Typing Notify]
 Obaveštenja o kucanju
-[Please authorize me to add you to my contact list.]
-
-[Do you want to send authorization request\nto new contact?]
-
 [Open ignore settings]
 
-[Request authorization]
-Zatraži autorizaciju
 [MenuItemEx]
 
 ;file \plugins\MenuItemEx\src\options.cpp
diff --git a/langpacks/serbian/Plugins/MinecraftDynmap.txt b/langpacks/serbian/Plugins/MinecraftDynmap.txt
index 91c3beae5f..1605198e41 100644
--- a/langpacks/serbian/Plugins/MinecraftDynmap.txt
+++ b/langpacks/serbian/Plugins/MinecraftDynmap.txt
@@ -13,8 +13,6 @@
 [Visible name:]
 
 ;file \protocols\MinecraftDynmap\src\chat.cpp
-[Server]
-
 [Admin]
 
 [Normal]
diff --git a/langpacks/serbian/Plugins/MirOTR.txt b/langpacks/serbian/Plugins/MirOTR.txt
index 1d67f9ec33..2e054afc15 100644
--- a/langpacks/serbian/Plugins/MirOTR.txt
+++ b/langpacks/serbian/Plugins/MirOTR.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MirOTR.dll
 ;  Plugin: Miranda OTR
-;  Version: 0.14.1.17
+;  Version: 0.14.2.1
 ;  Authors: ProgAndy & CHEF-KOCH
 ;============================================================
 [OTR (Off-the-Record) plugin for Miranda NG (using some code and ideas from SecureIM, Pidgin-OTR and old Miranda OTR (by SJE)).]
@@ -80,6 +80,17 @@
 
 [&Verify Fingerprint]
 
+;file \plugins\MirOTR\src\icons.cpp
+[OTR private]
+
+[OTR unverified]
+
+[OTR finished]
+
+[OTR not secure]
+
+[Refresh]
+
 ;file \plugins\MirOTR\src\language.h
 [Start OTR]
 
@@ -99,8 +110,6 @@ Ne
 
 [OTR Encryption: Finished]
 
-[&Convert HTML (for Pidgin)]
-
 [OTR encrypted session with '%s' has been terminated]
 
 [Requesting OTR encrypted session with '%s']
@@ -131,16 +140,6 @@ Ne
 
 [OTR encrypted session with '%s' is now using a NOT VERIFIED fingerprint]
 
-[OTR unverified]
-
-[OTR finished]
-
-[OTR private]
-
-[OTR not secure]
-
-[Refresh]
-
 [Generating new private key for protocol '%s'.\nPlease Wait...]
 
 [General]
@@ -236,6 +235,8 @@ Standardno
 
 [OTR Status]
 
+[&Convert HTML (for Pidgin)]
+
 ;file \plugins\MirOTR\src\options.cpp
 [Private Data]
 
diff --git a/langpacks/serbian/Plugins/MirandaG15.txt b/langpacks/serbian/Plugins/MirandaG15.txt
index 0c0d0a0837..90344430cf 100644
--- a/langpacks/serbian/Plugins/MirandaG15.txt
+++ b/langpacks/serbian/Plugins/MirandaG15.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MirandaG15.dll
 ;  Plugin: MirandaG15
-;  Version: 0.1.2.0
+;  Version: 0.1.2.1
 ;  Authors: Martin Kleinhans
 ;============================================================
 [Provides an interface to use Miranda from the LCD of various Logitech devices.]
diff --git a/langpacks/serbian/Plugins/MsgPopup.txt b/langpacks/serbian/Plugins/MsgPopup.txt
index 8f22181391..ba20018880 100644
--- a/langpacks/serbian/Plugins/MsgPopup.txt
+++ b/langpacks/serbian/Plugins/MsgPopup.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MsgPopup.dll
 ;  Plugin: Message popup
-;  Version: 0.1.2.1
+;  Version: 0.1.2.2
 ;  Authors: StDenis
 ;============================================================
 [Plugin replaces message boxes (those having only OK button) with popups.]
diff --git a/langpacks/serbian/Plugins/NewsAggregator.txt b/langpacks/serbian/Plugins/NewsAggregator.txt
index f62b9f887f..27502b02a6 100644
--- a/langpacks/serbian/Plugins/NewsAggregator.txt
+++ b/langpacks/serbian/Plugins/NewsAggregator.txt
@@ -2,12 +2,12 @@
 ;============================================================
 ;  File: NewsAggregator.dll
 ;  Plugin: News aggregator
-;  Version: 0.1.0.4
+;  Version: 0.1.0.5
 ;  Authors: Mataes, FREAK_THEMIGHTY
 ;============================================================
 [RSS/Atom news aggregator.]
 
-;file \plugins\NewsAggregator\Res\Resource.rc
+;file \protocols\NewsAggregator\Res\Resource.rc
 [Add]
 Dodaj
 [Change]
@@ -72,14 +72,14 @@ Korisničko ime
 
 [&Import]
 
-;file \plugins\NewsAggregator\Src\Authentication.cpp
+;file \protocols\NewsAggregator\Src\Authentication.cpp
 [Enter your username]
 
 [Error]
 Greška
 [Enter your password]
 
-;file \plugins\NewsAggregator\Src\CheckFeed.cpp
+;file \protocols\NewsAggregator\Src\CheckFeed.cpp
 [%s\nis a valid feed's address.]
 
 [News Aggregator]
@@ -88,7 +88,7 @@ Greška
 
 [empty]
 
-;file \plugins\NewsAggregator\Src\Icons.cpp
+;file \protocols\NewsAggregator\Src\Icons.cpp
 [Protocol icon]
 
 [Check All Feeds]
@@ -103,13 +103,13 @@ Greška
 
 [Auto Update Disabled]
 
-;file \plugins\NewsAggregator\Src\Menus.cpp
+;file \protocols\NewsAggregator\Src\Menus.cpp
 [Check feed]
 
 [Change feed]
 
-;file \plugins\NewsAggregator\Src\NewsAggregator.cpp
-;file \plugins\NewsAggregator\Src\Options.cpp
+;file \protocols\NewsAggregator\Src\NewsAggregator.cpp
+;file \protocols\NewsAggregator\Src\Options.cpp
 [OPML files]
 
 [Not valid import file.]
@@ -154,11 +154,11 @@ Potpuno ste sigurni?
 
 [Network]
 Mreža
-;file \plugins\NewsAggregator\Src\Services.cpp
+;file \protocols\NewsAggregator\Src\Services.cpp
 [Avatars]
 Avatari
 [Enable/disable auto update]
 
-;file \plugins\NewsAggregator\Src\Utils.cpp
+;file \protocols\NewsAggregator\Src\Utils.cpp
 [NewsAggregator HTTP connections]
 
diff --git a/langpacks/serbian/Plugins/NimContact.txt b/langpacks/serbian/Plugins/NimContact.txt
index f75fc826b3..416f15df4f 100644
--- a/langpacks/serbian/Plugins/NimContact.txt
+++ b/langpacks/serbian/Plugins/NimContact.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Non-IM Contact allows you to add 'contacts' that can act as shortcuts to other programs, or links to web pages.\r\nThe contacts name can be read from a text file (includes any ASCII file).\r\nThis plugin is a combination of Favorites and Text Reader plugins both made by me)]
 
-;file \plugins\Non-IM Contact\res\resource.rc
+;file \protocols\Non-IM Contact\res\resource.rc
 [View/Edit Files]
 
 [Add File]
@@ -108,7 +108,7 @@ Pomoć
 
 [EXAMPLE: %fn1,%fn2]
 
-;file \plugins\Non-IM Contact\src\contactinfo.cpp
+;file \protocols\Non-IM Contact\src\contactinfo.cpp
 [Select Folder]
 Izbor foldera
 [Non-IM Contact protocol timer is Disabled]
@@ -117,7 +117,7 @@ Izbor foldera
 
 [New Non-IM Contact]
 
-;file \plugins\Non-IM Contact\src\dialog.cpp
+;file \protocols\Non-IM Contact\src\dialog.cpp
 [String replacing variables...\r\nThe following are all the valid variables that can be used. Refer to the wiki.miranda-ng.org for a proper explanation.\r\n\r\nfile(X)\t\t<- specifies the file to read from. MUST be followed by either start() or end() or wholeline()\r\nfilename(X)\t<- copies the filename of file X.\r\nstart(...)\t\t<- specifies where to start copying from.\r\nend(...)\t\t<- specifies where to stop copying.\r\nwholeline(line(...))\t<- specifies a whole line to copy\r\n\r\nstart() and end() explained\r\n.........................\r\nMUST start with line() followed by a number or a string inside " marks, OR csv(separatorX) variable. The number specifies which character in the line to start/end copying. The string specifies a string in the line to start/end copying.\r\n\r\ncsv(seperatorX) explained...\r\nSeperator is either "tab" or "space" or any SINGLE character. X is the Xth separator to pass before copying, (or to stop before).\r\n\r\nLastly the line(...) variable...\r\nInside the brackets must be either a number (to specify the line number), or a string inside " marks (to use the line with that string), or lastline(X). The X in lastline is the Xth line above the last line, i.e., lastline(1) will use the 2nd last line of the file. If searching for a line with "some words" you may put a + or - X after the closing ), i.e., line("some words")+3 to go 3 lines after the line with "some words".\r\n\r\nSome examples...\r\nfilename(0)    <- will display the filename of the 0th file\r\nfile(0)wholeline(line(0)))    <- will display the whole first line of the 0th file\r\nfile(0)wholeline(line("hello")-1)))    <- the wholeline above the first occurrence of "hello" in the file\r\nfile(0)start(line(lastline(1))csv(tab2))end(line(lastline())csv(tab4)))    <- starts at the 2nd last line of the file, from the 2nd tab variable, until the 4th tab variable in the last line (in the 0th file)\r\nfile(0)start(line("hello")+1"zzzz")end(line(6)17))    <- starts from the first occurrence of zzzz in the line after the first occurrence of hello, until the 17th character in the 6th line (starting from line 0) of the 0th file.\r\n]
 
 [Contacts Display Info]
@@ -130,7 +130,7 @@ Izbor foldera
 Datoteke
 [Edit Non-IM Contact "%s"]
 
-;file \plugins\Non-IM Contact\src\files.cpp
+;file \protocols\Non-IM Contact\src\files.cpp
 [Do you want to overwrite the contents of the file?\r\n\r\nPressing No will append these contacts to the end of the file.]
 
 [File couldn't be opened]
@@ -139,10 +139,10 @@ Datoteke
 
 [line(%-3d) = | %s]
 
-;file \plugins\Non-IM Contact\src\http.cpp
+;file \protocols\Non-IM Contact\src\http.cpp
 [Non-IM Contacts]
 
-;file \plugins\Non-IM Contact\src\main.cpp
+;file \protocols\Non-IM Contact\src\main.cpp
 [Plugins]
 Plug-inovi
 [Main Icon]
@@ -163,7 +163,7 @@ Plug-inovi
 
 [E&dit Contact Settings]
 
-;file \plugins\Non-IM Contact\src\namereplacing.cpp
+;file \protocols\Non-IM Contact\src\namereplacing.cpp
 [%s - ERROR: no line specified or line not found (in %s)]
 
 [%s - ERROR: file couldn't be opened (in %s)]
diff --git a/langpacks/serbian/Plugins/NotesReminders.txt b/langpacks/serbian/Plugins/NotesReminders.txt
index 81f6c97851..aa65b57907 100644
--- a/langpacks/serbian/Plugins/NotesReminders.txt
+++ b/langpacks/serbian/Plugins/NotesReminders.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: NotesReminders.dll
 ;  Plugin: Sticky Notes & Reminders
-;  Version: 0.1.0.1
+;  Version: 0.2.0.2
 ;  Authors: Joe Kucera, Lubomir Kolev Ivanov, Georg Fischer
 ;============================================================
 [Sticky Notes & Reminders Implementation for Miranda NG.]
@@ -50,12 +50,12 @@
 
 [Add Reminder]
 
-[Trigger On Time && Date:]
-
 [Date]
 
 [Time]
 
+[Repeat each day]
+
 [Reminder Note:]
 
 [None]
@@ -102,8 +102,6 @@ Nema
 
 [D&elete All Reminders]
 
-[Context Menu Note Popup]
-
 [&Hide Note]
 
 [&Always On Top]
@@ -152,9 +150,6 @@ Undo
 
 [&Show / Hide Notes]
 
-;file \plugins\NotesAndReminders\src\globals.h
-[Notes & Reminders]
-
 ;file \plugins\NotesAndReminders\src\hotkeys.cpp
 [New Note]
 
@@ -165,10 +160,6 @@ Undo
 [New Reminder]
 
 ;file \plugins\NotesAndReminders\src\main.cpp
-[Are you sure you want to delete all notes?]
-
-[Are you sure you want to delete all reminders?]
-
 [Delete All Notes]
 
 [Show/Hide Notes]
@@ -195,20 +186,10 @@ Undo
 
 [Sticky Notes]
 
-[Plugins]
-Plug-inovi
 [Add New Note]
 
 [Add New Reminder]
 
-[Alerts]
-Upozorenja
-[Reminder triggered]
-
-[Reminder triggered (Alternative 1)]
-
-[Reminder triggered (Alternative 2)]
-
 [Notes && Reminders]
 
 [New &Note]
@@ -221,6 +202,14 @@ Upozorenja
 
 [Miranda could not load the Notes & Reminders plugin, Msftedit.dll is missing. If you are using WINE, please make sure you have Msftedit.dll installed. Press 'Yes' to continue loading Miranda.]
 
+[Alerts]
+Upozorenja
+[Reminder triggered]
+
+[Reminder triggered (Alternative 1)]
+
+[Reminder triggered (Alternative 2)]
+
 ;file \plugins\NotesAndReminders\src\notes.cpp
 [Black]
 
@@ -268,6 +257,8 @@ Beleške
 
 [Date/Title]
 
+[Are you sure you want to delete all notes?]
+
 ;file \plugins\NotesAndReminders\src\options.cpp
 [Sticky Note Caption]
 
@@ -279,11 +270,17 @@ Beleške
 
 [Select Executable]
 
+[Plugins]
+Plug-inovi
 ;file \plugins\NotesAndReminders\src\reminders.cpp
 [Minutes]
 
 [Hours]
 
+[The specified time is invalid due to begin of daylight saving (summer time).]
+
+[The specified time is invalid.]
+
 [Hour]
 
 [Day]
@@ -292,10 +289,6 @@ Beleške
 
 [Week]
 
-[The specified time is invalid due to begin of daylight saving (summer time).]
-
-[The specified time is invalid.]
-
 [The specified time offset is invalid.]
 
 [&Update Reminder]
@@ -316,5 +309,10 @@ Standardno
 
 [Date of activation]
 
+[Are you sure you want to delete all reminders?]
+
 [Are you sure you want to delete this reminder?]
 
+;file \plugins\NotesAndReminders\src\stdafx.h
+[Notes & Reminders]
+
diff --git a/langpacks/serbian/Plugins/PasteIt.txt b/langpacks/serbian/Plugins/PasteIt.txt
index 57b7bbbe12..83e939292b 100644
--- a/langpacks/serbian/Plugins/PasteIt.txt
+++ b/langpacks/serbian/Plugins/PasteIt.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: PasteIt.dll
 ;  Plugin: Paste it
-;  Version: 1.0.0.3
+;  Version: 1.0.0.4
 ;  Authors: Krzysztof Kral
 ;============================================================
 [Uploads the text to web page and sends the URL to your friends.]
@@ -142,11 +142,11 @@ Potpuno ste sigurni?
 [File '%s' is empty]
 
 ;file \plugins\PasteIt\src\PasteToWeb1.cpp
-[Error during sending text to web page: %s]
+[Error during sending text to web page: %S]
 
 [Error during sending text to web page]
 
-[Error during getting user key from web page: %s]
+[Error during getting user key from web page: %S]
 
 [Paste expire date]
 
diff --git a/langpacks/serbian/Plugins/PluginUpdater.txt b/langpacks/serbian/Plugins/PluginUpdater.txt
index 4522eb4872..4b6e065e02 100644
--- a/langpacks/serbian/Plugins/PluginUpdater.txt
+++ b/langpacks/serbian/Plugins/PluginUpdater.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: PluginUpdater.dll
 ;  Plugin: Plugin updater
-;  Version: 0.2.0.2
+;  Version: 0.2.0.3
 ;  Authors: Mataes, George Hazan
 ;============================================================
 [Installs and updates plugins and other Miranda NG components.]
diff --git a/langpacks/serbian/Plugins/PopupPlus.txt b/langpacks/serbian/Plugins/PopupPlus.txt
index e5f0b1cddc..c5bf96d4e6 100644
--- a/langpacks/serbian/Plugins/PopupPlus.txt
+++ b/langpacks/serbian/Plugins/PopupPlus.txt
@@ -1,6 +1,6 @@
 #muuid {26a9125d-7863-4e01-af0e-d14ef95c5054}
 ;============================================================
-;  File: Popup.dll
+;  File: PopupPlus.dll
 ;  Plugin: Popup plus
 ;  Version: 2.1.1.15
 ;  Authors: MPK, Merlin_de (Luca Santarelli, Victor Pavlychko)
@@ -82,7 +82,7 @@ Tip dekoracije:
 
 [Download more skins]
 
-[Popup History]
+[Popup history]
 
 [Desktop]
 
@@ -263,15 +263,11 @@ Pozadina
 [Avatar border]
 
 ;file \plugins\Popup\src\history.cpp
-[Popup History is disabled]
+[Popup history is disabled]
 
-[Popup History message]
+[Popup history message]
 
 ;file \plugins\Popup\src\icons.cpp
-[Popups are enabled]
-
-[Popups are disabled]
-
 [With "favorite" overlay]
 
 [With "fullscreen" overlay]
@@ -309,13 +305,13 @@ Akcije
 Kontakti
 [Advanced]
 Napredno
-[Toggle Popups]
+[Toggle popups]
 
-[Enable Popups]
+[Enable popups]
 
-[Disable Popups]
+[Disable popups]
 
-[Popup Plus]
+[Popup plus]
 
 [Error: I could not register the Popup Window class.\r\nThe plugin will not operate.]
 
diff --git a/langpacks/serbian/Plugins/SkypeWeb.txt b/langpacks/serbian/Plugins/SkypeWeb.txt
index 485de9e942..3c5fb60d5e 100644
--- a/langpacks/serbian/Plugins/SkypeWeb.txt
+++ b/langpacks/serbian/Plugins/SkypeWeb.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: SkypeWeb.dll
 ;  Plugin: Skype protocol (Web)
-;  Version: 0.12.3.1
+;  Version: 0.12.3.3
 ;  Authors: Miranda NG team
 ;============================================================
 [Skype protocol support for Miranda NG. Based on new Skype for Web.]
diff --git a/langpacks/serbian/Plugins/SmileyAdd.txt b/langpacks/serbian/Plugins/SmileyAdd.txt
index abe73231d3..6f212c0782 100644
--- a/langpacks/serbian/Plugins/SmileyAdd.txt
+++ b/langpacks/serbian/Plugins/SmileyAdd.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: SmileyAdd.dll
 ;  Plugin: SmileyAdd
-;  Version: 0.3.1.0
+;  Version: 0.3.1.1
 ;  Authors: Peacow, nightwish, bid, borkra
 ;============================================================
 [Smiley support for Miranda NG.]
diff --git a/langpacks/serbian/Plugins/StatusManager.txt b/langpacks/serbian/Plugins/StatusManager.txt
index 42a7b9be31..3aae180c5c 100644
--- a/langpacks/serbian/Plugins/StatusManager.txt
+++ b/langpacks/serbian/Plugins/StatusManager.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: StatusManager.dll
 ;  Plugin: Status manager
-;  Version: 1.2.0.4
+;  Version: 1.2.0.5
 ;  Authors: P Boon
 ;============================================================
 [A connection checker and auto away module. Also allows you to define the status Miranda should set on startup, configurable per protocol.]
diff --git a/langpacks/serbian/Plugins/TabSRMM.txt b/langpacks/serbian/Plugins/TabSRMM.txt
index 3bbae84fd0..92e419dd03 100644
--- a/langpacks/serbian/Plugins/TabSRMM.txt
+++ b/langpacks/serbian/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: TabSRMM.dll
 ;  Plugin: TabSRMM
-;  Version: 3.5.0.12
+;  Version: 3.5.0.13
 ;  Authors: The Miranda developers team and contributors
 ;============================================================
 [IM and group chat module for Miranda NG.]
@@ -178,8 +178,6 @@ Sobe za razgovor
 
 [Use the message log color theme for group chat popups]
 
-[No compatible popup plugin was found. The event notification\nsystem is not available.]
-
 [Dialog]
 
 [Cancel]
@@ -1697,10 +1695,6 @@ Log poruke
 
 [Feature enabled (used as overlay)]
 
-[Enable typing notification]
-
-[Disable typing notification]
-
 ;file \plugins\TabSRMM\src\msgs.h
 [Message windows - IM]
 
@@ -1984,10 +1978,10 @@ Zatvori prozor nakon slanja poruke
 
 [Enable &typing notification]
 
-[...is typing a message.]
-
 [...has stopped typing.]
 
+[...is typing a message.]
+
 [Contact started typing]
 Kontakt kuca poruku
 [Contact stopped typing]
diff --git a/langpacks/serbian/Plugins/UInfoEx.txt b/langpacks/serbian/Plugins/UInfoEx.txt
index d65bb86399..db5d58146e 100644
--- a/langpacks/serbian/Plugins/UInfoEx.txt
+++ b/langpacks/serbian/Plugins/UInfoEx.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: UInfoEx.dll
 ;  Plugin: User info ext
-;  Version: 0.8.5.1
+;  Version: 0.8.5.2
 ;  Authors: DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
 ;============================================================
 [Extended UserInfo module for Miranda NG. Provides interface to edit all contact information.]
@@ -1110,11 +1110,9 @@ Slanje e-maila
 
 [Abort Refreshing Contact Details]
 
-[Do you want to cancel the current refresh procedure?]
-
 [Miranda must be online for refreshing contact information!]
 
-[The function caused an exception!]
+[Do you want to cancel the current refresh procedure?]
 
 ;file \plugins\UserInfoEx\src\svc_reminder.cpp
 [%s has %s today.]
@@ -1216,16 +1214,8 @@ Slanje e-maila
 ;file \plugins\UserInfoEx\src\ex_import\svc_ExImXML.cpp
 [Can't create xml file!\n%S]
 
-[Export took %f ms]
-
 [Contact: %s (%S)]
 
-[Importing %s caused error %d]
-
-[Loading contact %s from xml failed with error %d]
-
-[Importing Owner caused error %d]
-
 [Parser is unable to load XMLCard "%s"\nError: %d\nDescription: %s]
 
 [The selected file is no valid XMLCard]
@@ -1238,12 +1228,8 @@ Dovršene
 
 [Selected XMLCard does not contain an owner contact!]
 
-[Import took %f ms]
-
 [added contacts: %u / %u\nadded settings: %u / %u\nadded events %u / %u\nduplicated events: %u]
 
-[FATAL: An exception was thrown while importing contacts from xmlCard!]
-
 ;file \plugins\UserInfoEx\src\Flags\svc_flags.cpp
 [Flags (UInfoEx)]
 
diff --git a/langpacks/serbian/Plugins/VKontakte.txt b/langpacks/serbian/Plugins/VKontakte.txt
index 44273c7d06..4bc695c877 100644
--- a/langpacks/serbian/Plugins/VKontakte.txt
+++ b/langpacks/serbian/Plugins/VKontakte.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: VKontakte.dll
 ;  Plugin: VKontakte protocol
-;  Version: 0.1.8.1
+;  Version: 0.1.9.0
 ;  Authors: Miranda NG team
 ;============================================================
 [VKontakte protocol support for Miranda NG.]
diff --git a/langpacks/serbian/Plugins/Weather.txt b/langpacks/serbian/Plugins/Weather.txt
index 2cd0527f20..2f3d33a343 100644
--- a/langpacks/serbian/Plugins/Weather.txt
+++ b/langpacks/serbian/Plugins/Weather.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Retrieves weather information and displays it in your contact list.]
 
-;file \plugins\Weather\res\resource.rc
+;file \protocols\Weather\res\resource.rc
 [Update]
 
 [Brief Info]
@@ -254,7 +254,7 @@ Grad:
 
 [To default]
 
-;file \plugins\Weather\src\stdafx.h
+;file \protocols\Weather\src\stdafx.h
 [N/A]
 
 [Invalid ID format, missing "/" (10)]
@@ -337,7 +337,7 @@ Grad:
 
 [The URL for weather map has not been set. You can set it from the Edit Settings dialog.]
 
-;file \plugins\Weather\src\weather.cpp
+;file \protocols\Weather\src\weather.cpp
 [Enable/disable auto update]
 
 [Auto Update Enabled]
@@ -348,7 +348,7 @@ Grad:
 
 [Alert Issued]
 
-;file \plugins\Weather\src\weather_addstn.cpp
+;file \protocols\Weather\src\weather_addstn.cpp
 [Current weather information for %s.]
 
 [%s is now the default weather station]
@@ -361,7 +361,7 @@ Grad:
 
 [<Enter station ID here>]
 
-;file \plugins\Weather\src\weather_contacts.cpp
+;file \protocols\Weather\src\weather_contacts.cpp
 [Weather condition was not logged.]
 
 [Get city name from ID]
@@ -378,7 +378,7 @@ Vrati na standardno
 Tekstualne datoteke
 [All Files]
 Sve datoteke
-;file \plugins\Weather\src\weather_conv.cpp
+;file \protocols\Weather\src\weather_conv.cpp
 [mb]
 
 [in]
@@ -391,15 +391,15 @@ Sve datoteke
 
 [HTTP Error %i]
 
-;file \plugins\Weather\src\weather_data.cpp
+;file \protocols\Weather\src\weather_data.cpp
 [<Enter city name here>]
 
 [Error when obtaining data: %s]
 
-;file \plugins\Weather\src\weather_http.cpp
+;file \protocols\Weather\src\weather_http.cpp
 [Weather HTTP connections]
 
-;file \plugins\Weather\src\weather_icons.cpp
+;file \protocols\Weather\src\weather_icons.cpp
 [Protocol icon]
 
 [Update Disabled]
@@ -420,7 +420,7 @@ Sve datoteke
 
 [Edit Settings]
 
-;file \plugins\Weather\src\weather_info.cpp
+;file \protocols\Weather\src\weather_info.cpp
 [Name]
 Naziv
 [Author]
@@ -459,21 +459,21 @@ Ime:
 bajtova
 [Description:]
 Opis:
-;file \plugins\Weather\src\weather_ini.cpp
+;file \protocols\Weather\src\weather_ini.cpp
 [All update data has been reloaded.]
 
 [Invalid ini format for: %s]
 
 [No update data file is found. Please check your Plugins\\Weather directory.]
 
-;file \plugins\Weather\src\weather_mwin.cpp
+;file \protocols\Weather\src\weather_mwin.cpp
 [Frame Font]
 
 [Frame Title Font]
 
 [Frame Background]
 
-;file \plugins\Weather\src\weather_opt.cpp
+;file \protocols\Weather\src\weather_opt.cpp
 [Weather Protocol Text Preview]
 
 [Network]
@@ -484,8 +484,8 @@ Uopšteno
 
 [Popups]
 Balončići
-;file \plugins\Weather\src\weather_popup.cpp
-;file \plugins\Weather\src\weather_svcs.cpp
+;file \protocols\Weather\src\weather_popup.cpp
+;file \protocols\Weather\src\weather_svcs.cpp
 [Station ID]
 
 [Disable &weather notification]
@@ -512,10 +512,10 @@ Balončići
 
 [Display in a frame]
 
-;file \plugins\Weather\src\weather_update.cpp
+;file \protocols\Weather\src\weather_update.cpp
 [Unable to retrieve weather information for %s]
 
-;file \plugins\Weather\src\weather_userinfo.cpp
+;file \protocols\Weather\src\weather_userinfo.cpp
 [Variable]
 
 [Information]
diff --git a/langpacks/serbian/Plugins/WebView.txt b/langpacks/serbian/Plugins/WebView.txt
index 3a57478754..622268789d 100644
--- a/langpacks/serbian/Plugins/WebView.txt
+++ b/langpacks/serbian/Plugins/WebView.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Adds web pages as contacts to your contact list and can display text and/or issue change alerts from those pages in a window.]
 
-;file \plugins\WebView\res\webview.rc
+;file \protocols\WebView\res\webview.rc
 [Webview]
 
 [Update data every]
@@ -180,7 +180,7 @@ Ko&piranje svega
 
 [C&lear all]
 
-;file \plugins\WebView\src\main.cpp
+;file \protocols\WebView\src\main.cpp
 [Alert event]
 
 [Auto update disabled]
@@ -207,14 +207,14 @@ Ko&piranje svega
 
 [Stop data processing]
 
-;file \plugins\WebView\src\webview.cpp
+;file \protocols\WebView\src\webview.cpp
 [All Webview sites have been updated.]
 
 [Network]
 Mreža
 [Popups]
 Balončići
-;file \plugins\WebView\src\webview_alerts.cpp
+;file \protocols\WebView\src\webview_alerts.cpp
 [Cannot write to file]
 
 [Last updated on]
@@ -245,7 +245,7 @@ Balončići
 
 [Loaded from cache]
 
-;file \plugins\WebView\src\webview_datawnd.cpp
+;file \protocols\WebView\src\webview_datawnd.cpp
 [ERROR: You have two or more Webview contacts with the same URL and contact name.]
 
 [Alert options]
@@ -258,7 +258,7 @@ Balončići
 
 [Disable stick to the front]
 
-;file \plugins\WebView\src\webview_getdata.cpp
+;file \protocols\WebView\src\webview_getdata.cpp
 [URL not supplied]
 
 [Download in progress, please wait...]
@@ -305,7 +305,7 @@ Prisutan
 
 [Alert test conditions not met; press the refresh button to view content.]
 
-;file \plugins\WebView\src\webview_opts.cpp
+;file \protocols\WebView\src\webview_opts.cpp
 [No whitespace removal]
 
 [Minimal level of whitespace removal]
@@ -342,7 +342,7 @@ Prisutan
 
 [Invalid symbol present in contact name.]
 
-;file \plugins\WebView\src\webview_services.cpp
+;file \protocols\WebView\src\webview_services.cpp
 [Cache folder does not exist.]
 
 [Missing "psite.bat" file.]
diff --git a/langpacks/serbian/Plugins/WhoUsesMyFiles.txt b/langpacks/serbian/Plugins/WhoUsesMyFiles.txt
index a8f6008b26..3fd679fef8 100644
--- a/langpacks/serbian/Plugins/WhoUsesMyFiles.txt
+++ b/langpacks/serbian/Plugins/WhoUsesMyFiles.txt
@@ -55,12 +55,10 @@ Boje operativnog sistema
 [Show current connections]
 
 ;file \plugins\WhoUsesMyFiles\src\options.cpp
-[Popup plugin not found!]
+[Common Dialog Error 0x%lx]
 
 [Error]
 Greška
-[Common Dialog Error 0x%lx]
-
 [Not implemented yet...]
 
 [Who uses my files]
diff --git a/langpacks/serbian/Plugins/YAMN.txt b/langpacks/serbian/Plugins/YAMN.txt
index 0248206158..be097e56a9 100644
--- a/langpacks/serbian/Plugins/YAMN.txt
+++ b/langpacks/serbian/Plugins/YAMN.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Mail notifier and browser for Miranda NG. Included POP3 protocol.]
 
-;file \plugins\YAMN\res\YAMN.rc
+;file \protocols\YAMN\res\YAMN.rc
 [Installed plugins]
 
 [Version:]
@@ -156,7 +156,7 @@ Na ručku
 Boja pozadine
 [Text color]
 Boja teksta
-;file \plugins\YAMN\src\main.cpp
+;file \protocols\YAMN\src\main.cpp
 [Check &mail (All Account)]
 
 [Check &mail (This Account)]
@@ -171,17 +171,17 @@ Boja teksta
 
 [Connect Fail]
 
-;file \plugins\YAMN\src\main.h
+;file \protocols\YAMN\src\main.h
 [New mail message]
 
 [Connect failed]
 
-;file \plugins\YAMN\src\services.cpp
+;file \protocols\YAMN\src\services.cpp
 [Nick]
 Nadimak
 [No new mail message]
 
-;file \plugins\YAMN\src\browser\badconnect.cpp
+;file \protocols\YAMN\src\browser\badconnect.cpp
 [%s - connection error]
 
 [An error occurred. Error code: %d]
@@ -190,7 +190,7 @@ Nadimak
 
 [ - connection error]
 
-;file \plugins\YAMN\src\browser\mailbrowser.cpp
+;file \protocols\YAMN\src\browser\mailbrowser.cpp
 [%s - %d new mail messages, %d total]
 
 [%s : %d new mail message(s), %d total]
@@ -229,15 +229,15 @@ Veličina
 
 [Delete confirmation]
 
-;file \plugins\YAMN\src\mails\mime.cpp
+;file \protocols\YAMN\src\mails\mime.cpp
 [Translate header error]
 
 [Part]
 
-;file \plugins\YAMN\src\proto\netlib.cpp
+;file \protocols\YAMN\src\proto\netlib.cpp
 [%s connection]
 
-;file \plugins\YAMN\src\proto\pop3\pop3comm.cpp
+;file \protocols\YAMN\src\proto\pop3\pop3comm.cpp
 [Disconnected]
 
 [POP3 protocol (internal)]
@@ -314,7 +314,7 @@ Veličina
 
 [Error %d-%d-%d-%d:]
 
-;file \plugins\YAMN\src\proto\pop3\pop3opt.cpp
+;file \protocols\YAMN\src\proto\pop3\pop3opt.cpp
 [Network]
 Mreža
 [Accounts]
diff --git a/langpacks/serbian/Untranslated/=CORE=.txt b/langpacks/serbian/Untranslated/=CORE=.txt
index caf038ca53..af1856ee65 100644
--- a/langpacks/serbian/Untranslated/=CORE=.txt
+++ b/langpacks/serbian/Untranslated/=CORE=.txt
@@ -1,3 +1,27 @@
+[Popup history]
+[Case sensitive]
+[Default timeout]
+[Never timeout]
+[Set timeout:]
+[Width:]
+[Maximum height:]
+[Opacity (%):]
+[Border]
+[Round corners (window)]
+[Preview]
+[Transparent background]
+[Layout]
+[Avatar size:]
+[Disable when]
+[Global hover]
+[Sidebar width:]
+[Text indent:]
+[Padding:]
+[Round corners (avatar)]
+[Text color:]
+[Background color:]
+[Set timeout]
+[Timeout value (0 = default):]
 [These changes will take effect the next time you connect to the network.]
 [Insert submenu]
 [Module:]
@@ -13,6 +37,44 @@
 [&E-mail]
 [Remove status (10x10)]
 [Chat]
+[Popups are enabled]
+[Popups are disabled]
+[Example]
+[The quick brown fox jumped over the lazy dog.]
+[Example With a Long Title]
+[Thequickbrownfoxjumpedoverthelazydog.]
+[An avatar.]
+[Bottom right]
+[Bottom left]
+[Top right]
+[Top left]
+[Icon on left]
+[Icon on right]
+[No time]
+[Time on left]
+[Time on right]
+[Time above avatar]
+[No avatar]
+[Left avatar]
+[Right avatar]
+[Full-screen app running]
+[No animate]
+[Horizontal animate]
+[Vertical animate]
+[You cannot set a default timeout of 0.\nValue has been reset.]
+[Settings]
+[Classes]
+[Disable popups]
+[Enable popups]
+[Toggle popups]
+[First line]
+[Second line]
+[Time]
+[Sidebar]
+[Title underline]
+[Copy title to clipboard]
+[Copy message to clipboard]
+[Copy timestamp to clipboard]
 [Single]
 [Close relationships]
 [Engaged]
diff --git a/langpacks/serbian/Untranslated/Actman.txt b/langpacks/serbian/Untranslated/Actman.txt
index 397dba3ec7..c513405b5c 100644
--- a/langpacks/serbian/Untranslated/Actman.txt
+++ b/langpacks/serbian/Untranslated/Actman.txt
@@ -300,13 +300,13 @@
 [with confirmation]
 [without confirmation]
 [Empty updater download folder]
-[Popup Plus (popup.dll) latest YAPP (yapp.dll)]
-[Enables or disables Popup windows]
+[Popup plus (PopupPlus.dll) latest StdPopup (StdPopup.dll)]
+[Enables or disables popup windows]
 [Notify]
-[YAPP or Popup]
+[StdPopup or Popup plus]
 [Popup window]
 [Unicode Text]
-[Enables or disables Popup windows (maybe deprecated)]
+[Enables or disables popup windows (maybe deprecated)]
 [result of protocol service call]
 [Send a general request through the protocol chain for a contact]
 [str, account name]
diff --git a/langpacks/serbian/Untranslated/ChangeKeyboardLayout.txt b/langpacks/serbian/Untranslated/ChangeKeyboardLayout.txt
index 97ca93f8fd..f1de431a1d 100644
--- a/langpacks/serbian/Untranslated/ChangeKeyboardLayout.txt
+++ b/langpacks/serbian/Untranslated/ChangeKeyboardLayout.txt
@@ -27,5 +27,4 @@
 [Preview]
 [Changing Layout]
 [Changing Case]
-[Popup]
 [ChangeKeyboardLayout]
diff --git a/langpacks/serbian/Untranslated/Clist_modern.txt b/langpacks/serbian/Untranslated/Clist_modern.txt
index 71a17122c8..72352521c2 100644
--- a/langpacks/serbian/Untranslated/Clist_modern.txt
+++ b/langpacks/serbian/Untranslated/Clist_modern.txt
@@ -258,6 +258,7 @@
 [Last message time]
 [Account name]
 [Rate]
+[Last online]
 [-Nothing-]
 [Hide to tray]
 [Behind left edge]
@@ -280,7 +281,6 @@
 [Center group names]
 [Right align group names]
 [Row]
-[Row design]
 [Show avatar]
 [Hide avatar]
 [Show contact &avatar]
@@ -291,13 +291,6 @@
 [Close Miranda]
 [Restore last status]
 [Show/Hide offline users]
-[Empty %s cell]
-[column]
-[line]
-[columns]
-[lines]
-[%s, contain %s]
-[ layered]
 [( unknown )]
 [%s\n\n%s\n\nAuthor(s):\t %s\nContact:\t %s\nWeb:\t %s\n\nFile:\t %s]
 [%s\n\n%s\n\nAuthor(s): %s\nContact:\t %s\nWeb:\t %s\n\nFile:\t %s]
diff --git a/langpacks/serbian/Untranslated/CmdLine.txt b/langpacks/serbian/Untranslated/CmdLine.txt
index f72b570375..a160c9f817 100644
--- a/langpacks/serbian/Untranslated/CmdLine.txt
+++ b/langpacks/serbian/Untranslated/CmdLine.txt
@@ -90,4 +90,3 @@
 [Command '%s' is not currently supported.]
 [Could not create CommandLine listening server!]
 [You can only run one instance of CmdLine plugin.]
-[Notify]
diff --git a/langpacks/serbian/Untranslated/CurrencyRates.txt b/langpacks/serbian/Untranslated/CurrencyRates.txt
index 2120029629..76866656bf 100644
--- a/langpacks/serbian/Untranslated/CurrencyRates.txt
+++ b/langpacks/serbian/Untranslated/CurrencyRates.txt
@@ -38,6 +38,7 @@
 [&Display in Contact List as:]
 [&Status Message:]
 [&Tendency:]
+[&Personal key:]
 [&Advanced Settings...]
 [Rate Info]
 [There is nothing to show]
@@ -49,10 +50,6 @@
 [Info provided by]
 [Enter positive number.]
 [Currency Rate]
-[Error occurred during HTML parsing.]
-[Error occurred during site access.]
-[Currency Symbol]
-[Currency Name]
 [Source of Information]
 [Rate Value]
 [Previous Rate Value]
@@ -62,13 +59,8 @@
 [Percentage Character (%)]
 [Tabulation]
 [Left slash (\\)]
-[Open Price]
-[Percent Change to After Hours]
-[Percent Change to Yesterday Close]
-[Day's High]
-[Day's Low]
-[Previous Close]
-[Change]
+[Error occurred during HTML parsing.]
+[Error occurred during site access.]
 [From Currency Full Name]
 [From Currency Short Name]
 [Into Currency Full Name]
@@ -89,6 +81,8 @@
 [Enable/Disable Currency Rates Auto Update]
 [Currency Rates Auto Update Enabled]
 [Currency Rates Auto Update Disabled]
+[Currency Symbol]
+[This plugin requires a personal key. Press Yes to obtain it at the site and then enter the result in the Options dialog, otherwise this plugin will fail.]
 [CurrencyRates HTTP connections]
 [Protocol icon]
 [Currency Rate up]
@@ -100,7 +94,6 @@
 [Import]
 [XML File (*.xml)]
 [All files (*.*)]
-[Miranda could not load CurrencyRates plugin. XML parser is missing.]
 [Miranda could not load CurrencyRates plugin. Microsoft HTML parser is missing.]
 [Log Files (*.txt,*.log)]
 [Enter integer value]
diff --git a/langpacks/serbian/Untranslated/Db_autobackups.txt b/langpacks/serbian/Untranslated/Db_autobackups.txt
index ed3005f651..337b2a0254 100644
--- a/langpacks/serbian/Untranslated/Db_autobackups.txt
+++ b/langpacks/serbian/Untranslated/Db_autobackups.txt
@@ -12,7 +12,6 @@
 [Compress backup to zip-archive]
 [Backup profile folder]
 [Disable progress bar]
-[Disable popups]
 [Use CloudFile]
 [Backup NOW]
 [Backup progress]
@@ -21,6 +20,8 @@
 [Uploading to cloud failed]
 [Database backed up]
 [Database back up in process...]
+[Enable &AutoBackups notification]
+[Disable &AutoBackups notification]
 [Miranda NG databases]
 [Compressed Miranda NG databases]
 [Database]
diff --git a/langpacks/serbian/Untranslated/Discord.txt b/langpacks/serbian/Untranslated/Discord.txt
index 864a0cce85..cf29a5de88 100644
--- a/langpacks/serbian/Untranslated/Discord.txt
+++ b/langpacks/serbian/Untranslated/Discord.txt
@@ -1,7 +1,8 @@
 [Discord support for Miranda NG.]
 [Default group:]
+[Enable group chats]
 [Do not open chat windows on creation]
-[Use subgroups for guild's channels (requires restart)]
+[Use subgroups for server channels (requires restart)]
 [edited at]
 [Change &nickname]
 [Channel control]
@@ -16,11 +17,15 @@
 [Enter channel name]
 [Enter invitation code you received]
 [Do you really want to leave the guild?]
+[Disable sync]
+[Enable sync]
 [Join guild]
 [Copy my Discord ID]
 [Leave guild]
 [Create new channel]
 [Copy Discord ID]
+[Enable guild sync]
+[Load server history]
 [Account]
 [%s server connection]
 [%s gateway connection]
diff --git a/langpacks/serbian/Untranslated/Facebook.txt b/langpacks/serbian/Untranslated/Facebook.txt
index 13cdc5dcfe..9649480afa 100644
--- a/langpacks/serbian/Untranslated/Facebook.txt
+++ b/langpacks/serbian/Untranslated/Facebook.txt
@@ -57,10 +57,10 @@
 [User &history]
 [Delete conversation]
 [This will permanently delete the conversation history]
-[Former]
 [Myself]
 [Friend]
 [User]
+[Former]
 [Notifications]
 [%s and more (%d)]
 [Login error: %s]
diff --git a/langpacks/serbian/Untranslated/ICQ.txt b/langpacks/serbian/Untranslated/ICQ.txt
index 4203433959..489c4932c8 100644
--- a/langpacks/serbian/Untranslated/ICQ.txt
+++ b/langpacks/serbian/Untranslated/ICQ.txt
@@ -2,6 +2,8 @@
 [UIN/e-mail:]
 [Sign in/sign up using phone]
 [Do not open chat windows on creation]
+[Use tray icon notifications]
+[Launch mailbox in a browser on click]
 [If a contact goes Offline, set this status instead and cache it for given timeout in seconds (0 - disabled)]
 [After that, set this status to a contact and move it offline after specified timeout in seconds (0 - disabled)]
 [Send group chat invitation]
@@ -16,7 +18,10 @@
 [&Invite a user]
 [&Leave/destroy chat]
 [Do you really want to remove it from ignore list?]
+[E-mail notification]
 [Remove Ignore]
+[You received e-mail from %s: %s]
+[You have %d unread emails]
 [%s server connection]
 [Synchronize server groups]
 [Edit ignore list]
diff --git a/langpacks/serbian/Untranslated/Import.txt b/langpacks/serbian/Untranslated/Import.txt
index ac1d8129b4..53204c276b 100644
--- a/langpacks/serbian/Untranslated/Import.txt
+++ b/langpacks/serbian/Untranslated/Import.txt
@@ -42,7 +42,6 @@
 [Skipping contact, account %S cannot be mapped.]
 [Skipping contact, %S not installed.]
 [Skipping non-IM contact (%S)]
-[Skipping %S contact, ID not found]
 [Skipping duplicate %S contact %s]
 [Failed to add %S contact %s]
 [Added %S contact %s, '%s']
diff --git a/langpacks/serbian/Untranslated/Jabber.txt b/langpacks/serbian/Untranslated/Jabber.txt
index 10f12b5aa1..c0585e1ba3 100644
--- a/langpacks/serbian/Untranslated/Jabber.txt
+++ b/langpacks/serbian/Untranslated/Jabber.txt
@@ -128,6 +128,7 @@
 [Refresh]
 [JID:]
 [Node:]
+[Filter:]
 [Member Information]
 [Role:]
 [Set role]
@@ -159,15 +160,8 @@
 [Frame text]
 [Jabber Activity]
 [Jabber Mood]
-[Error %s %s]
-[Select Command]
-[Not supported]
 [Done]
-[In progress. Please Wait...]
 [Execute]
-[Requesting command list. Please wait...]
-[Jabber Ad-Hoc commands at %s]
-[Sending Ad-Hoc command to %s]
 [Jabber Agent Registration]
 [No message]
 [Register]
@@ -229,19 +223,11 @@
 [Visitor]
 [Participant]
 [Moderator]
-[Visitors]
-[Participants]
-[Moderators]
 [Owners]
-[User %s is now banned.]
-[User %s changed status to %s with message: %s]
-[User %s changed status to %s]
-[Room configuration was changed.]
-[Outcast]
-[Affiliation of %s was changed to '%s'.]
+[Moderators]
+[Participants]
+[Visitors]
 [Role of %s was changed to '%s'.]
-[because room is now members-only]
-[user banned]
 [Change &nickname]
 [&Invite a user]
 [&Roles]
@@ -285,8 +271,6 @@
 [Real &JID: %s]
 [Invite Users to\n%s]
 [%s (not on roster)]
-[%s from\n%s]
-[Real JID not available]
 [Reason to kick %s]
 [Reason to ban %s]
 [Invite %s to %s]
@@ -321,25 +305,14 @@
 [Copy JID]
 [Copy node name]
 [Copy node information]
-[Identities]
-[category]
-[type]
-[Category]
-[Type]
-[Supported features]
-[Info request error]
-[Items request error]
-[Set filter...]
 [Failed to retrieve room list from server.]
 [No rooms available on server.]
 [Room list request timed out.]
-[<no nick>]
 [Loading...]
 [Please wait for room list to download.]
 [Please specify group chat directory first.]
 [Bookmarks...]
 [Change nickname in <%s>]
-[has set the subject to:]
 [Group chat invitation to\n%s]
 [transport]
 [Multi-User Conference]
@@ -383,7 +356,7 @@
 [Discovery]
 [Privacy]
 [Authentication failed for %s.]
-[Jabber Authentication]
+[Authentication]
 [Registration successful]
 [Password is successfully changed. Don't forget to update your password in the Jabber protocol option.]
 [Password cannot be changed.]
@@ -668,10 +641,6 @@
 [Affiliation changes]
 [Role changes]
 [Don't notify history messages]
-[Subscription]
-[Uploading...]
-[Downloading...]
-[XML for MS Excel (UTF-8 encoded)]
 [Account]
 [Public XMPP Network]
 [Secure XMPP Network]
@@ -686,7 +655,6 @@
 [Odnoklassniki]
 [S.ms]
 [Some changes will take effect the next time you connect to the Jabber network.]
-[Set New Password for %s@%S]
 [New password does not match.]
 [Current password is incorrect.]
 [Sending request, please wait...]
@@ -700,6 +668,25 @@
 [Default privacy list successfully declined]
 [Error occurred while setting default list]
 [Allow]
+[List has no rules, empty lists will be deleted then changes applied]
+[allow ]
+[deny ]
+[all.]
+[ and ]
+[incoming presences]
+[outgoing presences]
+[queries]
+[Else ]
+[If Jabber ID is ']
+[ (nickname: ]
+[If group is ']
+[If subscription is ']
+[then ]
+[ (act., def.)]
+[ (active)]
+[ (default)]
+[Ready.]
+[Privacy lists are not saved, discard any changes and exit?]
 [Simple mode]
 [Advanced mode]
 [Add JID]
@@ -720,25 +707,6 @@
 [Presence (in)]
 [Presence (out)]
 [Query]
-[List has no rules, empty lists will be deleted then changes applied]
-[allow ]
-[deny ]
-[all.]
-[ and ]
-[incoming presences]
-[outgoing presences]
-[queries]
-[Else ]
-[If Jabber ID is ']
-[ (nickname: ]
-[If group is ']
-[If subscription is ']
-[then ]
-[ (act., def.)]
-[ (active)]
-[ (default)]
-[Ready.]
-[Privacy lists are not saved, discard any changes and exit?]
 [Please save list before activating]
 [First, save the list]
 [Please save list before you make it the default list]
@@ -750,38 +718,11 @@
 [No compatible file transfer mechanism exists]
 [Protocol is offline or no JID]
 [No valid OMEMO session exists]
-[Command completed successfully]
-[Error occurred during processing command]
-[Set status]
-[Set options]
-[Forward unread messages]
-[Leave group chats]
-[Lock workstation]
-[Quit Miranda NG]
-[Change Status]
-[Choose the status and status message]
-[Priority]
-[Status message]
-[Change global status]
-[Set Options]
-[Set the desired options]
-[Automatically Accept File Transfers]
-[Play sounds]
-[Disable remote controlling (check twice what you are doing)]
-[There is no messages to forward]
-[Forward options]
-[%d message(s) to be forwarded]
-[Mark messages as read]
-[%d message(s) forwarded]
-[Workstation successfully locked]
-[Error %d occurred during workstation lock]
-[Confirmation needed]
-[Please confirm Miranda NG shutdown]
-[There is no group chats to leave]
-[Choose the group chats you want to leave]
-[Error %s %s\r\nPlease select other server]
+[Subscription]
+[Uploading...]
+[Downloading...]
+[XML for MS Excel (UTF-8 encoded)]
 [Error: unknown reply received\r\nPlease select other server]
-[Error %s %s\r\nTry to specify more detailed]
 [Search error]
 [Select/type search service URL above and press <Go>]
 [Please wait...\r\nConnecting search server...]
@@ -792,6 +733,7 @@
 [declined subscription]
 [sent error presence]
 [sent unknown presence type]
+[Outcast]
 [Status:]
 [Real JID:]
 [Enter password for %s]
@@ -799,14 +741,11 @@
 [Error: Cannot connect to the server]
 [Error: Connection lost]
 [Requesting registration instruction...]
-[Authentication failed for %s@%S.]
-[Message redirected from: %s\r\n%s]
+[Registration canceled]
 [Sending registration information...]
 [Resource]
 [Software]
-[Idle since]
-[Client capabilities]
-[Software information]
+[Last activity]
 [Operating system]
 [Operating system version]
 [Software version]
@@ -814,14 +753,10 @@
 [Mood]
 [Activity]
 [Tune]
-[both]
-[from]
 [Last logoff time]
 [Uptime]
 [Logoff message]
-[<no information available>]
 [Last active resource]
-[Please switch online to see more details.]
 [Copy only this value]
 [format]
 [Unknown format]
diff --git a/langpacks/serbian/Untranslated/MSN.txt b/langpacks/serbian/Untranslated/MSN.txt
index 41c05832ad..bf6824454c 100644
--- a/langpacks/serbian/Untranslated/MSN.txt
+++ b/langpacks/serbian/Untranslated/MSN.txt
@@ -51,7 +51,6 @@
 [&Kick user]
 [&Op user]
 [&Deop user]
-[%I64u bytes]
 [MSN Alert]
 [User not online]
 [IID_IOleObject failed.]
diff --git a/langpacks/serbian/Untranslated/MenuEx.txt b/langpacks/serbian/Untranslated/MenuEx.txt
index 4db6443a31..b339096a1a 100644
--- a/langpacks/serbian/Untranslated/MenuEx.txt
+++ b/langpacks/serbian/Untranslated/MenuEx.txt
@@ -26,7 +26,5 @@
 [Copy xStatus Message]
 [All]
 [Authorization]
-[Please authorize me to add you to my contact list.]
-[Do you want to send authorization request\nto new contact?]
 [Open ignore settings]
 [MenuItemEx]
diff --git a/langpacks/serbian/Untranslated/MinecraftDynmap.txt b/langpacks/serbian/Untranslated/MinecraftDynmap.txt
index f1f657da39..acbda01caa 100644
--- a/langpacks/serbian/Untranslated/MinecraftDynmap.txt
+++ b/langpacks/serbian/Untranslated/MinecraftDynmap.txt
@@ -1,7 +1,6 @@
 [Minecraft Dynmap support for Miranda NG.]
 [Server:]
 [Visible name:]
-[Server]
 [Admin]
 [Normal]
 [You]
diff --git a/langpacks/serbian/Untranslated/MirOTR.txt b/langpacks/serbian/Untranslated/MirOTR.txt
index 51633dadde..735f9c82cf 100644
--- a/langpacks/serbian/Untranslated/MirOTR.txt
+++ b/langpacks/serbian/Untranslated/MirOTR.txt
@@ -32,6 +32,11 @@
 [&Refresh OTR session]
 [Sto&p OTR session]
 [&Verify Fingerprint]
+[OTR private]
+[OTR unverified]
+[OTR finished]
+[OTR not secure]
+[Refresh]
 [Start OTR]
 [Stop OTR]
 [OTR status (Click for more options)]
@@ -39,7 +44,6 @@
 [OTR Encryption: UNVERIFIED]
 [OTR Encryption: Private]
 [OTR Encryption: Finished]
-[&Convert HTML (for Pidgin)]
 [OTR encrypted session with '%s' has been terminated]
 [Requesting OTR encrypted session with '%s']
 [Beginning OTR encrypted session with '%s']
@@ -55,11 +59,6 @@
 [OTR Information]
 [OTR encrypted session with '%s' is now using a VERIFIED fingerprint]
 [OTR encrypted session with '%s' is now using a NOT VERIFIED fingerprint]
-[OTR unverified]
-[OTR finished]
-[OTR private]
-[OTR not secure]
-[Refresh]
 [Generating new private key for protocol '%s'.\nPlease Wait...]
 [Protocols]
 [Fingerprints]
@@ -103,6 +102,7 @@
 [You are using SecureIM. MirOTR will only work for contacts with SecureIM disabled]
 [MirOTR menu]
 [OTR Status]
+[&Convert HTML (for Pidgin)]
 [Private Data]
 [Services]
 [\nusing older protocol version %i]
diff --git a/langpacks/serbian/Untranslated/NotesReminders.txt b/langpacks/serbian/Untranslated/NotesReminders.txt
index 6bb41592a4..c1efcd8f5d 100644
--- a/langpacks/serbian/Untranslated/NotesReminders.txt
+++ b/langpacks/serbian/Untranslated/NotesReminders.txt
@@ -20,9 +20,9 @@
 [Reset to defaults]
 [(Using MCI allows different sounds to be played simultaneously, may not be needed or desired when a custom sound plugin is installed.)]
 [Add Reminder]
-[Trigger On Time && Date:]
 [Date]
 [Time]
+[Repeat each day]
 [Reminder Note:]
 [Daily]
 [Weekly]
@@ -44,7 +44,6 @@
 [New &Reminder]
 [&Delete Reminder]
 [D&elete All Reminders]
-[Context Menu Note Popup]
 [&Hide Note]
 [&Always On Top]
 [&New Note]
@@ -64,13 +63,10 @@
 [Always &On Top]
 [Delete &All Notes]
 [&Show / Hide Notes]
-[Notes & Reminders]
 [New Note]
 [Toggle Notes Visibility]
 [Bring All Notes to Front]
 [New Reminder]
-[Are you sure you want to delete all notes?]
-[Are you sure you want to delete all reminders?]
 [Delete All Notes]
 [Show/Hide Notes]
 [On Top Caption Icon]
@@ -86,15 +82,15 @@
 [Sticky Notes]
 [Add New Note]
 [Add New Reminder]
-[Reminder triggered]
-[Reminder triggered (Alternative 1)]
-[Reminder triggered (Alternative 2)]
 [Notes && Reminders]
 [New &Note]
 [Vie&w Notes]
 [&Delete All Notes]
 [&Bring All to Front]
 [Miranda could not load the Notes & Reminders plugin, Msftedit.dll is missing. If you are using WINE, please make sure you have Msftedit.dll installed. Press 'Yes' to continue loading Miranda.]
+[Reminder triggered]
+[Reminder triggered (Alternative 1)]
+[Reminder triggered (Alternative 2)]
 [Black]
 [Maroon]
 [Green]
@@ -117,6 +113,7 @@
 [Top]
 [Note text]
 [Date/Title]
+[Are you sure you want to delete all notes?]
 [Sticky Note Caption]
 [Sticky Note Background Color]
 [Sticky Note Body]
@@ -124,12 +121,12 @@
 [Select Executable]
 [Minutes]
 [Hours]
+[The specified time is invalid due to begin of daylight saving (summer time).]
+[The specified time is invalid.]
 [Hour]
 [Day]
 [Days]
 [Week]
-[The specified time is invalid due to begin of daylight saving (summer time).]
-[The specified time is invalid.]
 [The specified time offset is invalid.]
 [&Update Reminder]
 [Every]
@@ -138,4 +135,6 @@
 [Alternative 2]
 [Reminder text]
 [Date of activation]
+[Are you sure you want to delete all reminders?]
 [Are you sure you want to delete this reminder?]
+[Notes & Reminders]
diff --git a/langpacks/serbian/Untranslated/PasteIt.txt b/langpacks/serbian/Untranslated/PasteIt.txt
index 3a3dace42b..889d27103b 100644
--- a/langpacks/serbian/Untranslated/PasteIt.txt
+++ b/langpacks/serbian/Untranslated/PasteIt.txt
@@ -59,9 +59,9 @@
 [File size is larger then 10 MB, cannot be sent]
 [Cannot open file '%s']
 [File '%s' is empty]
-[Error during sending text to web page: %s]
+[Error during sending text to web page: %S]
 [Error during sending text to web page]
-[Error during getting user key from web page: %s]
+[Error during getting user key from web page: %S]
 [Paste expire date]
 [Never]
 [10 minutes]
diff --git a/langpacks/serbian/Untranslated/PopupPlus.txt b/langpacks/serbian/Untranslated/PopupPlus.txt
index 71d40cbb02..a82c15fe3a 100644
--- a/langpacks/serbian/Untranslated/PopupPlus.txt
+++ b/langpacks/serbian/Untranslated/PopupPlus.txt
@@ -30,7 +30,7 @@
 [Skin options]
 [Preview]
 [Download more skins]
-[Popup History]
+[Popup history]
 [Desktop]
 [Popup area]
 [pixel(s)]
@@ -108,10 +108,8 @@
 [Sidebar]
 [Title underline]
 [Avatar border]
-[Popup History is disabled]
-[Popup History message]
-[Popups are enabled]
-[Popups are disabled]
+[Popup history is disabled]
+[Popup history message]
 [With "favorite" overlay]
 [With "fullscreen" overlay]
 [Refresh skin list]
@@ -123,10 +121,10 @@
 [Pinned popup]
 [Add contact permanently]
 [Classes]
-[Toggle Popups]
-[Enable Popups]
-[Disable Popups]
-[Popup Plus]
+[Toggle popups]
+[Enable popups]
+[Disable popups]
+[Popup plus]
 [Error: I could not register the Popup Window class.\r\nThe plugin will not operate.]
 [No effect]
 [Fade in/out]
diff --git a/langpacks/serbian/Untranslated/TabSRMM.txt b/langpacks/serbian/Untranslated/TabSRMM.txt
index b670d06a65..aaba1cb181 100644
--- a/langpacks/serbian/Untranslated/TabSRMM.txt
+++ b/langpacks/serbian/Untranslated/TabSRMM.txt
@@ -56,7 +56,6 @@
 [Preview]
 [Errors]
 [Use the message log color theme for group chat popups]
-[No compatible popup plugin was found. The event notification\nsystem is not available.]
 [Dialog]
 [All modes]
 [Choose modes]
@@ -681,8 +680,6 @@
 [Clock symbol (for the info panel clock)]
 [Feature disabled (used as overlay)]
 [Feature enabled (used as overlay)]
-[Enable typing notification]
-[Disable typing notification]
 [Message windows - IM]
 [Message windows - all]
 [Message windows - group chats]
@@ -811,8 +808,8 @@
 [Add offline contacts to multisend list]
 [Disable &typing notification]
 [Enable &typing notification]
-[...is typing a message.]
 [...has stopped typing.]
+[...is typing a message.]
 [Force default message log]
 [Force History++]
 [Force IEView]
diff --git a/langpacks/serbian/Untranslated/UInfoEx.txt b/langpacks/serbian/Untranslated/UInfoEx.txt
index 534c73ac4f..fd164ca923 100644
--- a/langpacks/serbian/Untranslated/UInfoEx.txt
+++ b/langpacks/serbian/Untranslated/UInfoEx.txt
@@ -472,9 +472,8 @@
 [Phone (UInfoEx)]
 [[b]%s (%S)...[/b]\n%d Contacts remaining]
 [Abort Refreshing Contact Details]
-[Do you want to cancel the current refresh procedure?]
 [Miranda must be online for refreshing contact information!]
-[The function caused an exception!]
+[Do you want to cancel the current refresh procedure?]
 [%s has %s today.]
 [an anniversary]
 [He/she has the following anniversaries:]
@@ -521,17 +520,11 @@
 [Select a destination file...]
 [Import User Details from VCard]
 [Can't create xml file!\n%S]
-[Export took %f ms]
 [Contact: %s (%S)]
-[Importing %s caused error %d]
-[Loading contact %s from xml failed with error %d]
-[Importing Owner caused error %d]
 [Parser is unable to load XMLCard "%s"\nError: %d\nDescription: %s]
 [The selected file is no valid XMLCard]
 [The version of the XMLCard is not supported by UserInfoEx]
 [Owner contact successfully imported.]
 [Selected XMLCard does not contain an owner contact!]
-[Import took %f ms]
 [added contacts: %u / %u\nadded settings: %u / %u\nadded events %u / %u\nduplicated events: %u]
-[FATAL: An exception was thrown while importing contacts from xmlCard!]
 [Flags (UInfoEx)]
diff --git a/langpacks/serbian/Untranslated/WhoUsesMyFiles.txt b/langpacks/serbian/Untranslated/WhoUsesMyFiles.txt
index 4dc03609ab..721650efd0 100644
--- a/langpacks/serbian/Untranslated/WhoUsesMyFiles.txt
+++ b/langpacks/serbian/Untranslated/WhoUsesMyFiles.txt
@@ -19,7 +19,6 @@
 [Alert computer name with username]
 [Disabled options will be available in the next version]
 [Show current connections]
-[Popup plugin not found!]
 [Common Dialog Error 0x%lx]
 [Not implemented yet...]
 [Who uses my files]
diff --git a/langpacks/spanish/=CORE=.txt b/langpacks/spanish/=CORE=.txt
index 7c673f6ef3..151ab6b4fc 100644
--- a/langpacks/spanish/=CORE=.txt
+++ b/langpacks/spanish/=CORE=.txt
@@ -570,6 +570,55 @@ Elegir &todo
 Pegar y Enviar
 [Delete]
 Eliminar
+;file \src\core\stdpopup\res\resource.rc
+[Popup history]
+
+[Case sensitive]
+
+[Default timeout]
+
+[Never timeout]
+
+[Set timeout:]
+
+[Width:]
+
+[Maximum height:]
+
+[Opacity (%):]
+
+[Border]
+Borde
+[Round corners (window)]
+
+[Preview]
+Previsualizar
+[Transparent background]
+
+[Layout]
+
+[Avatar size:]
+
+[Disable when]
+
+[Global hover]
+
+[Sidebar width:]
+
+[Text indent:]
+
+[Padding:]
+
+[Round corners (avatar)]
+
+[Text color:]
+
+[Background color:]
+Color del fondo:
+[Set timeout]
+
+[Timeout value (0 = default):]
+
 ;file \src\core\stduihist\res\resource.rc
 [Find]
 Buscar
@@ -1749,6 +1798,88 @@ El contacto dejó de escribir
 ;file \src\core\stdmsg\src\msgtimedout.cpp
 [An unknown error has occurred.]
 Se ha producido un error desconocido.
+;file \src\core\stdpopup\src\icons.cpp
+[Popups are enabled]
+
+[Popups are disabled]
+
+;file \src\core\stdpopup\src\notify_imp.cpp
+;file \src\core\stdpopup\src\options.cpp
+[Example]
+
+[The quick brown fox jumped over the lazy dog.]
+
+[Example With a Long Title]
+
+[Thequickbrownfoxjumpedoverthelazydog.]
+
+[An avatar.]
+
+[Bottom right]
+
+[Bottom left]
+
+[Top right]
+
+[Top left]
+
+[Icon on left]
+
+[Icon on right]
+
+[No time]
+
+[Time on left]
+
+[Time on right]
+
+[Time above avatar]
+
+[No avatar]
+
+[Left avatar]
+
+[Right avatar]
+
+[Full-screen app running]
+
+[No animate]
+
+[Horizontal animate]
+
+[Vertical animate]
+
+[You cannot set a default timeout of 0.\nValue has been reset.]
+
+[Settings]
+Ajustes
+[Classes]
+
+;file \src\core\stdpopup\src\services.cpp
+[Disable popups]
+
+[Enable popups]
+
+;file \src\core\stdpopup\src\yapp.cpp
+[Toggle popups]
+
+[First line]
+
+[Second line]
+
+[Time]
+
+[Sidebar]
+
+[Title underline]
+
+;file \src\core\stdpopup\src\yapp_history_dlg.cpp
+[Copy title to clipboard]
+
+[Copy message to clipboard]
+
+[Copy timestamp to clipboard]
+
 ;file \src\core\stdssl\src\netlibssl.cpp
 [Client cannot decode host message. Possible causes: host does not support SSL or requires not existing security package]
 El cliente no puede decodificar mensajes de servidor. Posibles causas: El servidor no es compatible con SSL o no requiere paquete de seguridad existente
@@ -2631,8 +2762,6 @@ Mancha vacía
 Plugin unicode
 [ANSI plugin]
 Plugin ANSI
-[Unused]
-
 [Show/Hide]
 Mostrar/Ocultar
 [Exit]
@@ -2647,6 +2776,8 @@ Mover a grupo
 Encendido
 [Off]
 Apagado
+[Unused]
+
 [Frames]
 Marcos
 [Add group]
diff --git a/langpacks/spanish/Plugins/Actman.txt b/langpacks/spanish/Plugins/Actman.txt
index 3265598c87..3afee5d851 100644
--- a/langpacks/spanish/Plugins/Actman.txt
+++ b/langpacks/spanish/Plugins/Actman.txt
@@ -677,19 +677,19 @@ Buscar actualizaciones de plugin
 
 [Empty updater download folder]
 
-[Popup Plus (popup.dll) latest YAPP (yapp.dll)]
+[Popup plus (PopupPlus.dll) latest StdPopup (StdPopup.dll)]
 
-[Enables or disables Popup windows]
+[Enables or disables popup windows]
 
 [Notify]
 Notificar
-[YAPP or Popup]
+[StdPopup or Popup plus]
 
 [Popup window]
 
 [Unicode Text]
 
-[Enables or disables Popup windows (maybe deprecated)]
+[Enables or disables popup windows (maybe deprecated)]
 
 [result of protocol service call]
 
diff --git a/langpacks/spanish/Plugins/ChangeKeyboardLayout.txt b/langpacks/spanish/Plugins/ChangeKeyboardLayout.txt
index c76d33f31a..afaaf21a24 100644
--- a/langpacks/spanish/Plugins/ChangeKeyboardLayout.txt
+++ b/langpacks/spanish/Plugins/ChangeKeyboardLayout.txt
@@ -82,8 +82,6 @@ Sesiones de mensaje
 [Popups]
 Ventanas emergentes
 ;file \plugins\ChangeKeyboardLayout\src\main.cpp
-[Popup]
-Ventana emergente
 ;file \plugins\ChangeKeyboardLayout\src\stdafx.h
 [ChangeKeyboardLayout]
 
diff --git a/langpacks/spanish/Plugins/Clist_modern.txt b/langpacks/spanish/Plugins/Clist_modern.txt
index 830274f1c4..8c780ae6ed 100644
--- a/langpacks/spanish/Plugins/Clist_modern.txt
+++ b/langpacks/spanish/Plugins/Clist_modern.txt
@@ -747,6 +747,8 @@ Nombre
 
 [Rate]
 
+[Last online]
+
 [-Nothing-]
 
 [Hide to tray]
@@ -808,8 +810,6 @@ Iconos adicionales
 
 [Row]
 
-[Row design]
-
 ;file \plugins\Clist_modern\src\modern_clistsettings.cpp
 [(Unknown contact)]
 (Contacto desconocido)
@@ -835,21 +835,6 @@ Principal
 
 [Show/Hide offline users]
 
-;file \plugins\Clist_modern\src\modern_rowtemplateopt.cpp
-[Empty %s cell]
-
-[column]
-
-[line]
-
-[columns]
-
-[lines]
-
-[%s, contain %s]
-
-[ layered]
-
 ;file \plugins\Clist_modern\src\modern_skinopt.cpp
 [( unknown )]
 
diff --git a/langpacks/spanish/Plugins/CloudFile.txt b/langpacks/spanish/Plugins/CloudFile.txt
index cda0531011..05b1210109 100644
--- a/langpacks/spanish/Plugins/CloudFile.txt
+++ b/langpacks/spanish/Plugins/CloudFile.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Allows you to transfer files via cloud services.]
 
-;file \plugins\CloudFile\res\resource.rc
+;file \protocols\CloudFile\res\resource.rc
 [Default service]
 
 [General]
@@ -42,7 +42,7 @@ Cancelar
 
 [Revoke access]
 
-;file \plugins\CloudFile\src\icons.cpp
+;file \protocols\CloudFile\src\icons.cpp
 [Upload file(s)]
 
 [Dropbox]
@@ -53,22 +53,22 @@ Cancelar
 
 [Yandex.Disk]
 
-;file \plugins\CloudFile\src\menus.cpp
+;file \protocols\CloudFile\src\menus.cpp
 [Upload to...]
 
 [Upload]
 Subir
-;file \plugins\CloudFile\src\options.cpp
+;file \protocols\CloudFile\src\options.cpp
 [None]
 Ninguno
 [Services]
 Servicios
-;file \plugins\CloudFile\src\srmm.cpp
+;file \protocols\CloudFile\src\srmm.cpp
 [Upload files to...]
 
-;file \plugins\CloudFile\src\Services\dropbox_service.cpp
+;file \protocols\CloudFile\src\Services\dropbox_service.cpp
 [Server does not respond]
 
-;file \plugins\CloudFile\src\Services\google_service.cpp
-;file \plugins\CloudFile\src\Services\microsoft_service.cpp
-;file \plugins\CloudFile\src\Services\yandex_service.cpp
+;file \protocols\CloudFile\src\Services\google_service.cpp
+;file \protocols\CloudFile\src\Services\microsoft_service.cpp
+;file \protocols\CloudFile\src\Services\yandex_service.cpp
diff --git a/langpacks/spanish/Plugins/CmdLine.txt b/langpacks/spanish/Plugins/CmdLine.txt
index 70cf07d325..d452e74252 100644
--- a/langpacks/spanish/Plugins/CmdLine.txt
+++ b/langpacks/spanish/Plugins/CmdLine.txt
@@ -195,8 +195,3 @@ dword
 
 [You can only run one instance of CmdLine plugin.]
 
-;file \plugins\CmdLine\src\utils.cpp
-[Notify]
-Notificar
-[Warning]
-Advertencia
diff --git a/langpacks/spanish/Plugins/ConnectionNotify.txt b/langpacks/spanish/Plugins/ConnectionNotify.txt
index 80cfaf623b..a905faaa11 100644
--- a/langpacks/spanish/Plugins/ConnectionNotify.txt
+++ b/langpacks/spanish/Plugins/ConnectionNotify.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Notify with popup if some connection established]
 
-;file \plugins\ConnectionNotify\res\ConnectionNotify.rc
+;file \protocols\ConnectionNotify\res\ConnectionNotify.rc
 [Set popup colors]
 
 [Popup options]
@@ -56,7 +56,7 @@ Cancelar
 
 [Remote IP:Port]
 
-;file \plugins\ConnectionNotify\src\ConnectionNotify.cpp
+;file \protocols\ConnectionNotify\src\ConnectionNotify.cpp
 [Show]
 Mostrar
 [Hide]
@@ -79,6 +79,6 @@ Estado
 Plugins
 [New Connection Notification]
 
-;file \plugins\ConnectionNotify\src\filter.cpp
+;file \protocols\ConnectionNotify\src\filter.cpp
 [First close options window]
 
diff --git a/langpacks/spanish/Plugins/CrashDumper.txt b/langpacks/spanish/Plugins/CrashDumper.txt
index 3c7443d42d..0c1dbd3049 100644
--- a/langpacks/spanish/Plugins/CrashDumper.txt
+++ b/langpacks/spanish/Plugins/CrashDumper.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: CrashDumper.dll
 ;  Plugin: Crash dumper
-;  Version: 0.1.0.2
+;  Version: 0.1.0.3
 ;  Authors: borkra
 ;============================================================
 [Crash Dumper and Version Information for Miranda NG.]
diff --git a/langpacks/spanish/Plugins/CurrencyRates.txt b/langpacks/spanish/Plugins/CurrencyRates.txt
index 4603f874f2..c539037522 100644
--- a/langpacks/spanish/Plugins/CurrencyRates.txt
+++ b/langpacks/spanish/Plugins/CurrencyRates.txt
@@ -2,12 +2,12 @@
 ;============================================================
 ;  File: CurrencyRates.dll
 ;  Plugin: Currency Rates
-;  Version: 0.1.0.101
+;  Version: 0.2.0.3
 ;  Authors: Dioksin
 ;============================================================
 [Shows currency rates.]
 
-;file \plugins\CurrencyRates\res\Forex.rc
+;file \protocols\CurrencyRates\res\Forex.rc
 [Variable List]
 
 [Edit Settings]
@@ -104,14 +104,16 @@ Previsualizar
 
 [&Tendency:]
 
+[&Personal key:]
+
 [&Advanced Settings...]
 
 [Rate Info]
 
-;file \plugins\CurrencyRates\src\Chart.h
+;file \protocols\CurrencyRates\src\Chart.h
 [There is nothing to show]
 
-;file \plugins\CurrencyRates\src\CommonOptionDlg.cpp
+;file \protocols\CurrencyRates\src\CommonOptionDlg.cpp
 [Seconds]
 Segundos
 [Minutes]
@@ -124,24 +126,15 @@ Horas
 
 [Enter text to display in contact list.]
 
-;file \plugins\CurrencyRates\src\CurrencyConverter.cpp
+;file \protocols\CurrencyRates\src\CurrencyConverter.cpp
 [Info provided by]
 
 [Enter positive number.]
 
-;file \plugins\CurrencyRates\src\CurrencyRateInfoDlg.cpp
+;file \protocols\CurrencyRates\src\CurrencyRateInfoDlg.cpp
 [Currency Rate]
 
-;file \plugins\CurrencyRates\src\CurrencyRatesProviderCurrencyConverter.cpp
-[Error occurred during HTML parsing.]
-
-[Error occurred during site access.]
-
-;file \plugins\CurrencyRates\src\CurrencyRatesProviderVisitorFormatSpecificator.cpp
-[Currency Symbol]
-
-[Currency Name]
-
+;file \protocols\CurrencyRates\src\CurrencyRatesProviderBase.cpp
 [Source of Information]
 
 [Rate Value]
@@ -160,19 +153,10 @@ Horas
 
 [Left slash (\\)]
 
-[Open Price]
-
-[Percent Change to After Hours]
-
-[Percent Change to Yesterday Close]
-
-[Day's High]
-
-[Day's Low]
-
-[Previous Close]
+;file \protocols\CurrencyRates\src\CurrencyRatesProviderCurrencyConverter.cpp
+[Error occurred during HTML parsing.]
 
-[Change]
+[Error occurred during site access.]
 
 [From Currency Full Name]
 
@@ -184,7 +168,7 @@ Horas
 
 [Short notation for "%f/%i"]
 
-;file \plugins\CurrencyRates\src\Forex.cpp
+;file \protocols\CurrencyRates\src\Forex.cpp
 [Auto Update Enabled]
 
 [Auto Update Disabled]
@@ -215,12 +199,16 @@ Refrescar
 
 [Currency Rates Auto Update Disabled]
 
+[Currency Symbol]
+
 [Network]
 Red
-;file \plugins\CurrencyRates\src\HTTPSession.cpp
+;file \protocols\CurrencyRates\src\HTTPSession.cpp
+[This plugin requires a personal key. Press Yes to obtain it at the site and then enter the result in the Options dialog, otherwise this plugin will fail.]
+
 [CurrencyRates HTTP connections]
 
-;file \plugins\CurrencyRates\src\IconLib.cpp
+;file \protocols\CurrencyRates\src\IconLib.cpp
 [Protocol icon]
 
 [Currency Rate up]
@@ -237,17 +225,15 @@ Red
 
 [Import]
 
-;file \plugins\CurrencyRates\src\ImportExport.cpp
+;file \protocols\CurrencyRates\src\ImportExport.cpp
 [XML File (*.xml)]
 
 [All files (*.*)]
 
-;file \plugins\CurrencyRates\src\ModuleInfo.cpp
-[Miranda could not load CurrencyRates plugin. XML parser is missing.]
-
+;file \protocols\CurrencyRates\src\ModuleInfo.cpp
 [Miranda could not load CurrencyRates plugin. Microsoft HTML parser is missing.]
 
-;file \plugins\CurrencyRates\src\SettingsDlg.cpp
+;file \protocols\CurrencyRates\src\SettingsDlg.cpp
 [Log Files (*.txt,*.log)]
 
 [Enter integer value]
diff --git a/langpacks/spanish/Plugins/Db_autobackups.txt b/langpacks/spanish/Plugins/Db_autobackups.txt
index dfd52013dc..b6428ff199 100644
--- a/langpacks/spanish/Plugins/Db_autobackups.txt
+++ b/langpacks/spanish/Plugins/Db_autobackups.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Db_autobackups.dll
 ;  Plugin: Db autobackuper
-;  Version: 0.1.0.2
+;  Version: 0.1.0.3
 ;  Authors: chaos.persei, sje, Kildor, Billy_Bons
 ;============================================================
 [Database autobackuper plugin.]
@@ -34,8 +34,6 @@ Desabilitado
 
 [Disable progress bar]
 
-[Disable popups]
-
 [Use CloudFile]
 
 [Backup NOW]
@@ -58,6 +56,10 @@ Error
 [Database back up in process...]
 
 ;file \plugins\Db_autobackups\src\main.cpp
+[Enable &AutoBackups notification]
+
+[Disable &AutoBackups notification]
+
 [Miranda NG databases]
 
 [Compressed Miranda NG databases]
@@ -70,6 +72,8 @@ Base de datos
 
 [Save profile as...]
 
+[Popups]
+Ventanas emergentes
 [Database backups]
 
 [Backup folder]
diff --git a/langpacks/spanish/Plugins/Discord.txt b/langpacks/spanish/Plugins/Discord.txt
index 3da71ef962..bb30ef21d8 100644
--- a/langpacks/spanish/Plugins/Discord.txt
+++ b/langpacks/spanish/Plugins/Discord.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Discord.dll
 ;  Plugin: Discord protocol
-;  Version: 0.6.1.1
+;  Version: 0.6.2.1
 ;  Authors: George Hazan
 ;============================================================
 [Discord support for Miranda NG.]
@@ -18,9 +18,11 @@ Contraseña:
 Contactos
 [Default group:]
 Grupo predeterminado:
+[Enable group chats]
+
 [Do not open chat windows on creation]
 
-[Use subgroups for guild's channels (requires restart)]
+[Use subgroups for server channels (requires restart)]
 
 [Nick:]
 Nick:
@@ -58,6 +60,10 @@ Grupo de chats
 
 [Do you really want to leave the guild?]
 
+[Disable sync]
+
+[Enable sync]
+
 [Join guild]
 
 [Copy my Discord ID]
@@ -68,6 +74,10 @@ Grupo de chats
 
 [Copy Discord ID]
 
+[Enable guild sync]
+
+[Load server history]
+
 ;file \protocols\Discord\src\options.cpp
 [Network]
 Red
diff --git a/langpacks/spanish/Plugins/FTPFile.txt b/langpacks/spanish/Plugins/FTPFile.txt
index e3055257a2..38000bc5d8 100644
--- a/langpacks/spanish/Plugins/FTPFile.txt
+++ b/langpacks/spanish/Plugins/FTPFile.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: FTPFile.dll
 ;  Plugin: FTP File YM
-;  Version: 0.6.0.4
+;  Version: 0.6.0.5
 ;  Authors: yaho
 ;============================================================
 [FTP a file to a server and send the URL to your friend. Supported automatic zipping before upload and encryption via SFTP and FTPS.]
diff --git a/langpacks/spanish/Plugins/Facebook.txt b/langpacks/spanish/Plugins/Facebook.txt
index ecbd627bde..0228e10c93 100644
--- a/langpacks/spanish/Plugins/Facebook.txt
+++ b/langpacks/spanish/Plugins/Facebook.txt
@@ -142,14 +142,14 @@ Introduzca el texto que aparece
 
 [This will permanently delete the conversation history]
 
-[Former]
-
 [Myself]
 
 [Friend]
 
 [User]
 
+[Former]
+
 [Notifications]
 Notificaciones
 [%s and more (%d)]
diff --git a/langpacks/spanish/Plugins/GG.txt b/langpacks/spanish/Plugins/GG.txt
index dd87745bb9..3ce655fea5 100644
--- a/langpacks/spanish/Plugins/GG.txt
+++ b/langpacks/spanish/Plugins/GG.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: GG.dll
 ;  Plugin: Gadu-Gadu protocol
-;  Version: 0.11.0.4
+;  Version: 0.95.11.1
 ;  Authors: Bartosz Bialek, Adam Strzelecki
 ;============================================================
 [Gadu-Gadu protocol support for Miranda NG.]
diff --git a/langpacks/spanish/Plugins/GmailNotifier.txt b/langpacks/spanish/Plugins/GmailNotifier.txt
index f1494bcf51..44ecfb21d1 100644
--- a/langpacks/spanish/Plugins/GmailNotifier.txt
+++ b/langpacks/spanish/Plugins/GmailNotifier.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Check your Gmail inboxes locally.]
 
-;file \plugins\GmailNotifier\res\options.rc
+;file \protocols\GmailNotifier\res\options.rc
 [Gmail account]
 
 [Name:]
@@ -54,7 +54,7 @@ segundos
 
 [Log unread threads into database (enable history)]
 
-;file \plugins\GmailNotifier\src\check.cpp
+;file \protocols\GmailNotifier\src\check.cpp
 [Checking...]
 
 [Can't send account data!]
@@ -63,7 +63,7 @@ segundos
 
 [Can't get RSS feed!]
 
-;file \plugins\GmailNotifier\src\main.cpp
+;file \protocols\GmailNotifier\src\main.cpp
 [Other]
 Otro
 [Gmail: New thread(s)]
@@ -74,7 +74,7 @@ Otro
 
 [&Check Gmail inbox]
 
-;file \plugins\GmailNotifier\src\options.cpp
+;file \protocols\GmailNotifier\src\options.cpp
 [GmailNotifier]
 
 [Network]
diff --git a/langpacks/spanish/Plugins/ICQ.txt b/langpacks/spanish/Plugins/ICQ.txt
index 8f75e29e32..04550b5aad 100644
--- a/langpacks/spanish/Plugins/ICQ.txt
+++ b/langpacks/spanish/Plugins/ICQ.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: ICQ.dll
 ;  Plugin: ICQ-WIM protocol
-;  Version: 0.95.11.1
+;  Version: 0.95.11.4
 ;  Authors: George Hazan
 ;============================================================
 [ICQ protocol support for Miranda NG.]
@@ -16,8 +16,12 @@ Contraseña:
 
 [Do not open chat windows on creation]
 
-[Advanced]
-Avanzado
+[Use tray icon notifications]
+
+[E-mail]
+E-mail
+[Launch mailbox in a browser on click]
+
 [If a contact goes Offline, set this status instead and cache it for given timeout in seconds (0 - disabled)]
 
 [After that, set this status to a contact and move it offline after specified timeout in seconds (0 - disabled)]
@@ -59,6 +63,8 @@ Nick:
 [Do you really want to remove it from ignore list?]
 
 ;file \protocols\ICQ-WIM\src\main.cpp
+[E-mail notification]
+
 [Ignore]
 Ignorar
 [Remove Ignore]
@@ -66,6 +72,15 @@ Ignorar
 ;file \protocols\ICQ-WIM\src\options.cpp
 [Network]
 Red
+[General]
+General
+[Advanced]
+Avanzado
+;file \protocols\ICQ-WIM\src\poll.cpp
+[You received e-mail from %s: %s]
+
+[You have %d unread emails]
+
 ;file \protocols\ICQ-WIM\src\proto.cpp
 [%s server connection]
 %s conexión al servidor
diff --git a/langpacks/spanish/Plugins/Import.txt b/langpacks/spanish/Plugins/Import.txt
index 0e093a1f4f..3126f01958 100644
--- a/langpacks/spanish/Plugins/Import.txt
+++ b/langpacks/spanish/Plugins/Import.txt
@@ -111,8 +111,6 @@ Nueva cuenta
 
 [Skipping non-IM contact (%S)]
 
-[Skipping %S contact, ID not found]
-
 [Skipping duplicate %S contact %s]
 
 [Failed to add %S contact %s]
diff --git a/langpacks/spanish/Plugins/Jabber.txt b/langpacks/spanish/Plugins/Jabber.txt
index 92ada1a78a..4c8ff227a6 100644
--- a/langpacks/spanish/Plugins/Jabber.txt
+++ b/langpacks/spanish/Plugins/Jabber.txt
@@ -326,6 +326,8 @@ Refrescar
 
 [Node:]
 
+[Filter:]
+
 [Member Information]
 
 [Role:]
@@ -392,24 +394,10 @@ Enviar
 [Jabber Mood]
 
 ;file \protocols\JabberG\src\jabber_adhoc.cpp
-[Error %s %s]
-
-[Select Command]
-
-[Not supported]
-
 [Done]
 
-[In progress. Please Wait...]
-
 [Execute]
 
-[Requesting command list. Please wait...]
-
-[Jabber Ad-Hoc commands at %s]
-
-[Sending Ad-Hoc command to %s]
-
 ;file \protocols\JabberG\src\jabber_agent.cpp
 [Jabber Agent Registration]
 
@@ -544,32 +532,16 @@ Propietario
 
 [Moderator]
 
-[Visitors]
-
-[Participants]
-
-[Moderators]
-
 [Owners]
 
-[User %s is now banned.]
-
-[User %s changed status to %s with message: %s]
-
-[User %s changed status to %s]
-
-[Room configuration was changed.]
+[Moderators]
 
-[Outcast]
+[Participants]
 
-[Affiliation of %s was changed to '%s'.]
+[Visitors]
 
 [Role of %s was changed to '%s'.]
 
-[because room is now members-only]
-
-[user banned]
-
 [Change &nickname]
 
 [&Invite a user]
@@ -668,10 +640,6 @@ Libre para el chat
 
 [%s (not on roster)]
 
-[%s from\n%s]
-
-[Real JID not available]
-
 [Reason to kick %s]
 
 [Reason to ban %s]
@@ -742,26 +710,6 @@ Libre para el chat
 
 [Copy node information]
 
-;file \protocols\JabberG\src\jabber_disco.h
-[Identities]
-
-[category]
-
-[type]
-tipo
-[Category]
-
-[Type]
-Tipo
-[Supported features]
-
-[Info request error]
-
-[Items request error]
-
-;file \protocols\JabberG\src\jabber_filterlist.cpp
-[Set filter...]
-
 ;file \protocols\JabberG\src\jabber_groupchat.cpp
 [Failed to retrieve room list from server.]
 
@@ -769,8 +717,6 @@ Tipo
 
 [Room list request timed out.]
 
-[<no nick>]
-
 [Loading...]
 
 [Please wait for room list to download.]
@@ -781,8 +727,8 @@ Tipo
 
 [Change nickname in <%s>]
 
-[has set the subject to:]
-
+[Error]
+Error
 [Group chat invitation to\n%s]
 
 ;file \protocols\JabberG\src\jabber_icolib.cpp
@@ -877,7 +823,7 @@ Protocolos
 ;file \protocols\JabberG\src\jabber_iqid.cpp
 [Authentication failed for %s.]
 
-[Jabber Authentication]
+[Authentication]
 
 [Registration successful]
 
@@ -1469,18 +1415,6 @@ General
 Cambios de estado
 [Don't notify history messages]
 
-[Group]
-Grupo
-[Subscription]
-
-[Uploading...]
-
-[Downloading...]
-Descargando...
-[XML for MS Excel (UTF-8 encoded)]
-
-[Connecting...]
-Conectando...
 [Network]
 Red
 [Account]
@@ -1514,8 +1448,6 @@ Avanzado
 [Some changes will take effect the next time you connect to the Jabber network.]
 
 ;file \protocols\JabberG\src\jabber_password.cpp
-[Set New Password for %s@%S]
-
 [New password does not match.]
 
 [Current password is incorrect.]
@@ -1543,50 +1475,6 @@ Avanzado
 
 [Allow]
 
-[Simple mode]
-
-[Advanced mode]
-
-[Add JID]
-
-[Activate]
-
-[Set default]
-
-[Edit rule]
-
-[Add rule]
-
-[Delete rule]
-
-[Move rule up]
-
-[Move rule down]
-
-[Add list...]
-
-[Remove list]
-
-[** Default **]
-
-[** Subscription: both **]
-
-[** Subscription: to **]
-
-[** Subscription: from **]
-
-[** Subscription: none **]
-
-[<none>]
-<Nada>
-[Message]
-Mensaje
-[Presence (in)]
-
-[Presence (out)]
-
-[Query]
-
 [List has no rules, empty lists will be deleted then changes applied]
 
 [allow ]
@@ -1627,103 +1515,89 @@ mensajes
 
 [Privacy lists are not saved, discard any changes and exit?]
 
-[Please save list before activating]
-
-[First, save the list]
-
-[Please save list before you make it the default list]
-
-[No list selected]
-
-[Can't remove active or default list]
-
-[Sorry]
-
-[Unable to save list because you are currently offline.]
-
-[List Editor...]
+[Simple mode]
 
-;file \protocols\JabberG\src\jabber_proto.cpp
-[No compatible file transfer mechanism exists]
+[Advanced mode]
 
-[Protocol is offline or no JID]
+[Add JID]
 
-[No valid OMEMO session exists]
+[Activate]
 
-;file \protocols\JabberG\src\jabber_rc.cpp
-[Command completed successfully]
+[Set default]
 
-[Error occurred during processing command]
+[Edit rule]
 
-[Set status]
+[Add rule]
 
-[Set options]
+[Delete rule]
 
-[Forward unread messages]
+[Move rule up]
 
-[Leave group chats]
+[Move rule down]
 
-[Lock workstation]
+[Add list...]
 
-[Quit Miranda NG]
+[Remove list]
 
-[Change Status]
+[** Default **]
 
-[Choose the status and status message]
+[** Subscription: both **]
 
-[Status]
-Estado
-[Extended away (Not available)]
+[** Subscription: to **]
 
-[Invisible]
-Invisible
-[Offline]
-Fuera de línea
-[Priority]
+[** Subscription: from **]
 
-[Status message]
+[** Subscription: none **]
 
-[Change global status]
+[<none>]
+<Nada>
+[Message]
+Mensaje
+[Presence (in)]
 
-[Set Options]
+[Presence (out)]
 
-[Set the desired options]
+[Query]
 
-[Automatically Accept File Transfers]
+[Please save list before activating]
 
-[Play sounds]
+[First, save the list]
 
-[Disable remote controlling (check twice what you are doing)]
+[Please save list before you make it the default list]
 
-[There is no messages to forward]
+[No list selected]
 
-[Forward options]
+[Can't remove active or default list]
 
-[%d message(s) to be forwarded]
+[Sorry]
 
-[Mark messages as read]
+[Unable to save list because you are currently offline.]
 
-[%d message(s) forwarded]
+[List Editor...]
 
-[Workstation successfully locked]
+;file \protocols\JabberG\src\jabber_proto.cpp
+[No compatible file transfer mechanism exists]
 
-[Error %d occurred during workstation lock]
+[Protocol is offline or no JID]
 
-[Confirmation needed]
+[No valid OMEMO session exists]
 
-[Please confirm Miranda NG shutdown]
+;file \protocols\JabberG\src\jabber_roster.cpp
+[Group]
+Grupo
+[Subscription]
 
-[There is no group chats to leave]
+[Uploading...]
 
-[Choose the group chats you want to leave]
+[Downloading...]
+Descargando...
+[Connecting...]
+Conectando...
+[XML for MS Excel (UTF-8 encoded)]
 
 ;file \protocols\JabberG\src\jabber_search.cpp
-[Error %s %s\r\nPlease select other server]
-
 [Error: unknown reply received\r\nPlease select other server]
 
-[Error %s %s\r\nTry to specify more detailed]
-
 [Search error]
 
 [Select/type search service URL above and press <Go>]
@@ -1745,6 +1619,8 @@ Fuera de línea
 
 [sent unknown presence type]
 
+[Outcast]
+
 [Nick:]
 Nick:
 [Status:]
@@ -1762,30 +1638,22 @@ Nick:
 
 [Requesting registration instruction...]
 
-[Authentication failed for %s@%S.]
-
-[Message redirected from: %s\r\n%s]
+[Registration canceled]
 
 [Sending registration information...]
 
 ;file \protocols\JabberG\src\jabber_userinfo.cpp
-[Resource]
-
 [<not specified>]
 <no especificado>
+[Resource]
+
 [Software]
 
 [Version]
 Versión
 [System]
 Sistema
-[unknown]
-desconocido
-[Idle since]
-
-[Client capabilities]
-
-[Software information]
+[Last activity]
 
 [Operating system]
 
@@ -1801,26 +1669,14 @@ desconocido
 
 [Tune]
 
-[both]
-
-[to]
-a
-[from]
-
-[none]
-ninguno
 [Last logoff time]
 
 [Uptime]
 
 [Logoff message]
 
-[<no information available>]
-
 [Last active resource]
 
-[Please switch online to see more details.]
-
 [Copy]
 Copiar
 [Copy only this value]
@@ -1870,10 +1726,10 @@ Foto
 
 [Unknown error]
 Error desconocido
-[Error]
-Error
 [Unknown error message]
 
+[Offline]
+Fuera de línea
 [Advanced Status]
 
 [Set mood...]
diff --git a/langpacks/spanish/Plugins/LotusNotify.txt b/langpacks/spanish/Plugins/LotusNotify.txt
index 9576ab4732..6c8d57aac5 100644
--- a/langpacks/spanish/Plugins/LotusNotify.txt
+++ b/langpacks/spanish/Plugins/LotusNotify.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Notify about new mail in Lotus Database]
 
-;file \plugins\LotusNotify\res\LotusNotify.rc
+;file \protocols\LotusNotify\res\LotusNotify.rc
 [Lotus connection settings]
 
 [Primary server:]
@@ -66,7 +66,7 @@ Sujeto
 
 [Offline status mean:]
 
-;file \plugins\LotusNotify\src\LotusNotify.cpp
+;file \protocols\LotusNotify\src\LotusNotify.cpp
 [Unable to load all required Lotus API functions]
 
 [Lotus Notes Client not detected. Check plugin configuration description at https://miranda-ng.org/p/LotusNotify]
diff --git a/langpacks/spanish/Plugins/MSN.txt b/langpacks/spanish/Plugins/MSN.txt
index d32e922415..de9362aa55 100644
--- a/langpacks/spanish/Plugins/MSN.txt
+++ b/langpacks/spanish/Plugins/MSN.txt
@@ -132,8 +132,6 @@ Añadir
 [&Deop user]
 
 ;file \protocols\MSN\src\msn_commands.cpp
-[%I64u bytes]
-
 [MSN Alert]
 
 ;file \protocols\MSN\src\msn_errors.cpp
diff --git a/langpacks/spanish/Plugins/MenuEx.txt b/langpacks/spanish/Plugins/MenuEx.txt
index 57fa428ba2..40a5777e90 100644
--- a/langpacks/spanish/Plugins/MenuEx.txt
+++ b/langpacks/spanish/Plugins/MenuEx.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MenuEx.dll
 ;  Plugin: Menu item ext
-;  Version: 1.3.1.0
+;  Version: 1.3.2.0
 ;  Authors: Heiko Schillinger, Baloo, Billy_Bons, Robert Pösel
 ;============================================================
 [Adds some useful options to a contacts menu.]
@@ -20,8 +20,6 @@ Visibilidad
 Ignorar
 [Copy to Account (Ctrl+click for move to Account)]
 
-[Request Authorization]
-Solicitar autorización
 [Browse Received Files]
 
 [Copy IP]
@@ -79,14 +77,8 @@ Usuario en línea
 Autorización
 [Typing Notify]
 Notificación de escritura
-[Please authorize me to add you to my contact list.]
-
-[Do you want to send authorization request\nto new contact?]
-
 [Open ignore settings]
 
-[Request authorization]
-Solicitar autorización
 [MenuItemEx]
 
 ;file \plugins\MenuItemEx\src\options.cpp
diff --git a/langpacks/spanish/Plugins/MinecraftDynmap.txt b/langpacks/spanish/Plugins/MinecraftDynmap.txt
index 0343fc1b82..9bf49b3fa6 100644
--- a/langpacks/spanish/Plugins/MinecraftDynmap.txt
+++ b/langpacks/spanish/Plugins/MinecraftDynmap.txt
@@ -13,8 +13,6 @@ Servidor:
 [Visible name:]
 
 ;file \protocols\MinecraftDynmap\src\chat.cpp
-[Server]
-
 [Admin]
 
 [Normal]
diff --git a/langpacks/spanish/Plugins/MirOTR.txt b/langpacks/spanish/Plugins/MirOTR.txt
index b1b674e4ea..720a04af60 100644
--- a/langpacks/spanish/Plugins/MirOTR.txt
+++ b/langpacks/spanish/Plugins/MirOTR.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MirOTR.dll
 ;  Plugin: Miranda OTR
-;  Version: 0.14.1.17
+;  Version: 0.14.2.1
 ;  Authors: ProgAndy & CHEF-KOCH
 ;============================================================
 [OTR (Off-the-Record) plugin for Miranda NG (using some code and ideas from SecureIM, Pidgin-OTR and old Miranda OTR (by SJE)).]
@@ -80,6 +80,17 @@
 
 [&Verify Fingerprint]
 
+;file \plugins\MirOTR\src\icons.cpp
+[OTR private]
+
+[OTR unverified]
+
+[OTR finished]
+
+[OTR not secure]
+
+[Refresh]
+Refrescar
 ;file \plugins\MirOTR\src\language.h
 [Start OTR]
 
@@ -99,8 +110,6 @@ No
 
 [OTR Encryption: Finished]
 
-[&Convert HTML (for Pidgin)]
-
 [OTR encrypted session with '%s' has been terminated]
 
 [Requesting OTR encrypted session with '%s']
@@ -131,16 +140,6 @@ No
 
 [OTR encrypted session with '%s' is now using a NOT VERIFIED fingerprint]
 
-[OTR unverified]
-
-[OTR finished]
-
-[OTR private]
-
-[OTR not secure]
-
-[Refresh]
-Refrescar
 [Generating new private key for protocol '%s'.\nPlease Wait...]
 
 [General]
@@ -236,6 +235,8 @@ Contraseña
 
 [OTR Status]
 
+[&Convert HTML (for Pidgin)]
+
 ;file \plugins\MirOTR\src\options.cpp
 [Private Data]
 
diff --git a/langpacks/spanish/Plugins/MirandaG15.txt b/langpacks/spanish/Plugins/MirandaG15.txt
index ca3d8b580f..9e61ba5419 100644
--- a/langpacks/spanish/Plugins/MirandaG15.txt
+++ b/langpacks/spanish/Plugins/MirandaG15.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MirandaG15.dll
 ;  Plugin: MirandaG15
-;  Version: 0.1.2.0
+;  Version: 0.1.2.1
 ;  Authors: Martin Kleinhans
 ;============================================================
 [Provides an interface to use Miranda from the LCD of various Logitech devices.]
diff --git a/langpacks/spanish/Plugins/MsgPopup.txt b/langpacks/spanish/Plugins/MsgPopup.txt
index 0353fb165c..0608eeb79c 100644
--- a/langpacks/spanish/Plugins/MsgPopup.txt
+++ b/langpacks/spanish/Plugins/MsgPopup.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MsgPopup.dll
 ;  Plugin: Message popup
-;  Version: 0.1.2.1
+;  Version: 0.1.2.2
 ;  Authors: StDenis
 ;============================================================
 [Plugin replaces message boxes (those having only OK button) with popups.]
diff --git a/langpacks/spanish/Plugins/NewsAggregator.txt b/langpacks/spanish/Plugins/NewsAggregator.txt
index e15d218830..7b4785b47a 100644
--- a/langpacks/spanish/Plugins/NewsAggregator.txt
+++ b/langpacks/spanish/Plugins/NewsAggregator.txt
@@ -2,12 +2,12 @@
 ;============================================================
 ;  File: NewsAggregator.dll
 ;  Plugin: News aggregator
-;  Version: 0.1.0.4
+;  Version: 0.1.0.5
 ;  Authors: Mataes, FREAK_THEMIGHTY
 ;============================================================
 [RSS/Atom news aggregator.]
 
-;file \plugins\NewsAggregator\Res\Resource.rc
+;file \protocols\NewsAggregator\Res\Resource.rc
 [Add]
 Añadir
 [Change]
@@ -72,14 +72,14 @@ Nombre de usuario
 
 [&Import]
 
-;file \plugins\NewsAggregator\Src\Authentication.cpp
+;file \protocols\NewsAggregator\Src\Authentication.cpp
 [Enter your username]
 
 [Error]
 Error
 [Enter your password]
 
-;file \plugins\NewsAggregator\Src\CheckFeed.cpp
+;file \protocols\NewsAggregator\Src\CheckFeed.cpp
 [%s\nis a valid feed's address.]
 
 [News Aggregator]
@@ -88,7 +88,7 @@ Error
 
 [empty]
 
-;file \plugins\NewsAggregator\Src\Icons.cpp
+;file \protocols\NewsAggregator\Src\Icons.cpp
 [Protocol icon]
 
 [Check All Feeds]
@@ -103,13 +103,13 @@ Error
 
 [Auto Update Disabled]
 
-;file \plugins\NewsAggregator\Src\Menus.cpp
+;file \protocols\NewsAggregator\Src\Menus.cpp
 [Check feed]
 
 [Change feed]
 
-;file \plugins\NewsAggregator\Src\NewsAggregator.cpp
-;file \plugins\NewsAggregator\Src\Options.cpp
+;file \protocols\NewsAggregator\Src\NewsAggregator.cpp
+;file \protocols\NewsAggregator\Src\Options.cpp
 [OPML files]
 
 [Not valid import file.]
@@ -154,11 +154,11 @@ Error
 Eliminando contacto
 [Network]
 Red
-;file \plugins\NewsAggregator\Src\Services.cpp
+;file \protocols\NewsAggregator\Src\Services.cpp
 [Avatars]
 Avatares
 [Enable/disable auto update]
 
-;file \plugins\NewsAggregator\Src\Utils.cpp
+;file \protocols\NewsAggregator\Src\Utils.cpp
 [NewsAggregator HTTP connections]
 
diff --git a/langpacks/spanish/Plugins/NimContact.txt b/langpacks/spanish/Plugins/NimContact.txt
index 45ab5c9521..582694c712 100644
--- a/langpacks/spanish/Plugins/NimContact.txt
+++ b/langpacks/spanish/Plugins/NimContact.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Non-IM Contact allows you to add 'contacts' that can act as shortcuts to other programs, or links to web pages.\r\nThe contacts name can be read from a text file (includes any ASCII file).\r\nThis plugin is a combination of Favorites and Text Reader plugins both made by me)]
 
-;file \plugins\Non-IM Contact\res\resource.rc
+;file \protocols\Non-IM Contact\res\resource.rc
 [View/Edit Files]
 
 [Add File]
@@ -108,7 +108,7 @@ Ayuda
 
 [EXAMPLE: %fn1,%fn2]
 
-;file \plugins\Non-IM Contact\src\contactinfo.cpp
+;file \protocols\Non-IM Contact\src\contactinfo.cpp
 [Select Folder]
 Seleccionar carpeta
 [Non-IM Contact protocol timer is Disabled]
@@ -117,7 +117,7 @@ Seleccionar carpeta
 
 [New Non-IM Contact]
 
-;file \plugins\Non-IM Contact\src\dialog.cpp
+;file \protocols\Non-IM Contact\src\dialog.cpp
 [String replacing variables...\r\nThe following are all the valid variables that can be used. Refer to the wiki.miranda-ng.org for a proper explanation.\r\n\r\nfile(X)\t\t<- specifies the file to read from. MUST be followed by either start() or end() or wholeline()\r\nfilename(X)\t<- copies the filename of file X.\r\nstart(...)\t\t<- specifies where to start copying from.\r\nend(...)\t\t<- specifies where to stop copying.\r\nwholeline(line(...))\t<- specifies a whole line to copy\r\n\r\nstart() and end() explained\r\n.........................\r\nMUST start with line() followed by a number or a string inside " marks, OR csv(separatorX) variable. The number specifies which character in the line to start/end copying. The string specifies a string in the line to start/end copying.\r\n\r\ncsv(seperatorX) explained...\r\nSeperator is either "tab" or "space" or any SINGLE character. X is the Xth separator to pass before copying, (or to stop before).\r\n\r\nLastly the line(...) variable...\r\nInside the brackets must be either a number (to specify the line number), or a string inside " marks (to use the line with that string), or lastline(X). The X in lastline is the Xth line above the last line, i.e., lastline(1) will use the 2nd last line of the file. If searching for a line with "some words" you may put a + or - X after the closing ), i.e., line("some words")+3 to go 3 lines after the line with "some words".\r\n\r\nSome examples...\r\nfilename(0)    <- will display the filename of the 0th file\r\nfile(0)wholeline(line(0)))    <- will display the whole first line of the 0th file\r\nfile(0)wholeline(line("hello")-1)))    <- the wholeline above the first occurrence of "hello" in the file\r\nfile(0)start(line(lastline(1))csv(tab2))end(line(lastline())csv(tab4)))    <- starts at the 2nd last line of the file, from the 2nd tab variable, until the 4th tab variable in the last line (in the 0th file)\r\nfile(0)start(line("hello")+1"zzzz")end(line(6)17))    <- starts from the first occurrence of zzzz in the line after the first occurrence of hello, until the 17th character in the 6th line (starting from line 0) of the 0th file.\r\n]
 
 [Contacts Display Info]
@@ -130,7 +130,7 @@ Seleccionar carpeta
 Archivos
 [Edit Non-IM Contact "%s"]
 
-;file \plugins\Non-IM Contact\src\files.cpp
+;file \protocols\Non-IM Contact\src\files.cpp
 [Do you want to overwrite the contents of the file?\r\n\r\nPressing No will append these contacts to the end of the file.]
 
 [File couldn't be opened]
@@ -139,10 +139,10 @@ Archivos
 
 [line(%-3d) = | %s]
 
-;file \plugins\Non-IM Contact\src\http.cpp
+;file \protocols\Non-IM Contact\src\http.cpp
 [Non-IM Contacts]
 
-;file \plugins\Non-IM Contact\src\main.cpp
+;file \protocols\Non-IM Contact\src\main.cpp
 [Plugins]
 Plugins
 [Main Icon]
@@ -163,7 +163,7 @@ Icono principal
 
 [E&dit Contact Settings]
 
-;file \plugins\Non-IM Contact\src\namereplacing.cpp
+;file \protocols\Non-IM Contact\src\namereplacing.cpp
 [%s - ERROR: no line specified or line not found (in %s)]
 
 [%s - ERROR: file couldn't be opened (in %s)]
diff --git a/langpacks/spanish/Plugins/NotesReminders.txt b/langpacks/spanish/Plugins/NotesReminders.txt
index f74bcda959..744f93acf0 100644
--- a/langpacks/spanish/Plugins/NotesReminders.txt
+++ b/langpacks/spanish/Plugins/NotesReminders.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: NotesReminders.dll
 ;  Plugin: Sticky Notes & Reminders
-;  Version: 0.1.0.1
+;  Version: 0.2.0.2
 ;  Authors: Joe Kucera, Lubomir Kolev Ivanov, Georg Fischer
 ;============================================================
 [Sticky Notes & Reminders Implementation for Miranda NG.]
@@ -50,12 +50,12 @@
 
 [Add Reminder]
 
-[Trigger On Time && Date:]
-
 [Date]
 
 [Time]
 
+[Repeat each day]
+
 [Reminder Note:]
 
 [None]
@@ -102,8 +102,6 @@ Ninguno
 
 [D&elete All Reminders]
 
-[Context Menu Note Popup]
-
 [&Hide Note]
 
 [&Always On Top]
@@ -152,9 +150,6 @@ Deshacer
 
 [&Show / Hide Notes]
 
-;file \plugins\NotesAndReminders\src\globals.h
-[Notes & Reminders]
-
 ;file \plugins\NotesAndReminders\src\hotkeys.cpp
 [New Note]
 
@@ -165,10 +160,6 @@ Deshacer
 [New Reminder]
 
 ;file \plugins\NotesAndReminders\src\main.cpp
-[Are you sure you want to delete all notes?]
-
-[Are you sure you want to delete all reminders?]
-
 [Delete All Notes]
 
 [Show/Hide Notes]
@@ -195,20 +186,10 @@ Deshacer
 
 [Sticky Notes]
 
-[Plugins]
-Plugins
 [Add New Note]
 
 [Add New Reminder]
 
-[Alerts]
-Alertas
-[Reminder triggered]
-
-[Reminder triggered (Alternative 1)]
-
-[Reminder triggered (Alternative 2)]
-
 [Notes && Reminders]
 
 [New &Note]
@@ -221,6 +202,14 @@ Alertas
 
 [Miranda could not load the Notes & Reminders plugin, Msftedit.dll is missing. If you are using WINE, please make sure you have Msftedit.dll installed. Press 'Yes' to continue loading Miranda.]
 
+[Alerts]
+Alertas
+[Reminder triggered]
+
+[Reminder triggered (Alternative 1)]
+
+[Reminder triggered (Alternative 2)]
+
 ;file \plugins\NotesAndReminders\src\notes.cpp
 [Black]
 
@@ -268,6 +257,8 @@ Notas
 
 [Date/Title]
 
+[Are you sure you want to delete all notes?]
+
 ;file \plugins\NotesAndReminders\src\options.cpp
 [Sticky Note Caption]
 
@@ -279,11 +270,17 @@ Notas
 
 [Select Executable]
 
+[Plugins]
+Plugins
 ;file \plugins\NotesAndReminders\src\reminders.cpp
 [Minutes]
 Minutos
 [Hours]
 Horas
+[The specified time is invalid due to begin of daylight saving (summer time).]
+
+[The specified time is invalid.]
+
 [Hour]
 
 [Day]
@@ -292,10 +289,6 @@ Horas
 Días
 [Week]
 
-[The specified time is invalid due to begin of daylight saving (summer time).]
-
-[The specified time is invalid.]
-
 [The specified time offset is invalid.]
 
 [&Update Reminder]
@@ -316,5 +309,10 @@ Por defecto
 
 [Date of activation]
 
+[Are you sure you want to delete all reminders?]
+
 [Are you sure you want to delete this reminder?]
 
+;file \plugins\NotesAndReminders\src\stdafx.h
+[Notes & Reminders]
+
diff --git a/langpacks/spanish/Plugins/PasteIt.txt b/langpacks/spanish/Plugins/PasteIt.txt
index 683a7053d0..4832944d60 100644
--- a/langpacks/spanish/Plugins/PasteIt.txt
+++ b/langpacks/spanish/Plugins/PasteIt.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: PasteIt.dll
 ;  Plugin: Paste it
-;  Version: 1.0.0.3
+;  Version: 1.0.0.4
 ;  Authors: Krzysztof Kral
 ;============================================================
 [Uploads the text to web page and sends the URL to your friends.]
@@ -142,11 +142,11 @@ Error
 [File '%s' is empty]
 
 ;file \plugins\PasteIt\src\PasteToWeb1.cpp
-[Error during sending text to web page: %s]
+[Error during sending text to web page: %S]
 
 [Error during sending text to web page]
 
-[Error during getting user key from web page: %s]
+[Error during getting user key from web page: %S]
 
 [Paste expire date]
 
diff --git a/langpacks/spanish/Plugins/PluginUpdater.txt b/langpacks/spanish/Plugins/PluginUpdater.txt
index 6eb6ba8f6b..113b5263af 100644
--- a/langpacks/spanish/Plugins/PluginUpdater.txt
+++ b/langpacks/spanish/Plugins/PluginUpdater.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: PluginUpdater.dll
 ;  Plugin: Plugin updater
-;  Version: 0.2.0.2
+;  Version: 0.2.0.3
 ;  Authors: Mataes, George Hazan
 ;============================================================
 [Installs and updates plugins and other Miranda NG components.]
diff --git a/langpacks/spanish/Plugins/PopupPlus.txt b/langpacks/spanish/Plugins/PopupPlus.txt
index d55f53da54..623f59617b 100644
--- a/langpacks/spanish/Plugins/PopupPlus.txt
+++ b/langpacks/spanish/Plugins/PopupPlus.txt
@@ -1,6 +1,6 @@
 #muuid {26a9125d-7863-4e01-af0e-d14ef95c5054}
 ;============================================================
-;  File: Popup.dll
+;  File: PopupPlus.dll
 ;  Plugin: Popup plus
 ;  Version: 2.1.1.15
 ;  Authors: MPK, Merlin_de (Luca Santarelli, Victor Pavlychko)
@@ -82,7 +82,7 @@ Pieles
 Previsualizar
 [Download more skins]
 
-[Popup History]
+[Popup history]
 
 [Desktop]
 
@@ -263,15 +263,11 @@ Borde
 [Avatar border]
 
 ;file \plugins\Popup\src\history.cpp
-[Popup History is disabled]
+[Popup history is disabled]
 
-[Popup History message]
+[Popup history message]
 
 ;file \plugins\Popup\src\icons.cpp
-[Popups are enabled]
-
-[Popups are disabled]
-
 [With "favorite" overlay]
 
 [With "fullscreen" overlay]
@@ -309,13 +305,13 @@ Acciones
 Contactos
 [Advanced]
 Avanzado
-[Toggle Popups]
+[Toggle popups]
 
-[Enable Popups]
+[Enable popups]
 
-[Disable Popups]
+[Disable popups]
 
-[Popup Plus]
+[Popup plus]
 
 [Error: I could not register the Popup Window class.\r\nThe plugin will not operate.]
 
diff --git a/langpacks/spanish/Plugins/SkypeWeb.txt b/langpacks/spanish/Plugins/SkypeWeb.txt
index 5a913b8870..91186fb930 100644
--- a/langpacks/spanish/Plugins/SkypeWeb.txt
+++ b/langpacks/spanish/Plugins/SkypeWeb.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: SkypeWeb.dll
 ;  Plugin: Skype protocol (Web)
-;  Version: 0.12.3.1
+;  Version: 0.12.3.3
 ;  Authors: Miranda NG team
 ;============================================================
 [Skype protocol support for Miranda NG. Based on new Skype for Web.]
diff --git a/langpacks/spanish/Plugins/SmileyAdd.txt b/langpacks/spanish/Plugins/SmileyAdd.txt
index 7f359eb160..e067611266 100644
--- a/langpacks/spanish/Plugins/SmileyAdd.txt
+++ b/langpacks/spanish/Plugins/SmileyAdd.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: SmileyAdd.dll
 ;  Plugin: SmileyAdd
-;  Version: 0.3.1.0
+;  Version: 0.3.1.1
 ;  Authors: Peacow, nightwish, bid, borkra
 ;============================================================
 [Smiley support for Miranda NG.]
diff --git a/langpacks/spanish/Plugins/StatusManager.txt b/langpacks/spanish/Plugins/StatusManager.txt
index 8fad83b5cb..d1b12315f5 100644
--- a/langpacks/spanish/Plugins/StatusManager.txt
+++ b/langpacks/spanish/Plugins/StatusManager.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: StatusManager.dll
 ;  Plugin: Status manager
-;  Version: 1.2.0.4
+;  Version: 1.2.0.5
 ;  Authors: P Boon
 ;============================================================
 [A connection checker and auto away module. Also allows you to define the status Miranda should set on startup, configurable per protocol.]
diff --git a/langpacks/spanish/Plugins/TabSRMM.txt b/langpacks/spanish/Plugins/TabSRMM.txt
index 261aac3c28..9cce5a2597 100644
--- a/langpacks/spanish/Plugins/TabSRMM.txt
+++ b/langpacks/spanish/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: TabSRMM.dll
 ;  Plugin: TabSRMM
-;  Version: 3.5.0.12
+;  Version: 3.5.0.13
 ;  Authors: The Miranda developers team and contributors
 ;============================================================
 [IM and group chat module for Miranda NG.]
@@ -178,8 +178,6 @@ Grupo de chats
 Errores
 [Use the message log color theme for group chat popups]
 
-[No compatible popup plugin was found. The event notification\nsystem is not available.]
-
 [Dialog]
 Diálogo
 [Cancel]
@@ -1697,10 +1695,6 @@ Registro de mensaje
 
 [Feature enabled (used as overlay)]
 
-[Enable typing notification]
-
-[Disable typing notification]
-
 ;file \plugins\TabSRMM\src\msgs.h
 [Message windows - IM]
 
@@ -1984,10 +1978,10 @@ Cerrar la ventana de mensaje al enviar
 
 [Enable &typing notification]
 
-[...is typing a message.]
-
 [...has stopped typing.]
 
+[...is typing a message.]
+
 [Contact started typing]
 El contacto ha comenzado a escribir
 [Contact stopped typing]
diff --git a/langpacks/spanish/Plugins/UInfoEx.txt b/langpacks/spanish/Plugins/UInfoEx.txt
index 5d4aa2e634..8cea73a88c 100644
--- a/langpacks/spanish/Plugins/UInfoEx.txt
+++ b/langpacks/spanish/Plugins/UInfoEx.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: UInfoEx.dll
 ;  Plugin: User info ext
-;  Version: 0.8.5.1
+;  Version: 0.8.5.2
 ;  Authors: DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
 ;============================================================
 [Extended UserInfo module for Miranda NG. Provides interface to edit all contact information.]
@@ -1110,11 +1110,9 @@ Enviar e-mail
 
 [Abort Refreshing Contact Details]
 
-[Do you want to cancel the current refresh procedure?]
-
 [Miranda must be online for refreshing contact information!]
 
-[The function caused an exception!]
+[Do you want to cancel the current refresh procedure?]
 
 ;file \plugins\UserInfoEx\src\svc_reminder.cpp
 [%s has %s today.]
@@ -1216,16 +1214,8 @@ todos los contactos
 ;file \plugins\UserInfoEx\src\ex_import\svc_ExImXML.cpp
 [Can't create xml file!\n%S]
 
-[Export took %f ms]
-
 [Contact: %s (%S)]
 
-[Importing %s caused error %d]
-
-[Loading contact %s from xml failed with error %d]
-
-[Importing Owner caused error %d]
-
 [Parser is unable to load XMLCard "%s"\nError: %d\nDescription: %s]
 
 [The selected file is no valid XMLCard]
@@ -1238,12 +1228,8 @@ Completo
 
 [Selected XMLCard does not contain an owner contact!]
 
-[Import took %f ms]
-
 [added contacts: %u / %u\nadded settings: %u / %u\nadded events %u / %u\nduplicated events: %u]
 
-[FATAL: An exception was thrown while importing contacts from xmlCard!]
-
 ;file \plugins\UserInfoEx\src\Flags\svc_flags.cpp
 [Flags (UInfoEx)]
 
diff --git a/langpacks/spanish/Plugins/VKontakte.txt b/langpacks/spanish/Plugins/VKontakte.txt
index c9a3214733..3017adfa4a 100644
--- a/langpacks/spanish/Plugins/VKontakte.txt
+++ b/langpacks/spanish/Plugins/VKontakte.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: VKontakte.dll
 ;  Plugin: VKontakte protocol
-;  Version: 0.1.8.1
+;  Version: 0.1.9.0
 ;  Authors: Miranda NG team
 ;============================================================
 [VKontakte protocol support for Miranda NG.]
diff --git a/langpacks/spanish/Plugins/Weather.txt b/langpacks/spanish/Plugins/Weather.txt
index 6e84fb2f5f..67ea87eaca 100644
--- a/langpacks/spanish/Plugins/Weather.txt
+++ b/langpacks/spanish/Plugins/Weather.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Retrieves weather information and displays it in your contact list.]
 
-;file \plugins\Weather\res\resource.rc
+;file \protocols\Weather\res\resource.rc
 [Update]
 Actualizar
 [Brief Info]
@@ -254,7 +254,7 @@ Ciudad
 
 [To default]
 
-;file \plugins\Weather\src\stdafx.h
+;file \protocols\Weather\src\stdafx.h
 [N/A]
 
 [Invalid ID format, missing "/" (10)]
@@ -337,7 +337,7 @@ Ciudad
 
 [The URL for weather map has not been set. You can set it from the Edit Settings dialog.]
 
-;file \plugins\Weather\src\weather.cpp
+;file \protocols\Weather\src\weather.cpp
 [Enable/disable auto update]
 
 [Auto Update Enabled]
@@ -348,7 +348,7 @@ Ciudad
 
 [Alert Issued]
 
-;file \plugins\Weather\src\weather_addstn.cpp
+;file \protocols\Weather\src\weather_addstn.cpp
 [Current weather information for %s.]
 
 [%s is now the default weather station]
@@ -361,7 +361,7 @@ Ciudad
 
 [<Enter station ID here>]
 
-;file \plugins\Weather\src\weather_contacts.cpp
+;file \protocols\Weather\src\weather_contacts.cpp
 [Weather condition was not logged.]
 
 [Get city name from ID]
@@ -378,7 +378,7 @@ Restaurar por defecto
 Archivos de texto
 [All Files]
 Todos los archivos
-;file \plugins\Weather\src\weather_conv.cpp
+;file \protocols\Weather\src\weather_conv.cpp
 [mb]
 
 [in]
@@ -391,15 +391,15 @@ Todos los archivos
 
 [HTTP Error %i]
 
-;file \plugins\Weather\src\weather_data.cpp
+;file \protocols\Weather\src\weather_data.cpp
 [<Enter city name here>]
 
 [Error when obtaining data: %s]
 
-;file \plugins\Weather\src\weather_http.cpp
+;file \protocols\Weather\src\weather_http.cpp
 [Weather HTTP connections]
 
-;file \plugins\Weather\src\weather_icons.cpp
+;file \protocols\Weather\src\weather_icons.cpp
 [Protocol icon]
 
 [Update Disabled]
@@ -420,7 +420,7 @@ Ventana emergente
 
 [Edit Settings]
 
-;file \plugins\Weather\src\weather_info.cpp
+;file \protocols\Weather\src\weather_info.cpp
 [Name]
 Nombre
 [Author]
@@ -459,21 +459,21 @@ Versión
 bytes
 [Description:]
 Detalles:
-;file \plugins\Weather\src\weather_ini.cpp
+;file \protocols\Weather\src\weather_ini.cpp
 [All update data has been reloaded.]
 
 [Invalid ini format for: %s]
 
 [No update data file is found. Please check your Plugins\\Weather directory.]
 
-;file \plugins\Weather\src\weather_mwin.cpp
+;file \protocols\Weather\src\weather_mwin.cpp
 [Frame Font]
 
 [Frame Title Font]
 
 [Frame Background]
 Marco de fondo
-;file \plugins\Weather\src\weather_opt.cpp
+;file \protocols\Weather\src\weather_opt.cpp
 [Weather Protocol Text Preview]
 
 [Network]
@@ -484,8 +484,8 @@ General
 
 [Popups]
 Ventanas emergentes
-;file \plugins\Weather\src\weather_popup.cpp
-;file \plugins\Weather\src\weather_svcs.cpp
+;file \protocols\Weather\src\weather_popup.cpp
+;file \protocols\Weather\src\weather_svcs.cpp
 [Station ID]
 
 [Disable &weather notification]
@@ -512,10 +512,10 @@ Ventanas emergentes
 
 [Display in a frame]
 
-;file \plugins\Weather\src\weather_update.cpp
+;file \protocols\Weather\src\weather_update.cpp
 [Unable to retrieve weather information for %s]
 
-;file \plugins\Weather\src\weather_userinfo.cpp
+;file \protocols\Weather\src\weather_userinfo.cpp
 [Variable]
 
 [Information]
diff --git a/langpacks/spanish/Plugins/WebView.txt b/langpacks/spanish/Plugins/WebView.txt
index 46a3696bbd..db86431b59 100644
--- a/langpacks/spanish/Plugins/WebView.txt
+++ b/langpacks/spanish/Plugins/WebView.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Adds web pages as contacts to your contact list and can display text and/or issue change alerts from those pages in a window.]
 
-;file \plugins\WebView\res\webview.rc
+;file \protocols\WebView\res\webview.rc
 [Webview]
 
 [Update data every]
@@ -180,7 +180,7 @@ Co&piar todo
 &Seleccionar todo
 [C&lear all]
 
-;file \plugins\WebView\src\main.cpp
+;file \protocols\WebView\src\main.cpp
 [Alert event]
 
 [Auto update disabled]
@@ -207,14 +207,14 @@ Co&piar todo
 
 [Stop data processing]
 
-;file \plugins\WebView\src\webview.cpp
+;file \protocols\WebView\src\webview.cpp
 [All Webview sites have been updated.]
 
 [Network]
 Red
 [Popups]
 Ventanas emergentes
-;file \plugins\WebView\src\webview_alerts.cpp
+;file \protocols\WebView\src\webview_alerts.cpp
 [Cannot write to file]
 
 [Last updated on]
@@ -245,7 +245,7 @@ Ventanas emergentes
 
 [Loaded from cache]
 
-;file \plugins\WebView\src\webview_datawnd.cpp
+;file \protocols\WebView\src\webview_datawnd.cpp
 [ERROR: You have two or more Webview contacts with the same URL and contact name.]
 
 [Alert options]
@@ -258,7 +258,7 @@ Ventanas emergentes
 
 [Disable stick to the front]
 
-;file \plugins\WebView\src\webview_getdata.cpp
+;file \protocols\WebView\src\webview_getdata.cpp
 [URL not supplied]
 
 [Download in progress, please wait...]
@@ -305,7 +305,7 @@ En línea
 
 [Alert test conditions not met; press the refresh button to view content.]
 
-;file \plugins\WebView\src\webview_opts.cpp
+;file \protocols\WebView\src\webview_opts.cpp
 [No whitespace removal]
 
 [Minimal level of whitespace removal]
@@ -342,7 +342,7 @@ En línea
 
 [Invalid symbol present in contact name.]
 
-;file \plugins\WebView\src\webview_services.cpp
+;file \protocols\WebView\src\webview_services.cpp
 [Cache folder does not exist.]
 
 [Missing "psite.bat" file.]
diff --git a/langpacks/spanish/Plugins/WhoUsesMyFiles.txt b/langpacks/spanish/Plugins/WhoUsesMyFiles.txt
index 44132621e9..a4d4b9789f 100644
--- a/langpacks/spanish/Plugins/WhoUsesMyFiles.txt
+++ b/langpacks/spanish/Plugins/WhoUsesMyFiles.txt
@@ -55,12 +55,10 @@ Usar colores de Windows
 [Show current connections]
 
 ;file \plugins\WhoUsesMyFiles\src\options.cpp
-[Popup plugin not found!]
+[Common Dialog Error 0x%lx]
 
 [Error]
 Error
-[Common Dialog Error 0x%lx]
-
 [Not implemented yet...]
 
 [Who uses my files]
diff --git a/langpacks/spanish/Plugins/YAMN.txt b/langpacks/spanish/Plugins/YAMN.txt
index dd2b31c206..5a68e8a401 100644
--- a/langpacks/spanish/Plugins/YAMN.txt
+++ b/langpacks/spanish/Plugins/YAMN.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Mail notifier and browser for Miranda NG. Included POP3 protocol.]
 
-;file \plugins\YAMN\res\YAMN.rc
+;file \protocols\YAMN\res\YAMN.rc
 [Installed plugins]
 
 [Version:]
@@ -156,7 +156,7 @@ Previsualizar
 Color de fondo
 [Text color]
 Color de texto
-;file \plugins\YAMN\src\main.cpp
+;file \protocols\YAMN\src\main.cpp
 [Check &mail (All Account)]
 
 [Check &mail (This Account)]
@@ -171,17 +171,17 @@ Color de texto
 
 [Connect Fail]
 
-;file \plugins\YAMN\src\main.h
+;file \protocols\YAMN\src\main.h
 [New mail message]
 
 [Connect failed]
 
-;file \plugins\YAMN\src\services.cpp
+;file \protocols\YAMN\src\services.cpp
 [Nick]
 Apodo
 [No new mail message]
 
-;file \plugins\YAMN\src\browser\badconnect.cpp
+;file \protocols\YAMN\src\browser\badconnect.cpp
 [%s - connection error]
 
 [An error occurred. Error code: %d]
@@ -190,7 +190,7 @@ Apodo
 Error desconocido
 [ - connection error]
 
-;file \plugins\YAMN\src\browser\mailbrowser.cpp
+;file \protocols\YAMN\src\browser\mailbrowser.cpp
 [%s - %d new mail messages, %d total]
 
 [%s : %d new mail message(s), %d total]
@@ -229,15 +229,15 @@ Tamaño
 
 [Delete confirmation]
 
-;file \plugins\YAMN\src\mails\mime.cpp
+;file \protocols\YAMN\src\mails\mime.cpp
 [Translate header error]
 
 [Part]
 
-;file \plugins\YAMN\src\proto\netlib.cpp
+;file \protocols\YAMN\src\proto\netlib.cpp
 [%s connection]
 
-;file \plugins\YAMN\src\proto\pop3\pop3comm.cpp
+;file \protocols\YAMN\src\proto\pop3\pop3comm.cpp
 [Disconnected]
 
 [POP3 protocol (internal)]
@@ -314,7 +314,7 @@ Tamaño
 
 [Error %d-%d-%d-%d:]
 
-;file \plugins\YAMN\src\proto\pop3\pop3opt.cpp
+;file \protocols\YAMN\src\proto\pop3\pop3opt.cpp
 [Network]
 Red
 [Accounts]
diff --git a/langpacks/spanish/Untranslated/=CORE=.txt b/langpacks/spanish/Untranslated/=CORE=.txt
index 18bff1864d..bf0ca69bf6 100644
--- a/langpacks/spanish/Untranslated/=CORE=.txt
+++ b/langpacks/spanish/Untranslated/=CORE=.txt
@@ -1,3 +1,24 @@
+[Popup history]
+[Case sensitive]
+[Default timeout]
+[Never timeout]
+[Set timeout:]
+[Width:]
+[Maximum height:]
+[Opacity (%):]
+[Round corners (window)]
+[Transparent background]
+[Layout]
+[Avatar size:]
+[Disable when]
+[Global hover]
+[Sidebar width:]
+[Text indent:]
+[Padding:]
+[Round corners (avatar)]
+[Text color:]
+[Set timeout]
+[Timeout value (0 = default):]
 [These changes will take effect the next time you connect to the network.]
 [Insert submenu]
 [Module:]
@@ -34,6 +55,43 @@
 [This file transfer has been canceled by the other side]
 [Group chat log background]
 [Me]
+[Popups are enabled]
+[Popups are disabled]
+[Example]
+[The quick brown fox jumped over the lazy dog.]
+[Example With a Long Title]
+[Thequickbrownfoxjumpedoverthelazydog.]
+[An avatar.]
+[Bottom right]
+[Bottom left]
+[Top right]
+[Top left]
+[Icon on left]
+[Icon on right]
+[No time]
+[Time on left]
+[Time on right]
+[Time above avatar]
+[No avatar]
+[Left avatar]
+[Right avatar]
+[Full-screen app running]
+[No animate]
+[Horizontal animate]
+[Vertical animate]
+[You cannot set a default timeout of 0.\nValue has been reset.]
+[Classes]
+[Disable popups]
+[Enable popups]
+[Toggle popups]
+[First line]
+[Second line]
+[Time]
+[Sidebar]
+[Title underline]
+[Copy title to clipboard]
+[Copy message to clipboard]
+[Copy timestamp to clipboard]
 [Single]
 [Close relationships]
 [Engaged]
diff --git a/langpacks/spanish/Untranslated/Actman.txt b/langpacks/spanish/Untranslated/Actman.txt
index 1bf2e604bd..43235aca26 100644
--- a/langpacks/spanish/Untranslated/Actman.txt
+++ b/langpacks/spanish/Untranslated/Actman.txt
@@ -185,12 +185,12 @@
 [with confirmation]
 [without confirmation]
 [Empty updater download folder]
-[Popup Plus (popup.dll) latest YAPP (yapp.dll)]
-[Enables or disables Popup windows]
-[YAPP or Popup]
+[Popup plus (PopupPlus.dll) latest StdPopup (StdPopup.dll)]
+[Enables or disables popup windows]
+[StdPopup or Popup plus]
 [Popup window]
 [Unicode Text]
-[Enables or disables Popup windows (maybe deprecated)]
+[Enables or disables popup windows (maybe deprecated)]
 [result of protocol service call]
 [Send a general request through the protocol chain for a contact]
 [str, account name]
diff --git a/langpacks/spanish/Untranslated/Clist_modern.txt b/langpacks/spanish/Untranslated/Clist_modern.txt
index c1fcd1d414..aa4ef39df9 100644
--- a/langpacks/spanish/Untranslated/Clist_modern.txt
+++ b/langpacks/spanish/Untranslated/Clist_modern.txt
@@ -169,6 +169,7 @@
 [Last message time]
 [Account name]
 [Rate]
+[Last online]
 [-Nothing-]
 [Hide to tray]
 [Behind left edge]
@@ -191,7 +192,6 @@
 [Center group names]
 [Right align group names]
 [Row]
-[Row design]
 [Show avatar]
 [Hide avatar]
 [Show contact &avatar]
@@ -201,13 +201,6 @@
 [Close Miranda]
 [Restore last status]
 [Show/Hide offline users]
-[Empty %s cell]
-[column]
-[line]
-[columns]
-[lines]
-[%s, contain %s]
-[ layered]
 [( unknown )]
 [%s\n\n%s\n\nAuthor(s):\t %s\nContact:\t %s\nWeb:\t %s\n\nFile:\t %s]
 [%s\n\n%s\n\nAuthor(s): %s\nContact:\t %s\nWeb:\t %s\n\nFile:\t %s]
diff --git a/langpacks/spanish/Untranslated/CurrencyRates.txt b/langpacks/spanish/Untranslated/CurrencyRates.txt
index 99573340e5..f617829ec5 100644
--- a/langpacks/spanish/Untranslated/CurrencyRates.txt
+++ b/langpacks/spanish/Untranslated/CurrencyRates.txt
@@ -34,6 +34,7 @@
 [&Display in Contact List as:]
 [&Status Message:]
 [&Tendency:]
+[&Personal key:]
 [&Advanced Settings...]
 [Rate Info]
 [There is nothing to show]
@@ -43,10 +44,6 @@
 [Info provided by]
 [Enter positive number.]
 [Currency Rate]
-[Error occurred during HTML parsing.]
-[Error occurred during site access.]
-[Currency Symbol]
-[Currency Name]
 [Source of Information]
 [Rate Value]
 [Previous Rate Value]
@@ -56,13 +53,8 @@
 [Percentage Character (%)]
 [Tabulation]
 [Left slash (\\)]
-[Open Price]
-[Percent Change to After Hours]
-[Percent Change to Yesterday Close]
-[Day's High]
-[Day's Low]
-[Previous Close]
-[Change]
+[Error occurred during HTML parsing.]
+[Error occurred during site access.]
 [From Currency Full Name]
 [From Currency Short Name]
 [Into Currency Full Name]
@@ -82,6 +74,8 @@
 [Enable/Disable Currency Rates Auto Update]
 [Currency Rates Auto Update Enabled]
 [Currency Rates Auto Update Disabled]
+[Currency Symbol]
+[This plugin requires a personal key. Press Yes to obtain it at the site and then enter the result in the Options dialog, otherwise this plugin will fail.]
 [CurrencyRates HTTP connections]
 [Protocol icon]
 [Currency Rate up]
@@ -93,7 +87,6 @@
 [Import]
 [XML File (*.xml)]
 [All files (*.*)]
-[Miranda could not load CurrencyRates plugin. XML parser is missing.]
 [Miranda could not load CurrencyRates plugin. Microsoft HTML parser is missing.]
 [Log Files (*.txt,*.log)]
 [Enter integer value]
diff --git a/langpacks/spanish/Untranslated/Db_autobackups.txt b/langpacks/spanish/Untranslated/Db_autobackups.txt
index b613dd0490..3fd3f77a45 100644
--- a/langpacks/spanish/Untranslated/Db_autobackups.txt
+++ b/langpacks/spanish/Untranslated/Db_autobackups.txt
@@ -11,7 +11,6 @@
 [Compress backup to zip-archive]
 [Backup profile folder]
 [Disable progress bar]
-[Disable popups]
 [Use CloudFile]
 [Backup NOW]
 [Backup progress]
@@ -20,6 +19,8 @@
 [Uploading to cloud failed]
 [Database backed up]
 [Database back up in process...]
+[Enable &AutoBackups notification]
+[Disable &AutoBackups notification]
 [Miranda NG databases]
 [Compressed Miranda NG databases]
 [Backup profile]
diff --git a/langpacks/spanish/Untranslated/Discord.txt b/langpacks/spanish/Untranslated/Discord.txt
index 7da71ca26b..6bbe55e837 100644
--- a/langpacks/spanish/Untranslated/Discord.txt
+++ b/langpacks/spanish/Untranslated/Discord.txt
@@ -1,6 +1,7 @@
 [Discord support for Miranda NG.]
+[Enable group chats]
 [Do not open chat windows on creation]
-[Use subgroups for guild's channels (requires restart)]
+[Use subgroups for server channels (requires restart)]
 [edited at]
 [Change &nickname]
 [Channel control]
@@ -14,11 +15,15 @@
 [Enter channel name]
 [Enter invitation code you received]
 [Do you really want to leave the guild?]
+[Disable sync]
+[Enable sync]
 [Join guild]
 [Copy my Discord ID]
 [Leave guild]
 [Create new channel]
 [Copy Discord ID]
+[Enable guild sync]
+[Load server history]
 [%s gateway connection]
 [Protocol is offline or user isn't authorized yet]
 [Attachment]
diff --git a/langpacks/spanish/Untranslated/Facebook.txt b/langpacks/spanish/Untranslated/Facebook.txt
index ead8d4ec44..ea2f3d38dc 100644
--- a/langpacks/spanish/Untranslated/Facebook.txt
+++ b/langpacks/spanish/Untranslated/Facebook.txt
@@ -31,10 +31,10 @@
 [&Destroy chat session]
 [Delete conversation]
 [This will permanently delete the conversation history]
-[Former]
 [Myself]
 [Friend]
 [User]
+[Former]
 [%s and more (%d)]
 [You entered too many invalid verification codes. Plugin will disconnect.]
 [You entered wrong verification code. Try it again.]
diff --git a/langpacks/spanish/Untranslated/ICQ.txt b/langpacks/spanish/Untranslated/ICQ.txt
index 9b9534a37c..623ec96311 100644
--- a/langpacks/spanish/Untranslated/ICQ.txt
+++ b/langpacks/spanish/Untranslated/ICQ.txt
@@ -2,6 +2,8 @@
 [UIN/e-mail:]
 [Sign in/sign up using phone]
 [Do not open chat windows on creation]
+[Use tray icon notifications]
+[Launch mailbox in a browser on click]
 [If a contact goes Offline, set this status instead and cache it for given timeout in seconds (0 - disabled)]
 [After that, set this status to a contact and move it offline after specified timeout in seconds (0 - disabled)]
 [Send group chat invitation]
@@ -19,7 +21,10 @@
 [&Invite a user]
 [&Leave/destroy chat]
 [Do you really want to remove it from ignore list?]
+[E-mail notification]
 [Remove Ignore]
+[You received e-mail from %s: %s]
+[You have %d unread emails]
 [Synchronize server groups]
 [Edit ignore list]
 [UIN/e-mail/phone]
diff --git a/langpacks/spanish/Untranslated/Import.txt b/langpacks/spanish/Untranslated/Import.txt
index eb2547bfdc..dc055c162f 100644
--- a/langpacks/spanish/Untranslated/Import.txt
+++ b/langpacks/spanish/Untranslated/Import.txt
@@ -41,7 +41,6 @@
 [Skipping contact, account %S cannot be mapped.]
 [Skipping contact, %S not installed.]
 [Skipping non-IM contact (%S)]
-[Skipping %S contact, ID not found]
 [Skipping duplicate %S contact %s]
 [Failed to add %S contact %s]
 [Added %S contact %s, '%s']
diff --git a/langpacks/spanish/Untranslated/Jabber.txt b/langpacks/spanish/Untranslated/Jabber.txt
index 7759cf4708..5726a57a90 100644
--- a/langpacks/spanish/Untranslated/Jabber.txt
+++ b/langpacks/spanish/Untranslated/Jabber.txt
@@ -57,6 +57,7 @@
 [Favorites]
 [JID:]
 [Node:]
+[Filter:]
 [Member Information]
 [Role:]
 [Set role]
@@ -85,15 +86,8 @@
 [Frame text]
 [Jabber Activity]
 [Jabber Mood]
-[Error %s %s]
-[Select Command]
-[Not supported]
 [Done]
-[In progress. Please Wait...]
 [Execute]
-[Requesting command list. Please wait...]
-[Jabber Ad-Hoc commands at %s]
-[Sending Ad-Hoc command to %s]
 [Jabber Agent Registration]
 [No message]
 [Register]
@@ -153,19 +147,11 @@
 [Visitor]
 [Participant]
 [Moderator]
-[Visitors]
-[Participants]
-[Moderators]
 [Owners]
-[User %s is now banned.]
-[User %s changed status to %s with message: %s]
-[User %s changed status to %s]
-[Room configuration was changed.]
-[Outcast]
-[Affiliation of %s was changed to '%s'.]
+[Moderators]
+[Participants]
+[Visitors]
 [Role of %s was changed to '%s'.]
-[because room is now members-only]
-[user banned]
 [Change &nickname]
 [&Invite a user]
 [&Roles]
@@ -208,8 +194,6 @@
 [Real &JID: %s]
 [Invite Users to\n%s]
 [%s (not on roster)]
-[%s from\n%s]
-[Real JID not available]
 [Reason to kick %s]
 [Reason to ban %s]
 [Invite %s to %s]
@@ -244,23 +228,14 @@
 [Copy JID]
 [Copy node name]
 [Copy node information]
-[Identities]
-[category]
-[Category]
-[Supported features]
-[Info request error]
-[Items request error]
-[Set filter...]
 [Failed to retrieve room list from server.]
 [No rooms available on server.]
 [Room list request timed out.]
-[<no nick>]
 [Loading...]
 [Please wait for room list to download.]
 [Please specify group chat directory first.]
 [Bookmarks...]
 [Change nickname in <%s>]
-[has set the subject to:]
 [Group chat invitation to\n%s]
 [transport]
 [Multi-User Conference]
@@ -303,7 +278,7 @@
 [Discovery]
 [Privacy]
 [Authentication failed for %s.]
-[Jabber Authentication]
+[Authentication]
 [Registration successful]
 [Password is successfully changed. Don't forget to update your password in the Jabber protocol option.]
 [Password cannot be changed.]
@@ -586,9 +561,6 @@
 [Affiliation changes]
 [Role changes]
 [Don't notify history messages]
-[Subscription]
-[Uploading...]
-[XML for MS Excel (UTF-8 encoded)]
 [Public XMPP Network]
 [Secure XMPP Network]
 [Secure XMPP Network (old style)]
@@ -602,7 +574,6 @@
 [Odnoklassniki]
 [S.ms]
 [Some changes will take effect the next time you connect to the Jabber network.]
-[Set New Password for %s@%S]
 [New password does not match.]
 [Current password is incorrect.]
 [Sending request, please wait...]
@@ -616,6 +587,25 @@
 [Default privacy list successfully declined]
 [Error occurred while setting default list]
 [Allow]
+[List has no rules, empty lists will be deleted then changes applied]
+[allow ]
+[deny ]
+[all.]
+[ and ]
+[incoming presences]
+[outgoing presences]
+[queries]
+[Else ]
+[If Jabber ID is ']
+[ (nickname: ]
+[If group is ']
+[If subscription is ']
+[then ]
+[ (act., def.)]
+[ (active)]
+[ (default)]
+[Ready.]
+[Privacy lists are not saved, discard any changes and exit?]
 [Simple mode]
 [Advanced mode]
 [Add JID]
@@ -636,25 +626,6 @@
 [Presence (in)]
 [Presence (out)]
 [Query]
-[List has no rules, empty lists will be deleted then changes applied]
-[allow ]
-[deny ]
-[all.]
-[ and ]
-[incoming presences]
-[outgoing presences]
-[queries]
-[Else ]
-[If Jabber ID is ']
-[ (nickname: ]
-[If group is ']
-[If subscription is ']
-[then ]
-[ (act., def.)]
-[ (active)]
-[ (default)]
-[Ready.]
-[Privacy lists are not saved, discard any changes and exit?]
 [Please save list before activating]
 [First, save the list]
 [Please save list before you make it the default list]
@@ -666,39 +637,10 @@
 [No compatible file transfer mechanism exists]
 [Protocol is offline or no JID]
 [No valid OMEMO session exists]
-[Command completed successfully]
-[Error occurred during processing command]
-[Set status]
-[Set options]
-[Forward unread messages]
-[Leave group chats]
-[Lock workstation]
-[Quit Miranda NG]
-[Change Status]
-[Choose the status and status message]
-[Extended away (Not available)]
-[Priority]
-[Status message]
-[Change global status]
-[Set Options]
-[Set the desired options]
-[Automatically Accept File Transfers]
-[Play sounds]
-[Disable remote controlling (check twice what you are doing)]
-[There is no messages to forward]
-[Forward options]
-[%d message(s) to be forwarded]
-[Mark messages as read]
-[%d message(s) forwarded]
-[Workstation successfully locked]
-[Error %d occurred during workstation lock]
-[Confirmation needed]
-[Please confirm Miranda NG shutdown]
-[There is no group chats to leave]
-[Choose the group chats you want to leave]
-[Error %s %s\r\nPlease select other server]
+[Subscription]
+[Uploading...]
+[XML for MS Excel (UTF-8 encoded)]
 [Error: unknown reply received\r\nPlease select other server]
-[Error %s %s\r\nTry to specify more detailed]
 [Search error]
 [Select/type search service URL above and press <Go>]
 [Please wait...\r\nConnecting search server...]
@@ -709,6 +651,7 @@
 [declined subscription]
 [sent error presence]
 [sent unknown presence type]
+[Outcast]
 [Status:]
 [Real JID:]
 [Enter password for %s]
@@ -716,14 +659,11 @@
 [Error: Cannot connect to the server]
 [Error: Connection lost]
 [Requesting registration instruction...]
-[Authentication failed for %s@%S.]
-[Message redirected from: %s\r\n%s]
+[Registration canceled]
 [Sending registration information...]
 [Resource]
 [Software]
-[Idle since]
-[Client capabilities]
-[Software information]
+[Last activity]
 [Operating system]
 [Operating system version]
 [Software version]
@@ -731,14 +671,10 @@
 [Mood]
 [Activity]
 [Tune]
-[both]
-[from]
 [Last logoff time]
 [Uptime]
 [Logoff message]
-[<no information available>]
 [Last active resource]
-[Please switch online to see more details.]
 [Copy only this value]
 [format]
 [Unknown format]
diff --git a/langpacks/spanish/Untranslated/MSN.txt b/langpacks/spanish/Untranslated/MSN.txt
index 067c41d7ff..3444e6a6c0 100644
--- a/langpacks/spanish/Untranslated/MSN.txt
+++ b/langpacks/spanish/Untranslated/MSN.txt
@@ -45,7 +45,6 @@
 [&Kick user]
 [&Op user]
 [&Deop user]
-[%I64u bytes]
 [MSN Alert]
 [User not online]
 [IID_IOleObject failed.]
diff --git a/langpacks/spanish/Untranslated/MenuEx.txt b/langpacks/spanish/Untranslated/MenuEx.txt
index f7786b97f1..ed2ec85c99 100644
--- a/langpacks/spanish/Untranslated/MenuEx.txt
+++ b/langpacks/spanish/Untranslated/MenuEx.txt
@@ -24,7 +24,5 @@
 [Never visible]
 [Copy to Account]
 [Copy xStatus Message]
-[Please authorize me to add you to my contact list.]
-[Do you want to send authorization request\nto new contact?]
 [Open ignore settings]
 [MenuItemEx]
diff --git a/langpacks/spanish/Untranslated/MinecraftDynmap.txt b/langpacks/spanish/Untranslated/MinecraftDynmap.txt
index d78f9ace80..573eeb8eb0 100644
--- a/langpacks/spanish/Untranslated/MinecraftDynmap.txt
+++ b/langpacks/spanish/Untranslated/MinecraftDynmap.txt
@@ -1,6 +1,5 @@
 [Minecraft Dynmap support for Miranda NG.]
 [Visible name:]
-[Server]
 [Admin]
 [You]
 [Message was not sent. Probably you are sending them too fast or chat is disabled completely.]
diff --git a/langpacks/spanish/Untranslated/MirOTR.txt b/langpacks/spanish/Untranslated/MirOTR.txt
index 3919366ecd..c8f5c3b9eb 100644
--- a/langpacks/spanish/Untranslated/MirOTR.txt
+++ b/langpacks/spanish/Untranslated/MirOTR.txt
@@ -32,6 +32,10 @@
 [&Refresh OTR session]
 [Sto&p OTR session]
 [&Verify Fingerprint]
+[OTR private]
+[OTR unverified]
+[OTR finished]
+[OTR not secure]
 [Start OTR]
 [Stop OTR]
 [OTR status (Click for more options)]
@@ -39,7 +43,6 @@
 [OTR Encryption: UNVERIFIED]
 [OTR Encryption: Private]
 [OTR Encryption: Finished]
-[&Convert HTML (for Pidgin)]
 [OTR encrypted session with '%s' has been terminated]
 [Requesting OTR encrypted session with '%s']
 [Beginning OTR encrypted session with '%s']
@@ -55,10 +58,6 @@
 [OTR Information]
 [OTR encrypted session with '%s' is now using a VERIFIED fingerprint]
 [OTR encrypted session with '%s' is now using a NOT VERIFIED fingerprint]
-[OTR unverified]
-[OTR finished]
-[OTR private]
-[OTR not secure]
 [Generating new private key for protocol '%s'.\nPlease Wait...]
 [Fingerprints]
 [Policy]
@@ -99,6 +98,7 @@
 [You are using SecureIM. MirOTR will only work for contacts with SecureIM disabled]
 [MirOTR menu]
 [OTR Status]
+[&Convert HTML (for Pidgin)]
 [Private Data]
 [\nusing older protocol version %i]
 [Attempting to start a private conversation...]
diff --git a/langpacks/spanish/Untranslated/NotesReminders.txt b/langpacks/spanish/Untranslated/NotesReminders.txt
index 0ee59278fe..b8c19aef9d 100644
--- a/langpacks/spanish/Untranslated/NotesReminders.txt
+++ b/langpacks/spanish/Untranslated/NotesReminders.txt
@@ -20,9 +20,9 @@
 [Reset to defaults]
 [(Using MCI allows different sounds to be played simultaneously, may not be needed or desired when a custom sound plugin is installed.)]
 [Add Reminder]
-[Trigger On Time && Date:]
 [Date]
 [Time]
+[Repeat each day]
 [Reminder Note:]
 [Daily]
 [Weekly]
@@ -44,7 +44,6 @@
 [New &Reminder]
 [&Delete Reminder]
 [D&elete All Reminders]
-[Context Menu Note Popup]
 [&Hide Note]
 [&Always On Top]
 [&New Note]
@@ -62,13 +61,10 @@
 [Always &On Top]
 [Delete &All Notes]
 [&Show / Hide Notes]
-[Notes & Reminders]
 [New Note]
 [Toggle Notes Visibility]
 [Bring All Notes to Front]
 [New Reminder]
-[Are you sure you want to delete all notes?]
-[Are you sure you want to delete all reminders?]
 [Delete All Notes]
 [Show/Hide Notes]
 [On Top Caption Icon]
@@ -84,15 +80,15 @@
 [Sticky Notes]
 [Add New Note]
 [Add New Reminder]
-[Reminder triggered]
-[Reminder triggered (Alternative 1)]
-[Reminder triggered (Alternative 2)]
 [Notes && Reminders]
 [New &Note]
 [Vie&w Notes]
 [&Delete All Notes]
 [&Bring All to Front]
 [Miranda could not load the Notes & Reminders plugin, Msftedit.dll is missing. If you are using WINE, please make sure you have Msftedit.dll installed. Press 'Yes' to continue loading Miranda.]
+[Reminder triggered]
+[Reminder triggered (Alternative 1)]
+[Reminder triggered (Alternative 2)]
 [Black]
 [Maroon]
 [Green]
@@ -114,16 +110,17 @@
 [Visible]
 [Note text]
 [Date/Title]
+[Are you sure you want to delete all notes?]
 [Sticky Note Caption]
 [Sticky Note Background Color]
 [Sticky Note Body]
 [Executable Files\0*.exe\0All Files\0*.*\0\0]
 [Select Executable]
+[The specified time is invalid due to begin of daylight saving (summer time).]
+[The specified time is invalid.]
 [Hour]
 [Day]
 [Week]
-[The specified time is invalid due to begin of daylight saving (summer time).]
-[The specified time is invalid.]
 [The specified time offset is invalid.]
 [&Update Reminder]
 [Never]
@@ -131,4 +128,6 @@
 [Alternative 2]
 [Reminder text]
 [Date of activation]
+[Are you sure you want to delete all reminders?]
 [Are you sure you want to delete this reminder?]
+[Notes & Reminders]
diff --git a/langpacks/spanish/Untranslated/PasteIt.txt b/langpacks/spanish/Untranslated/PasteIt.txt
index aaf5a5736a..bd156e3c6b 100644
--- a/langpacks/spanish/Untranslated/PasteIt.txt
+++ b/langpacks/spanish/Untranslated/PasteIt.txt
@@ -56,9 +56,9 @@
 [File size is larger then 10 MB, cannot be sent]
 [Cannot open file '%s']
 [File '%s' is empty]
-[Error during sending text to web page: %s]
+[Error during sending text to web page: %S]
 [Error during sending text to web page]
-[Error during getting user key from web page: %s]
+[Error during getting user key from web page: %S]
 [Paste expire date]
 [Never]
 [10 minutes]
diff --git a/langpacks/spanish/Untranslated/PopupPlus.txt b/langpacks/spanish/Untranslated/PopupPlus.txt
index a4dec5cf61..5a0a834d91 100644
--- a/langpacks/spanish/Untranslated/PopupPlus.txt
+++ b/langpacks/spanish/Untranslated/PopupPlus.txt
@@ -25,7 +25,7 @@
 [* - built-in skins]
 [Skin options]
 [Download more skins]
-[Popup History]
+[Popup history]
 [Desktop]
 [Popup area]
 [pixel(s)]
@@ -97,10 +97,8 @@
 [Sidebar]
 [Title underline]
 [Avatar border]
-[Popup History is disabled]
-[Popup History message]
-[Popups are enabled]
-[Popups are disabled]
+[Popup history is disabled]
+[Popup history message]
 [With "favorite" overlay]
 [With "fullscreen" overlay]
 [Refresh skin list]
@@ -112,10 +110,10 @@
 [Pinned popup]
 [Add contact permanently]
 [Classes]
-[Toggle Popups]
-[Enable Popups]
-[Disable Popups]
-[Popup Plus]
+[Toggle popups]
+[Enable popups]
+[Disable popups]
+[Popup plus]
 [Error: I could not register the Popup Window class.\r\nThe plugin will not operate.]
 [No effect]
 [Fade in/out]
diff --git a/langpacks/spanish/Untranslated/TabSRMM.txt b/langpacks/spanish/Untranslated/TabSRMM.txt
index 2eaee1d5b5..8f8b98037d 100644
--- a/langpacks/spanish/Untranslated/TabSRMM.txt
+++ b/langpacks/spanish/Untranslated/TabSRMM.txt
@@ -54,7 +54,6 @@
 [Default colors]
 [Others]
 [Use the message log color theme for group chat popups]
-[No compatible popup plugin was found. The event notification\nsystem is not available.]
 [All modes]
 [Choose modes]
 [Message log view mode (does not affect open windows)]
@@ -660,8 +659,6 @@
 [Clock symbol (for the info panel clock)]
 [Feature disabled (used as overlay)]
 [Feature enabled (used as overlay)]
-[Enable typing notification]
-[Disable typing notification]
 [Message windows - IM]
 [Message windows - all]
 [Message windows - group chats]
@@ -790,8 +787,8 @@
 [Add offline contacts to multisend list]
 [Disable &typing notification]
 [Enable &typing notification]
-[...is typing a message.]
 [...has stopped typing.]
+[...is typing a message.]
 [Force default message log]
 [Force History++]
 [Force IEView]
diff --git a/langpacks/spanish/Untranslated/UInfoEx.txt b/langpacks/spanish/Untranslated/UInfoEx.txt
index 1e0e338fc9..0cf28f2754 100644
--- a/langpacks/spanish/Untranslated/UInfoEx.txt
+++ b/langpacks/spanish/Untranslated/UInfoEx.txt
@@ -443,9 +443,8 @@
 [Phone (UInfoEx)]
 [[b]%s (%S)...[/b]\n%d Contacts remaining]
 [Abort Refreshing Contact Details]
-[Do you want to cancel the current refresh procedure?]
 [Miranda must be online for refreshing contact information!]
-[The function caused an exception!]
+[Do you want to cancel the current refresh procedure?]
 [%s has %s today.]
 [an anniversary]
 [He/she has the following anniversaries:]
@@ -490,17 +489,11 @@
 [Select a destination file...]
 [Import User Details from VCard]
 [Can't create xml file!\n%S]
-[Export took %f ms]
 [Contact: %s (%S)]
-[Importing %s caused error %d]
-[Loading contact %s from xml failed with error %d]
-[Importing Owner caused error %d]
 [Parser is unable to load XMLCard "%s"\nError: %d\nDescription: %s]
 [The selected file is no valid XMLCard]
 [The version of the XMLCard is not supported by UserInfoEx]
 [Owner contact successfully imported.]
 [Selected XMLCard does not contain an owner contact!]
-[Import took %f ms]
 [added contacts: %u / %u\nadded settings: %u / %u\nadded events %u / %u\nduplicated events: %u]
-[FATAL: An exception was thrown while importing contacts from xmlCard!]
 [Flags (UInfoEx)]
diff --git a/langpacks/spanish/Untranslated/WhoUsesMyFiles.txt b/langpacks/spanish/Untranslated/WhoUsesMyFiles.txt
index d4967fec44..c1d5585c1a 100644
--- a/langpacks/spanish/Untranslated/WhoUsesMyFiles.txt
+++ b/langpacks/spanish/Untranslated/WhoUsesMyFiles.txt
@@ -19,7 +19,6 @@
 [Alert computer name with username]
 [Disabled options will be available in the next version]
 [Show current connections]
-[Popup plugin not found!]
 [Common Dialog Error 0x%lx]
 [Not implemented yet...]
 [Who uses my files]
diff --git a/langpacks/ukrainian/=CORE=.txt b/langpacks/ukrainian/=CORE=.txt
index 5708a8aa44..817b046224 100644
--- a/langpacks/ukrainian/=CORE=.txt
+++ b/langpacks/ukrainian/=CORE=.txt
@@ -570,6 +570,55 @@
 Вставити й надіслати
 [Delete]
 Видалити
+;file \src\core\stdpopup\res\resource.rc
+[Popup history]
+Історія спливаючих вікон
+[Case sensitive]
+Враховувати регістр
+[Default timeout]
+Тривалість за замовчанням
+[Never timeout]
+Постійно
+[Set timeout:]
+Тривалість:
+[Width:]
+Ширина:
+[Maximum height:]
+Макс. висота:
+[Opacity (%):]
+Непрозорість (%):
+[Border]
+Рамка
+[Round corners (window)]
+Заокруглені кути вікна
+[Preview]
+Тест
+[Transparent background]
+Прозорий фон
+[Layout]
+Розміщення
+[Avatar size:]
+Аватар:
+[Disable when]
+Вимкнути, коли
+[Global hover]
+Загальне наведення
+[Sidebar width:]
+Ширина врізки:
+[Text indent:]
+Відступ тексту:
+[Padding:]
+Проміжок:
+[Round corners (avatar)]
+Заокруглені кути аватару
+[Text color:]
+Колір тексту:
+[Background color:]
+Колір фону:
+[Set timeout]
+Встановити таймаут
+[Timeout value (0 = default):]
+Таймаут (0 = за замовчанням):
 ;file \src\core\stduihist\res\resource.rc
 [Find]
 Пошук
@@ -1749,6 +1798,88 @@ UIN, E-mail тощо
 ;file \src\core\stdmsg\src\msgtimedout.cpp
 [An unknown error has occurred.]
 Невідома помилка.
+;file \src\core\stdpopup\src\icons.cpp
+[Popups are enabled]
+Спливаючі вікна ввімкнені
+[Popups are disabled]
+Спливаючі вікна вимкнені
+;file \src\core\stdpopup\src\notify_imp.cpp
+;file \src\core\stdpopup\src\options.cpp
+[Example]
+Приклад
+[The quick brown fox jumped over the lazy dog.]
+З'їж-но ще цих м'яких французьких булок та випий йаду!
+[Example With a Long Title]
+Приклад з довгим заголовком
+[Thequickbrownfoxjumpedoverthelazydog.]
+З'їжнощецихм'якихфранцузькихбулоктавипиййаду!
+[An avatar.]
+З аватаром
+[Bottom right]
+Внизу праворуч
+[Bottom left]
+Внизу ліворуч
+[Top right]
+Вгорі праворуч
+[Top left]
+Вгорі ліворуч
+[Icon on left]
+Значок ліворуч
+[Icon on right]
+Значок праворуч
+[No time]
+Без часу
+[Time on left]
+Час ліворуч
+[Time on right]
+Час праворуч
+[Time above avatar]
+Час над аватаром
+[No avatar]
+Без аватару
+[Left avatar]
+Аватар ліворуч
+[Right avatar]
+Аватар праворуч
+[Full-screen app running]
+Повноекранна програма
+[No animate]
+Без анімації
+[Horizontal animate]
+Горизонтальна анімація
+[Vertical animate]
+Вертикальна анімація
+[You cannot set a default timeout of 0.\nValue has been reset.]
+Ви не можете встановити час очікування за замовчанням на 0.\nЗначення скинуто.
+[Settings]
+Налаштування
+[Classes]
+Класи
+;file \src\core\stdpopup\src\services.cpp
+[Disable popups]
+Вимкнути спливаючі вікна
+[Enable popups]
+Увімкнути спливаючі вікна
+;file \src\core\stdpopup\src\yapp.cpp
+[Toggle popups]
+Увімк./вимк. сплив. вікна
+[First line]
+Перший рядок
+[Second line]
+Другий рядок
+[Time]
+Час
+[Sidebar]
+Врізка
+[Title underline]
+Підкреслення заголовка
+;file \src\core\stdpopup\src\yapp_history_dlg.cpp
+[Copy title to clipboard]
+Копіювати заголовок в буфер обміну
+[Copy message to clipboard]
+Копіювати повідомлення в буфер обміну
+[Copy timestamp to clipboard]
+Копіювати час в буфер обміну
 ;file \src\core\stdssl\src\netlibssl.cpp
 [Client cannot decode host message. Possible causes: host does not support SSL or requires not existing security package]
 Клієнт не може декодувати повідомлення хоста. Можлива причина: хост не підтримує SSL або потрібна бібліотека відсутня.
@@ -2631,8 +2762,6 @@ ID облікового запису
 Unicode-плагін
 [ANSI plugin]
 ANSI-плагін
-[Unused]
-
 [Show/Hide]
 Показати/сховати
 [Exit]
@@ -2647,6 +2776,8 @@ ANSI-плагін
 Увімк.
 [Off]
 Вимк.
+[Unused]
+
 [Frames]
 Фрейми
 [Add group]
diff --git a/langpacks/ukrainian/Plugins/Actman.txt b/langpacks/ukrainian/Plugins/Actman.txt
index dbd62dc2c2..913f3dbcf3 100644
--- a/langpacks/ukrainian/Plugins/Actman.txt
+++ b/langpacks/ukrainian/Plugins/Actman.txt
@@ -677,19 +677,19 @@ wParam містить ім'я станції в Unicode
 без підтвердження
 [Empty updater download folder]
 
-[Popup Plus (popup.dll) latest YAPP (yapp.dll)]
+[Popup plus (PopupPlus.dll) latest StdPopup (StdPopup.dll)]
 
-[Enables or disables Popup windows]
+[Enables or disables popup windows]
 Вмикає або вимикає спливаючі вікна
 [Notify]
 Сповіщення
-[YAPP or Popup]
-YAPP або Popup
+[StdPopup or Popup plus]
+StdPopup або Popup plus
 [Popup window]
 Спливаюче вікно
 [Unicode Text]
 Текст Unicode
-[Enables or disables Popup windows (maybe deprecated)]
+[Enables or disables popup windows (maybe deprecated)]
 Вмикає або вимикає спливаючі вікна (можливо, не підтримується)
 [result of protocol service call]
 
diff --git a/langpacks/ukrainian/Plugins/ChangeKeyboardLayout.txt b/langpacks/ukrainian/Plugins/ChangeKeyboardLayout.txt
index 3849998cb0..cdf380fc4b 100644
--- a/langpacks/ukrainian/Plugins/ChangeKeyboardLayout.txt
+++ b/langpacks/ukrainian/Plugins/ChangeKeyboardLayout.txt
@@ -82,8 +82,6 @@
 [Popups]
 Спливаючі вікна
 ;file \plugins\ChangeKeyboardLayout\src\main.cpp
-[Popup]
-Спливаюче вікно
 ;file \plugins\ChangeKeyboardLayout\src\stdafx.h
 [ChangeKeyboardLayout]
 Зміна розкладки
diff --git a/langpacks/ukrainian/Plugins/Clist_modern.txt b/langpacks/ukrainian/Plugins/Clist_modern.txt
index 38fce2ade7..b9a5baf5b3 100644
--- a/langpacks/ukrainian/Plugins/Clist_modern.txt
+++ b/langpacks/ukrainian/Plugins/Clist_modern.txt
@@ -747,6 +747,8 @@ xСтатус: xПовідомлення
 Ім'я облікового запису
 [Rate]
 Рейтинг
+[Last online]
+
 [-Nothing-]
 -Нічого-
 [Hide to tray]
@@ -808,8 +810,6 @@ xСтатус: xПовідомлення
 Імена груп праворуч
 [Row]
 Рядок
-[Row design]
-
 ;file \plugins\Clist_modern\src\modern_clistsettings.cpp
 [(Unknown contact)]
 (Невідомий контакт)
@@ -835,21 +835,6 @@ xСтатус: xПовідомлення
 Відновити останній статус
 [Show/Hide offline users]
 Показати/сховати відключених
-;file \plugins\Clist_modern\src\modern_rowtemplateopt.cpp
-[Empty %s cell]
-
-[column]
-
-[line]
-
-[columns]
-
-[lines]
-
-[%s, contain %s]
-%s, містить %s
-[ layered]
-
 ;file \plugins\Clist_modern\src\modern_skinopt.cpp
 [( unknown )]
 (невідомо)
diff --git a/langpacks/ukrainian/Plugins/CloudFile.txt b/langpacks/ukrainian/Plugins/CloudFile.txt
index fabf51a6a8..77faf3e842 100644
--- a/langpacks/ukrainian/Plugins/CloudFile.txt
+++ b/langpacks/ukrainian/Plugins/CloudFile.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Allows you to transfer files via cloud services.]
 
-;file \plugins\CloudFile\res\resource.rc
+;file \protocols\CloudFile\res\resource.rc
 [Default service]
 
 [General]
@@ -42,7 +42,7 @@
 
 [Revoke access]
 
-;file \plugins\CloudFile\src\icons.cpp
+;file \protocols\CloudFile\src\icons.cpp
 [Upload file(s)]
 Відправити файл(и)
 [Dropbox]
@@ -53,22 +53,22 @@
 
 [Yandex.Disk]
 
-;file \plugins\CloudFile\src\menus.cpp
+;file \protocols\CloudFile\src\menus.cpp
 [Upload to...]
 
 [Upload]
 Відправити
-;file \plugins\CloudFile\src\options.cpp
+;file \protocols\CloudFile\src\options.cpp
 [None]
 Нічого
 [Services]
 Служби
-;file \plugins\CloudFile\src\srmm.cpp
+;file \protocols\CloudFile\src\srmm.cpp
 [Upload files to...]
 
-;file \plugins\CloudFile\src\Services\dropbox_service.cpp
+;file \protocols\CloudFile\src\Services\dropbox_service.cpp
 [Server does not respond]
 
-;file \plugins\CloudFile\src\Services\google_service.cpp
-;file \plugins\CloudFile\src\Services\microsoft_service.cpp
-;file \plugins\CloudFile\src\Services\yandex_service.cpp
+;file \protocols\CloudFile\src\Services\google_service.cpp
+;file \protocols\CloudFile\src\Services\microsoft_service.cpp
+;file \protocols\CloudFile\src\Services\yandex_service.cpp
diff --git a/langpacks/ukrainian/Plugins/CmdLine.txt b/langpacks/ukrainian/Plugins/CmdLine.txt
index 0ac5903a0a..b085b9e0d9 100644
--- a/langpacks/ukrainian/Plugins/CmdLine.txt
+++ b/langpacks/ukrainian/Plugins/CmdLine.txt
@@ -195,8 +195,3 @@
 Неможливо створити сервер CommandLine!
 [You can only run one instance of CmdLine plugin.]
 Ви можете запускати тільки одну копію плагіна CmdLine.
-;file \plugins\CmdLine\src\utils.cpp
-[Notify]
-Сповіщення
-[Warning]
-Попередження
diff --git a/langpacks/ukrainian/Plugins/ConnectionNotify.txt b/langpacks/ukrainian/Plugins/ConnectionNotify.txt
index b947488551..60688702f4 100644
--- a/langpacks/ukrainian/Plugins/ConnectionNotify.txt
+++ b/langpacks/ukrainian/Plugins/ConnectionNotify.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Notify with popup if some connection established]
 Сповіщає в спливаючих вікнах про встановлене з'єднання
-;file \plugins\ConnectionNotify\res\ConnectionNotify.rc
+;file \protocols\ConnectionNotify\res\ConnectionNotify.rc
 [Set popup colors]
 Кольори
 [Popup options]
@@ -56,7 +56,7 @@
 Дозволені символи підстановки ? і * (у полі "Порт" - цифри або *)
 [Remote IP:Port]
 Віддалений IP:Порт
-;file \plugins\ConnectionNotify\src\ConnectionNotify.cpp
+;file \protocols\ConnectionNotify\src\ConnectionNotify.cpp
 [Show]
 Показати
 [Hide]
@@ -79,6 +79,6 @@
 Плагіни
 [New Connection Notification]
 Сповіщення про нове підключення
-;file \plugins\ConnectionNotify\src\filter.cpp
+;file \protocols\ConnectionNotify\src\filter.cpp
 [First close options window]
 Спочатку закрийте вікно налаштувань
diff --git a/langpacks/ukrainian/Plugins/CrashDumper.txt b/langpacks/ukrainian/Plugins/CrashDumper.txt
index a77de1f3d9..16ff4946eb 100644
--- a/langpacks/ukrainian/Plugins/CrashDumper.txt
+++ b/langpacks/ukrainian/Plugins/CrashDumper.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: CrashDumper.dll
 ;  Plugin: Crash dumper
-;  Version: 0.1.0.2
+;  Version: 0.1.0.3
 ;  Authors: borkra
 ;============================================================
 [Crash Dumper and Version Information for Miranda NG.]
diff --git a/langpacks/ukrainian/Plugins/CurrencyRates.txt b/langpacks/ukrainian/Plugins/CurrencyRates.txt
index 2cee962564..13cb8bb2ac 100644
--- a/langpacks/ukrainian/Plugins/CurrencyRates.txt
+++ b/langpacks/ukrainian/Plugins/CurrencyRates.txt
@@ -2,12 +2,12 @@
 ;============================================================
 ;  File: CurrencyRates.dll
 ;  Plugin: Currency Rates
-;  Version: 0.1.0.101
+;  Version: 0.2.0.3
 ;  Authors: Dioksin
 ;============================================================
 [Shows currency rates.]
 Дозволяє спостерігати за змінами курсів валют.
-;file \plugins\CurrencyRates\res\Forex.rc
+;file \protocols\CurrencyRates\res\Forex.rc
 [Variable List]
 Змінні
 [Edit Settings]
@@ -104,14 +104,16 @@
 &Повідомлення статусу:
 [&Tendency:]
 &Тенденція:
+[&Personal key:]
+
 [&Advanced Settings...]
 &Додаткові параметри...
 [Rate Info]
 Інформація про курс валют
-;file \plugins\CurrencyRates\src\Chart.h
+;file \protocols\CurrencyRates\src\Chart.h
 [There is nothing to show]
 Немає даних для показу
-;file \plugins\CurrencyRates\src\CommonOptionDlg.cpp
+;file \protocols\CurrencyRates\src\CommonOptionDlg.cpp
 [Seconds]
 секунд
 [Minutes]
@@ -124,24 +126,15 @@
 Введіть ціле число від 1 до 24.
 [Enter text to display in contact list.]
 
-;file \plugins\CurrencyRates\src\CurrencyConverter.cpp
+;file \protocols\CurrencyRates\src\CurrencyConverter.cpp
 [Info provided by]
 Інформація надана
 [Enter positive number.]
 Додатнє число.
-;file \plugins\CurrencyRates\src\CurrencyRateInfoDlg.cpp
+;file \protocols\CurrencyRates\src\CurrencyRateInfoDlg.cpp
 [Currency Rate]
 Курс валюти
-;file \plugins\CurrencyRates\src\CurrencyRatesProviderCurrencyConverter.cpp
-[Error occurred during HTML parsing.]
-Помилка під час аналізу html.
-[Error occurred during site access.]
-Помилка при доступі до сайту.
-;file \plugins\CurrencyRates\src\CurrencyRatesProviderVisitorFormatSpecificator.cpp
-[Currency Symbol]
-Символ валюти
-[Currency Name]
-Назва валюти
+;file \protocols\CurrencyRates\src\CurrencyRatesProviderBase.cpp
 [Source of Information]
 Джерело інформації
 [Rate Value]
@@ -160,20 +153,11 @@
 Табуляція
 [Left slash (\\)]
 Символ \\
-[Open Price]
-Ціна на відкриття
-[Percent Change to After Hours]
-Відсоток змін за останній час
-[Percent Change to Yesterday Close]
-Відсоток змін з учорашнього закриття
-[Day's High]
-Максимальне значення за день
-[Day's Low]
-Мінімальне значення за день
-[Previous Close]
-Значення на попереднє закриття
-[Change]
-Зміна
+;file \protocols\CurrencyRates\src\CurrencyRatesProviderCurrencyConverter.cpp
+[Error occurred during HTML parsing.]
+Помилка під час аналізу html.
+[Error occurred during site access.]
+Помилка при доступі до сайту.
 [From Currency Full Name]
 Повна назва вихідної валюти
 [From Currency Short Name]
@@ -184,7 +168,7 @@
 Коротка назва цільової валюти
 [Short notation for "%f/%i"]
 Коротке позначення "%f/%i"
-;file \plugins\CurrencyRates\src\Forex.cpp
+;file \protocols\CurrencyRates\src\Forex.cpp
 [Auto Update Enabled]
 Автооновлення увімкнено
 [Auto Update Disabled]
@@ -215,12 +199,16 @@
 Автооновлення курсів валют увімкнено
 [Currency Rates Auto Update Disabled]
 Автооновлення курсів валют вимкнено
+[Currency Symbol]
+Символ валюти
 [Network]
 Мережа
-;file \plugins\CurrencyRates\src\HTTPSession.cpp
+;file \protocols\CurrencyRates\src\HTTPSession.cpp
+[This plugin requires a personal key. Press Yes to obtain it at the site and then enter the result in the Options dialog, otherwise this plugin will fail.]
+
 [CurrencyRates HTTP connections]
 HTTP-з'єднання CurrencyRates
-;file \plugins\CurrencyRates\src\IconLib.cpp
+;file \protocols\CurrencyRates\src\IconLib.cpp
 [Protocol icon]
 Значок протоколу
 [Currency Rate up]
@@ -237,17 +225,15 @@ HTTP-з'єднання CurrencyRates
 Поміняти місцями
 [Import]
 Імпорт
-;file \plugins\CurrencyRates\src\ImportExport.cpp
+;file \protocols\CurrencyRates\src\ImportExport.cpp
 [XML File (*.xml)]
 Файл XML (*.xml)
 [All files (*.*)]
 Усі файли (*.*)
-;file \plugins\CurrencyRates\src\ModuleInfo.cpp
-[Miranda could not load CurrencyRates plugin. XML parser is missing.]
-Не вдалося завантажити плагін CurrencyRates. Відсутній парсер XML.
+;file \protocols\CurrencyRates\src\ModuleInfo.cpp
 [Miranda could not load CurrencyRates plugin. Microsoft HTML parser is missing.]
 Не вдалося завантажити плагін CurrencyRates. Відсутній парсер Microsoft HTML.
-;file \plugins\CurrencyRates\src\SettingsDlg.cpp
+;file \protocols\CurrencyRates\src\SettingsDlg.cpp
 [Log Files (*.txt,*.log)]
 Журнали (*.txt,*.log)
 [Enter integer value]
diff --git a/langpacks/ukrainian/Plugins/Db_autobackups.txt b/langpacks/ukrainian/Plugins/Db_autobackups.txt
index f970240a26..cf97b63e2a 100644
--- a/langpacks/ukrainian/Plugins/Db_autobackups.txt
+++ b/langpacks/ukrainian/Plugins/Db_autobackups.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Db_autobackups.dll
 ;  Plugin: Db autobackuper
-;  Version: 0.1.0.2
+;  Version: 0.1.0.3
 ;  Authors: chaos.persei, sje, Kildor, Billy_Bons
 ;============================================================
 [Database autobackuper plugin.]
@@ -34,8 +34,6 @@
 Резервувати папку профілю
 [Disable progress bar]
 Вимкнути індикацію
-[Disable popups]
-Вимкнути сплив. вікна
 [Use CloudFile]
 Використовувати CloudFile
 [Backup NOW]
@@ -58,6 +56,10 @@
 [Database back up in process...]
 Резервування бази...
 ;file \plugins\Db_autobackups\src\main.cpp
+[Enable &AutoBackups notification]
+
+[Disable &AutoBackups notification]
+
 [Miranda NG databases]
 Бази даних Miranda NG
 [Compressed Miranda NG databases]
@@ -70,6 +72,8 @@
 Резервувати профіль
 [Save profile as...]
 Зберегти профіль як...
+[Popups]
+Спливаючі вікна
 [Database backups]
 Резервування бази даних
 [Backup folder]
diff --git a/langpacks/ukrainian/Plugins/Discord.txt b/langpacks/ukrainian/Plugins/Discord.txt
index 0af5ee170f..b7c5c5a537 100644
--- a/langpacks/ukrainian/Plugins/Discord.txt
+++ b/langpacks/ukrainian/Plugins/Discord.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Discord.dll
 ;  Plugin: Discord protocol
-;  Version: 0.6.1.1
+;  Version: 0.6.2.1
 ;  Authors: George Hazan
 ;============================================================
 [Discord support for Miranda NG.]
@@ -18,9 +18,11 @@
 Контакти
 [Default group:]
 Група:
+[Enable group chats]
+
 [Do not open chat windows on creation]
 Не відкривати вікно чату при створенні
-[Use subgroups for guild's channels (requires restart)]
+[Use subgroups for server channels (requires restart)]
 
 [Nick:]
 Нік:
@@ -58,6 +60,10 @@
 
 [Do you really want to leave the guild?]
 
+[Disable sync]
+
+[Enable sync]
+
 [Join guild]
 
 [Copy my Discord ID]
@@ -68,6 +74,10 @@
 
 [Copy Discord ID]
 
+[Enable guild sync]
+
+[Load server history]
+
 ;file \protocols\Discord\src\options.cpp
 [Network]
 Мережа
diff --git a/langpacks/ukrainian/Plugins/FTPFile.txt b/langpacks/ukrainian/Plugins/FTPFile.txt
index 461672ec2d..d8b925f54f 100644
--- a/langpacks/ukrainian/Plugins/FTPFile.txt
+++ b/langpacks/ukrainian/Plugins/FTPFile.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: FTPFile.dll
 ;  Plugin: FTP File YM
-;  Version: 0.6.0.4
+;  Version: 0.6.0.5
 ;  Authors: yaho
 ;============================================================
 [FTP a file to a server and send the URL to your friend. Supported automatic zipping before upload and encryption via SFTP and FTPS.]
diff --git a/langpacks/ukrainian/Plugins/Facebook.txt b/langpacks/ukrainian/Plugins/Facebook.txt
index 4bad877850..884411d635 100644
--- a/langpacks/ukrainian/Plugins/Facebook.txt
+++ b/langpacks/ukrainian/Plugins/Facebook.txt
@@ -142,14 +142,14 @@
 
 [This will permanently delete the conversation history]
 
-[Former]
-
 [Myself]
 Я
 [Friend]
 Друг
 [User]
 Користувач
+[Former]
+
 [Notifications]
 Сповіщення
 [%s and more (%d)]
diff --git a/langpacks/ukrainian/Plugins/GG.txt b/langpacks/ukrainian/Plugins/GG.txt
index d7acfe55d2..0bfd0ccf59 100644
--- a/langpacks/ukrainian/Plugins/GG.txt
+++ b/langpacks/ukrainian/Plugins/GG.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: GG.dll
 ;  Plugin: Gadu-Gadu protocol
-;  Version: 0.11.0.4
+;  Version: 0.95.11.1
 ;  Authors: Bartosz Bialek, Adam Strzelecki
 ;============================================================
 [Gadu-Gadu protocol support for Miranda NG.]
diff --git a/langpacks/ukrainian/Plugins/GmailNotifier.txt b/langpacks/ukrainian/Plugins/GmailNotifier.txt
index eda619db3e..60b617adf2 100644
--- a/langpacks/ukrainian/Plugins/GmailNotifier.txt
+++ b/langpacks/ukrainian/Plugins/GmailNotifier.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Check your Gmail inboxes locally.]
 Перевірка вхідної пошти Gmail.
-;file \plugins\GmailNotifier\res\options.rc
+;file \protocols\GmailNotifier\res\options.rc
 [Gmail account]
 Обліковий запис Gmail
 [Name:]
@@ -54,7 +54,7 @@
 Вимкнути автоперевірку пошти
 [Log unread threads into database (enable history)]
 Записувати непрочитане в базу (вмикає збереження історії)
-;file \plugins\GmailNotifier\src\check.cpp
+;file \protocols\GmailNotifier\src\check.cpp
 [Checking...]
 Перевірка...
 [Can't send account data!]
@@ -63,7 +63,7 @@
 Неправильне ім'я користувача або пароль!
 [Can't get RSS feed!]
 Не можу прочитати стрічку RSS!
-;file \plugins\GmailNotifier\src\main.cpp
+;file \protocols\GmailNotifier\src\main.cpp
 [Other]
 Інше
 [Gmail: New thread(s)]
@@ -74,7 +74,7 @@ Gmail: нова пошта
 Перевірити всі скриньки Gmail
 [&Check Gmail inbox]
 Перевірити скриньку Gmail
-;file \plugins\GmailNotifier\src\options.cpp
+;file \protocols\GmailNotifier\src\options.cpp
 [GmailNotifier]
 Сповіщення про пошту Gmail
 [Network]
diff --git a/langpacks/ukrainian/Plugins/ICQ.txt b/langpacks/ukrainian/Plugins/ICQ.txt
index 9c136d5f17..099e320560 100644
--- a/langpacks/ukrainian/Plugins/ICQ.txt
+++ b/langpacks/ukrainian/Plugins/ICQ.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: ICQ.dll
 ;  Plugin: ICQ-WIM protocol
-;  Version: 0.95.11.1
+;  Version: 0.95.11.4
 ;  Authors: George Hazan
 ;============================================================
 [ICQ protocol support for Miranda NG.]
@@ -16,8 +16,12 @@ UIN/пошта:
 
 [Do not open chat windows on creation]
 Не відкривати вікно чату при створенні
-[Advanced]
-Розширений
+[Use tray icon notifications]
+
+[E-mail]
+Пошта
+[Launch mailbox in a browser on click]
+
 [If a contact goes Offline, set this status instead and cache it for given timeout in seconds (0 - disabled)]
 
 [After that, set this status to a contact and move it offline after specified timeout in seconds (0 - disabled)]
@@ -59,6 +63,8 @@ UIN/пошта:
 [Do you really want to remove it from ignore list?]
 
 ;file \protocols\ICQ-WIM\src\main.cpp
+[E-mail notification]
+
 [Ignore]
 Ігнорувати
 [Remove Ignore]
@@ -66,6 +72,15 @@ UIN/пошта:
 ;file \protocols\ICQ-WIM\src\options.cpp
 [Network]
 Мережа
+[General]
+Загальне
+[Advanced]
+Розширений
+;file \protocols\ICQ-WIM\src\poll.cpp
+[You received e-mail from %s: %s]
+
+[You have %d unread emails]
+
 ;file \protocols\ICQ-WIM\src\proto.cpp
 [%s server connection]
 З'єднання з сервером %s
diff --git a/langpacks/ukrainian/Plugins/Import.txt b/langpacks/ukrainian/Plugins/Import.txt
index 6217a4185d..1023f417dc 100644
--- a/langpacks/ukrainian/Plugins/Import.txt
+++ b/langpacks/ukrainian/Plugins/Import.txt
@@ -111,8 +111,6 @@
 Пропуск контакту, %S не встановлено.
 [Skipping non-IM contact (%S)]
 Пропуск не-IM контакту (%S)
-[Skipping %S contact, ID not found]
-Пропуск контакту %S, ID не знайдений
 [Skipping duplicate %S contact %s]
 Пропуск дубліката %S контакт %s
 [Failed to add %S contact %s]
diff --git a/langpacks/ukrainian/Plugins/Jabber.txt b/langpacks/ukrainian/Plugins/Jabber.txt
index e96266b520..217df4faf0 100644
--- a/langpacks/ukrainian/Plugins/Jabber.txt
+++ b/langpacks/ukrainian/Plugins/Jabber.txt
@@ -326,6 +326,8 @@ JID / URL:
 
 [Node:]
 Вузол:
+[Filter:]
+
 [Member Information]
 Права доступу
 [Role:]
@@ -392,24 +394,10 @@ XML-консоль
 [Jabber Mood]
 Настрій Jabber
 ;file \protocols\JabberG\src\jabber_adhoc.cpp
-[Error %s %s]
-Помилка %s %s
-[Select Command]
-Виберіть команду
-[Not supported]
-Не підтримується
 [Done]
 Готово
-[In progress. Please Wait...]
-Обробка. Зачекайте...
 [Execute]
 Виконати
-[Requesting command list. Please wait...]
-Запит списку команд. Зачекайте...
-[Jabber Ad-Hoc commands at %s]
-Команди Ad-Hoc на %s
-[Sending Ad-Hoc command to %s]
-Надіслати команду Ad-Hoc %s
 ;file \protocols\JabberG\src\jabber_agent.cpp
 [Jabber Agent Registration]
 Реєстрація агента Jabber
@@ -544,32 +532,16 @@ xHTML-формат повідомлень чату
 Учасник
 [Moderator]
 Модератор
-[Visitors]
-Відвідувачі
-[Participants]
-Учасники
-[Moderators]
-Модератори
 [Owners]
 Власники
-[User %s is now banned.]
-Користувач %s забанений.
-[User %s changed status to %s with message: %s]
-%s змінив статус на %s: %s
-[User %s changed status to %s]
-%s змінив статус на %s.
-[Room configuration was changed.]
-Налаштування кімнати змінилися.
-[Outcast]
-Вигнані
-[Affiliation of %s was changed to '%s'.]
-Належність %s змінилася на %s.
+[Moderators]
+Модератори
+[Participants]
+Учасники
+[Visitors]
+Відвідувачі
 [Role of %s was changed to '%s'.]
 Роль %s змінилася на '%s'.
-[because room is now members-only]
-тому що кімната тільки для постійних учасників
-[user banned]
-забанений
 [Change &nickname]
 Змінити &нік
 [&Invite a user]
@@ -668,10 +640,6 @@ xHTML-формат повідомлень чату
 Запросити користувачів у\n%s
 [%s (not on roster)]
 %s (не в ростері)
-[%s from\n%s]
-%s з\n%s
-[Real JID not available]
-Реальний JID недоступний
 [Reason to kick %s]
 Причина стусана %s
 [Reason to ban %s]
@@ -742,26 +710,6 @@ xHTML-формат повідомлень чату
 Копіювати ім'я
 [Copy node information]
 Копіювати інформацію
-;file \protocols\JabberG\src\jabber_disco.h
-[Identities]
-Ідентифікатори
-[category]
-категорія
-[type]
-тип
-[Category]
-Категорія
-[Type]
-Тип
-[Supported features]
-Підтримувані функції
-[Info request error]
-Помилка запиту інформації
-[Items request error]
-Помилка запиту значень
-;file \protocols\JabberG\src\jabber_filterlist.cpp
-[Set filter...]
-Фільтр...
 ;file \protocols\JabberG\src\jabber_groupchat.cpp
 [Failed to retrieve room list from server.]
 Помилка запиту списку кімнат на сервері.
@@ -769,8 +717,6 @@ xHTML-формат повідомлень чату
 На сервері немає доступних кімнат.
 [Room list request timed out.]
 Таймаут запиту списку кімнат.
-[<no nick>]
-<без ніку>
 [Loading...]
 Завантаження...
 [Please wait for room list to download.]
@@ -781,8 +727,8 @@ xHTML-формат повідомлень чату
 Закладки...
 [Change nickname in <%s>]
 Змінити нік на <%s>
-[has set the subject to:]
-встановив(ла) тему:
+[Error]
+Помилка
 [Group chat invitation to\n%s]
 Запрошення в конференцію\n%s
 ;file \protocols\JabberG\src\jabber_icolib.cpp
@@ -877,8 +823,8 @@ xHTML-формат повідомлень чату
 ;file \protocols\JabberG\src\jabber_iqid.cpp
 [Authentication failed for %s.]
 Аутентифікація не пройшла для %s.
-[Jabber Authentication]
-Аутентифікация Jabber
+[Authentication]
+
 [Registration successful]
 Реєстрація пройшла успішно
 [Password is successfully changed. Don't forget to update your password in the Jabber protocol option.]
@@ -1469,18 +1415,6 @@ xHTML-формат повідомлень чату
 Зміни статусу
 [Don't notify history messages]
 Не показувати сповіщень з історії
-[Group]
-Група
-[Subscription]
-Підписка
-[Uploading...]
-Завантаження...
-[Downloading...]
-Отримання...
-[XML for MS Excel (UTF-8 encoded)]
-XML для MS Excel (кодування UTF-8)
-[Connecting...]
-З'єднання...
 [Network]
 Мережа
 [Account]
@@ -1514,8 +1448,6 @@ Hipchat
 [Some changes will take effect the next time you connect to the Jabber network.]
 Деякі зміни наберуть чинності при наступному вході в мережу Jabber.
 ;file \protocols\JabberG\src\jabber_password.cpp
-[Set New Password for %s@%S]
-Установка нового пароля для %s@%S
 [New password does not match.]
 Новий пароль не збігається
 [Current password is incorrect.]
@@ -1543,6 +1475,46 @@ Hipchat
 Помилка при встановленні списку за замовчанням
 [Allow]
 Дозволити
+[List has no rules, empty lists will be deleted then changes applied]
+У списку немає правил, порожні списки будуть видалені, коли зміни наберуть чинності
+[allow ]
+дозволити\s
+[deny ]
+заборонити\s
+[all.]
+всі.
+[messages]
+повідомлення
+[ and ]
+ і\s
+[incoming presences]
+вхідна присутність
+[outgoing presences]
+вихідна присутність
+[queries]
+запити
+[Else ]
+Інакше\s
+[If Jabber ID is ']
+Якщо JID '
+[ (nickname: ]
+ (нік:\s
+[If group is ']
+Якщо група '
+[If subscription is ']
+Якщо підписка '
+[then ]
+то\s
+[ (act., def.)]
+ (активн., основн.)
+[ (active)]
+ (активний)
+[ (default)]
+ (основний)
+[Ready.]
+Готовий.
+[Privacy lists are not saved, discard any changes and exit?]
+Списки приватності не збережені, скасувати зміни і вийти?
 [Simple mode]
 Простий режим
 [Advanced mode]
@@ -1587,46 +1559,6 @@ Hipchat
 Присутність (вих.)
 [Query]
 Запит
-[List has no rules, empty lists will be deleted then changes applied]
-У списку немає правил, порожні списки будуть видалені, коли зміни наберуть чинності
-[allow ]
-дозволити\s
-[deny ]
-заборонити\s
-[all.]
-всі.
-[messages]
-повідомлення
-[ and ]
- і\s
-[incoming presences]
-вхідна присутність
-[outgoing presences]
-вихідна присутність
-[queries]
-запити
-[Else ]
-Інакше\s
-[If Jabber ID is ']
-Якщо JID '
-[ (nickname: ]
- (нік:\s
-[If group is ']
-Якщо група '
-[If subscription is ']
-Якщо підписка '
-[then ]
-то\s
-[ (act., def.)]
- (активн., основн.)
-[ (active)]
- (активний)
-[ (default)]
- (основний)
-[Ready.]
-Готовий.
-[Privacy lists are not saved, discard any changes and exit?]
-Списки приватності не збережені, скасувати зміни і вийти?
 [Please save list before activating]
 Збережіть список перед активацією
 [First, save the list]
@@ -1650,80 +1582,22 @@ Hipchat
 Протокол не в мережі або JID немає
 [No valid OMEMO session exists]
 
-;file \protocols\JabberG\src\jabber_rc.cpp
-[Command completed successfully]
-Команда виконана успішно
-[Error occurred during processing command]
-У процесі виконання команди виникла помилка
-[Set status]
-Встановити статус
-[Set options]
-Встановити налаштування
-[Forward unread messages]
-Пересилати непрочитані повідомлення
-[Leave group chats]
-Вийти з чатів
-[Lock workstation]
-Заблокувати комп'ютер
-[Quit Miranda NG]
-Закрити Miranda NG
-[Change Status]
-Змінити статус
-[Choose the status and status message]
-Встановити статус і статусне повідомлення
-[Status]
-Статус
-[Extended away (Not available)]
-Недоступний
-[Invisible]
-Невидимий
-[Offline]
-Не в мережі
-[Priority]
-Пріоритет
-[Status message]
-Статусне повідомлення
-[Change global status]
-Змінити глобальний статус
-[Set Options]
-Встановити налаштування
-[Set the desired options]
-Виберіть бажані параметри
-[Automatically Accept File Transfers]
-Автоматично схвалювати передачі файлів
-[Play sounds]
-Програвати звуки
-[Disable remote controlling (check twice what you are doing)]
-Вимкнути віддалене керування (перевіряйте двічі, що ви робите)
-[There is no messages to forward]
-Немає повідомлень для відправки
-[Forward options]
-Опції пересилки
-[%d message(s) to be forwarded]
-%d повідомлень для відправки
-[Mark messages as read]
-Позначити повідомлення як прочитані
-[%d message(s) forwarded]
-повідомлень відправлено: %d
-[Workstation successfully locked]
-Комп'ютер успішно заблокований
-[Error %d occurred during workstation lock]
-Помилка %d під час процесу блокування
-[Confirmation needed]
-Необхідне підтвердження
-[Please confirm Miranda NG shutdown]
-Підтвердіть вимкнення програми
-[There is no group chats to leave]
-Немає чатів для відключення
-[Choose the group chats you want to leave]
-Виберіть чати, з яких потрібно вийти
+;file \protocols\JabberG\src\jabber_roster.cpp
+[Group]
+Група
+[Subscription]
+Підписка
+[Uploading...]
+Завантаження...
+[Downloading...]
+Отримання...
+[Connecting...]
+З'єднання...
+[XML for MS Excel (UTF-8 encoded)]
+XML для MS Excel (кодування UTF-8)
 ;file \protocols\JabberG\src\jabber_search.cpp
-[Error %s %s\r\nPlease select other server]
-Помилка %s %s\r\nБудь ласка, виберіть інший сервер
 [Error: unknown reply received\r\nPlease select other server]
 Помилка: отримано невідому відповідь\r\nБудь ласка, виберіть інший сервер
-[Error %s %s\r\nTry to specify more detailed]
-Помилка %s %s\r\nСпробуйте вказати більше деталей
 [Search error]
 Помилка пошуку
 [Select/type search service URL above and press <Go>]
@@ -1745,6 +1619,8 @@ Hipchat
 відправив присутність з помилкою
 [sent unknown presence type]
 відправив невідомий тип присутності
+[Outcast]
+Вигнані
 [Nick:]
 Нік:
 [Status:]
@@ -1762,31 +1638,23 @@ Hipchat
 Помилка: З'єднання втрачено
 [Requesting registration instruction...]
 Запит реєстраційної інструкції...
-[Authentication failed for %s@%S.]
-Аутентифікація не пройшла для %s@%S.
-[Message redirected from: %s\r\n%s]
-Повідомлення переадресовано від %s\r\n%s
+[Registration canceled]
+
 [Sending registration information...]
 Надсилання реєстраційної інформації...
 ;file \protocols\JabberG\src\jabber_userinfo.cpp
-[Resource]
-Ресурс
 [<not specified>]
 <не вказано>
+[Resource]
+Ресурс
 [Software]
 Клієнт
 [Version]
 Версія
 [System]
 Система
-[unknown]
-невідомо
-[Idle since]
-Простоює з
-[Client capabilities]
-Можливості клієнта
-[Software information]
-Інформація про ПЗ
+[Last activity]
+
 [Operating system]
 Операційна система
 [Operating system version]
@@ -1801,26 +1669,14 @@ Hipchat
 Заняття
 [Tune]
 Мелодія
-[both]
-обидві
-[to]
-до
-[from]
-від
-[none]
-немає
 [Last logoff time]
 Час виходу
 [Uptime]
 Час роботи
 [Logoff message]
 Повідомлення виходу
-[<no information available>]
-<немає інформації>
 [Last active resource]
 Останній активний ресурс
-[Please switch online to see more details.]
-Підключіться, щоб отримати докладну інформацію
 [Copy]
 Копіювати
 [Copy only this value]
@@ -1870,10 +1726,10 @@ Hipchat
 Таймаут віддаленого сервера
 [Unknown error]
 Невідома помилка
-[Error]
-Помилка
 [Unknown error message]
 Невідома помилка
+[Offline]
+Не в мережі
 [Advanced Status]
 Додатковий статус
 [Set mood...]
diff --git a/langpacks/ukrainian/Plugins/LotusNotify.txt b/langpacks/ukrainian/Plugins/LotusNotify.txt
index 37c040bab6..9e65c47a09 100644
--- a/langpacks/ukrainian/Plugins/LotusNotify.txt
+++ b/langpacks/ukrainian/Plugins/LotusNotify.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Notify about new mail in Lotus Database]
 Сповіщає про нову пошту в Lotus Database
-;file \plugins\LotusNotify\res\LotusNotify.rc
+;file \protocols\LotusNotify\res\LotusNotify.rc
 [Lotus connection settings]
 Налаштування з'єднання Lotus
 [Primary server:]
@@ -66,7 +66,7 @@
 Кому / Копія Кому
 [Offline status mean:]
 Автономний статус:
-;file \plugins\LotusNotify\src\LotusNotify.cpp
+;file \protocols\LotusNotify\src\LotusNotify.cpp
 [Unable to load all required Lotus API functions]
 Не вдається завантажити всі необхідні функцій Lotus API
 [Lotus Notes Client not detected. Check plugin configuration description at https://miranda-ng.org/p/LotusNotify]
diff --git a/langpacks/ukrainian/Plugins/MSN.txt b/langpacks/ukrainian/Plugins/MSN.txt
index 9bcdbc7c75..7217e63dc5 100644
--- a/langpacks/ukrainian/Plugins/MSN.txt
+++ b/langpacks/ukrainian/Plugins/MSN.txt
@@ -132,8 +132,6 @@
 [&Deop user]
 &Забрати права адміністратора
 ;file \protocols\MSN\src\msn_commands.cpp
-[%I64u bytes]
-%I64u байт
 [MSN Alert]
 Сповіщення MSN
 ;file \protocols\MSN\src\msn_errors.cpp
diff --git a/langpacks/ukrainian/Plugins/MenuEx.txt b/langpacks/ukrainian/Plugins/MenuEx.txt
index 240344d1ca..ec11e8339c 100644
--- a/langpacks/ukrainian/Plugins/MenuEx.txt
+++ b/langpacks/ukrainian/Plugins/MenuEx.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MenuEx.dll
 ;  Plugin: Menu item ext
-;  Version: 1.3.1.0
+;  Version: 1.3.2.0
 ;  Authors: Heiko Schillinger, Baloo, Billy_Bons, Robert Pösel
 ;============================================================
 [Adds some useful options to a contacts menu.]
@@ -20,8 +20,6 @@
 Ігнорувати
 [Copy to Account (Ctrl+click for move to Account)]
 Копіювати в обл. запис (Ctrl+клік - переміщення)
-[Request Authorization]
-Запитати авторизацію
 [Browse Received Files]
 Прийняті файли
 [Copy IP]
@@ -79,14 +77,8 @@
 Авторизація
 [Typing Notify]
 Набирає текст
-[Please authorize me to add you to my contact list.]
-Будь ласка, дозвольте додати вас до списку контактів.
-[Do you want to send authorization request\nto new contact?]
-Надіслати запит авторизації\nновому контакту?
 [Open ignore settings]
 Відкрити налаштування ігнорування
-[Request authorization]
-Запитати авторизацію
 [MenuItemEx]
 Дод. пункти меню
 ;file \plugins\MenuItemEx\src\options.cpp
diff --git a/langpacks/ukrainian/Plugins/MinecraftDynmap.txt b/langpacks/ukrainian/Plugins/MinecraftDynmap.txt
index aa80155f8c..6692a1f1c3 100644
--- a/langpacks/ukrainian/Plugins/MinecraftDynmap.txt
+++ b/langpacks/ukrainian/Plugins/MinecraftDynmap.txt
@@ -13,8 +13,6 @@
 [Visible name:]
 Видиме ім'я:
 ;file \protocols\MinecraftDynmap\src\chat.cpp
-[Server]
-Сервер
 [Admin]
 Адмін
 [Normal]
diff --git a/langpacks/ukrainian/Plugins/MirOTR.txt b/langpacks/ukrainian/Plugins/MirOTR.txt
index 5d0a37cc89..fcbc21178a 100644
--- a/langpacks/ukrainian/Plugins/MirOTR.txt
+++ b/langpacks/ukrainian/Plugins/MirOTR.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MirOTR.dll
 ;  Plugin: Miranda OTR
-;  Version: 0.14.1.17
+;  Version: 0.14.2.1
 ;  Authors: ProgAndy & CHEF-KOCH
 ;============================================================
 [OTR (Off-the-Record) plugin for Miranda NG (using some code and ideas from SecureIM, Pidgin-OTR and old Miranda OTR (by SJE)).]
@@ -80,6 +80,17 @@ OTR: Створення приватного ключа
 Зупинити сесію OTR
 [&Verify Fingerprint]
 &Перевірка відбитків
+;file \plugins\MirOTR\src\icons.cpp
+[OTR private]
+Приватний OTR
+[OTR unverified]
+OTR не перевірений
+[OTR finished]
+OTR завершено
+[OTR not secure]
+OTR не є безпечним
+[Refresh]
+Оновити
 ;file \plugins\MirOTR\src\language.h
 [Start OTR]
 Запустити OTR
@@ -99,8 +110,6 @@ OTR: Створення приватного ключа
 Шифрування OTR: приватне
 [OTR Encryption: Finished]
 Шифрування OTR: завершено
-[&Convert HTML (for Pidgin)]
-&Конвертувати HTML (для Pidgin)
 [OTR encrypted session with '%s' has been terminated]
 Шифрована сесія з '%s' припинена.
 [Requesting OTR encrypted session with '%s']
@@ -131,16 +140,6 @@ OTR не може шифрувати під час відправлення по
 Шифрована сесія з '%s' використовує ПЕРЕВІРЕНИЙ відбиток.
 [OTR encrypted session with '%s' is now using a NOT VERIFIED fingerprint]
 Шифрована сесія з '%s' використовує НЕПЕРЕВІРЕНИЙ відбиток.
-[OTR unverified]
-OTR не перевірений
-[OTR finished]
-OTR завершено
-[OTR private]
-Приватний OTR
-[OTR not secure]
-OTR не є безпечним
-[Refresh]
-Оновити
 [Generating new private key for protocol '%s'.\nPlease Wait...]
 Створення нового приватного ключа для протоколу '%s'.\nЗачекайте...
 [General]
@@ -236,6 +235,8 @@ OTR: встановлений SecureIM
 Меню MirOTR
 [OTR Status]
 Статус OTR
+[&Convert HTML (for Pidgin)]
+&Конвертувати HTML (для Pidgin)
 ;file \plugins\MirOTR\src\options.cpp
 [Private Data]
 Особисті дані
diff --git a/langpacks/ukrainian/Plugins/MirandaG15.txt b/langpacks/ukrainian/Plugins/MirandaG15.txt
index d41935b327..06f8ac41db 100644
--- a/langpacks/ukrainian/Plugins/MirandaG15.txt
+++ b/langpacks/ukrainian/Plugins/MirandaG15.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MirandaG15.dll
 ;  Plugin: MirandaG15
-;  Version: 0.1.2.0
+;  Version: 0.1.2.1
 ;  Authors: Martin Kleinhans
 ;============================================================
 [Provides an interface to use Miranda from the LCD of various Logitech devices.]
diff --git a/langpacks/ukrainian/Plugins/MsgPopup.txt b/langpacks/ukrainian/Plugins/MsgPopup.txt
index 385254599f..02df64bc86 100644
--- a/langpacks/ukrainian/Plugins/MsgPopup.txt
+++ b/langpacks/ukrainian/Plugins/MsgPopup.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MsgPopup.dll
 ;  Plugin: Message popup
-;  Version: 0.1.2.1
+;  Version: 0.1.2.2
 ;  Authors: StDenis
 ;============================================================
 [Plugin replaces message boxes (those having only OK button) with popups.]
diff --git a/langpacks/ukrainian/Plugins/NewsAggregator.txt b/langpacks/ukrainian/Plugins/NewsAggregator.txt
index 775998d44c..2c9097b353 100644
--- a/langpacks/ukrainian/Plugins/NewsAggregator.txt
+++ b/langpacks/ukrainian/Plugins/NewsAggregator.txt
@@ -2,12 +2,12 @@
 ;============================================================
 ;  File: NewsAggregator.dll
 ;  Plugin: News aggregator
-;  Version: 0.1.0.4
+;  Version: 0.1.0.5
 ;  Authors: Mataes, FREAK_THEMIGHTY
 ;============================================================
 [RSS/Atom news aggregator.]
 Канали новин RSS/Atom.
-;file \plugins\NewsAggregator\Res\Resource.rc
+;file \protocols\NewsAggregator\Res\Resource.rc
 [Add]
 Додати
 [Change]
@@ -72,14 +72,14 @@
 Канали для імпорту:
 [&Import]
 &Імпорт
-;file \plugins\NewsAggregator\Src\Authentication.cpp
+;file \protocols\NewsAggregator\Src\Authentication.cpp
 [Enter your username]
 Введіть ім'я користувача
 [Error]
 Помилка
 [Enter your password]
 Введіть пароль
-;file \plugins\NewsAggregator\Src\CheckFeed.cpp
+;file \protocols\NewsAggregator\Src\CheckFeed.cpp
 [%s\nis a valid feed's address.]
 %s\nдійсно існує.
 [News Aggregator]
@@ -88,7 +88,7 @@
 %s\nнеправильна адреса каналу
 [empty]
 Порожній
-;file \plugins\NewsAggregator\Src\Icons.cpp
+;file \protocols\NewsAggregator\Src\Icons.cpp
 [Protocol icon]
 Значок протоколу
 [Check All Feeds]
@@ -103,13 +103,13 @@
 Автооновлення ввімкнено
 [Auto Update Disabled]
 Автооновлення вимкнено
-;file \plugins\NewsAggregator\Src\Menus.cpp
+;file \protocols\NewsAggregator\Src\Menus.cpp
 [Check feed]
 Перевірити канал
 [Change feed]
 Змінити канал
-;file \plugins\NewsAggregator\Src\NewsAggregator.cpp
-;file \plugins\NewsAggregator\Src\Options.cpp
+;file \protocols\NewsAggregator\Src\NewsAggregator.cpp
+;file \protocols\NewsAggregator\Src\Options.cpp
 [OPML files]
 Файли OPML
 [Not valid import file.]
@@ -154,11 +154,11 @@ URL сторінки з коментарями до новини.
 Видалення контакту
 [Network]
 Мережа
-;file \plugins\NewsAggregator\Src\Services.cpp
+;file \protocols\NewsAggregator\Src\Services.cpp
 [Avatars]
 Аватари
 [Enable/disable auto update]
 Увімк./вимк. автооновлення
-;file \plugins\NewsAggregator\Src\Utils.cpp
+;file \protocols\NewsAggregator\Src\Utils.cpp
 [NewsAggregator HTTP connections]
 HTTP-з'єднання NewsAggregator
diff --git a/langpacks/ukrainian/Plugins/NimContact.txt b/langpacks/ukrainian/Plugins/NimContact.txt
index 393e2cb61b..3270aca2af 100644
--- a/langpacks/ukrainian/Plugins/NimContact.txt
+++ b/langpacks/ukrainian/Plugins/NimContact.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Non-IM Contact allows you to add 'contacts' that can act as shortcuts to other programs, or links to web pages.\r\nThe contacts name can be read from a text file (includes any ASCII file).\r\nThis plugin is a combination of Favorites and Text Reader plugins both made by me)]
 Не-IM контакт дозволяє додавати у вигляді "контактів" посилання на інші програми і веб-сторінки. Імена цих контактів можуть братися з текстового файлу (файлів ASCII).
-;file \plugins\Non-IM Contact\res\resource.rc
+;file \protocols\Non-IM Contact\res\resource.rc
 [View/Edit Files]
 Перегляд/Редагування файлів
 [Add File]
@@ -108,7 +108,7 @@
 Один рядок заміни на кожен рядок у форматі "оригінал,новий"
 [EXAMPLE: %fn1,%fn2]
 ПРИКЛАД: %fn1,%fn2
-;file \plugins\Non-IM Contact\src\contactinfo.cpp
+;file \protocols\Non-IM Contact\src\contactinfo.cpp
 [Select Folder]
 Вибрати папку
 [Non-IM Contact protocol timer is Disabled]
@@ -117,7 +117,7 @@
 Інтервал... Інтервал протоколу Non-IM Contact %d секунд
 [New Non-IM Contact]
 Новий не-IM контакт
-;file \plugins\Non-IM Contact\src\dialog.cpp
+;file \protocols\Non-IM Contact\src\dialog.cpp
 [String replacing variables...\r\nThe following are all the valid variables that can be used. Refer to the wiki.miranda-ng.org for a proper explanation.\r\n\r\nfile(X)\t\t<- specifies the file to read from. MUST be followed by either start() or end() or wholeline()\r\nfilename(X)\t<- copies the filename of file X.\r\nstart(...)\t\t<- specifies where to start copying from.\r\nend(...)\t\t<- specifies where to stop copying.\r\nwholeline(line(...))\t<- specifies a whole line to copy\r\n\r\nstart() and end() explained\r\n.........................\r\nMUST start with line() followed by a number or a string inside " marks, OR csv(separatorX) variable. The number specifies which character in the line to start/end copying. The string specifies a string in the line to start/end copying.\r\n\r\ncsv(seperatorX) explained...\r\nSeperator is either "tab" or "space" or any SINGLE character. X is the Xth separator to pass before copying, (or to stop before).\r\n\r\nLastly the line(...) variable...\r\nInside the brackets must be either a number (to specify the line number), or a string inside " marks (to use the line with that string), or lastline(X). The X in lastline is the Xth line above the last line, i.e., lastline(1) will use the 2nd last line of the file. If searching for a line with "some words" you may put a + or - X after the closing ), i.e., line("some words")+3 to go 3 lines after the line with "some words".\r\n\r\nSome examples...\r\nfilename(0)    <- will display the filename of the 0th file\r\nfile(0)wholeline(line(0)))    <- will display the whole first line of the 0th file\r\nfile(0)wholeline(line("hello")-1)))    <- the wholeline above the first occurrence of "hello" in the file\r\nfile(0)start(line(lastline(1))csv(tab2))end(line(lastline())csv(tab4)))    <- starts at the 2nd last line of the file, from the 2nd tab variable, until the 4th tab variable in the last line (in the 0th file)\r\nfile(0)start(line("hello")+1"zzzz")end(line(6)17))    <- starts from the first occurrence of zzzz in the line after the first occurrence of hello, until the 17th character in the 6th line (starting from line 0) of the 0th file.\r\n]
 
 [Contacts Display Info]
@@ -130,7 +130,7 @@
 Файли
 [Edit Non-IM Contact "%s"]
 Редагувати "%s"
-;file \plugins\Non-IM Contact\src\files.cpp
+;file \protocols\Non-IM Contact\src\files.cpp
 [Do you want to overwrite the contents of the file?\r\n\r\nPressing No will append these contacts to the end of the file.]
 Перезаписати вміст файлу?\r\n\r\nНатисніть "Ні", щоб дописати ці дані в кінець файлу.
 [File couldn't be opened]
@@ -139,10 +139,10 @@
 
 [line(%-3d) = | %s]
 
-;file \plugins\Non-IM Contact\src\http.cpp
+;file \protocols\Non-IM Contact\src\http.cpp
 [Non-IM Contacts]
 Не-IM контакти
-;file \plugins\Non-IM Contact\src\main.cpp
+;file \protocols\Non-IM Contact\src\main.cpp
 [Plugins]
 Плагіни
 [Main Icon]
@@ -163,7 +163,7 @@
 &Створити рядок
 [E&dit Contact Settings]
 З&мінити налаштування контакту
-;file \plugins\Non-IM Contact\src\namereplacing.cpp
+;file \protocols\Non-IM Contact\src\namereplacing.cpp
 [%s - ERROR: no line specified or line not found (in %s)]
 %s - Помилка: рядок не вказаний або не існує (в %s)
 [%s - ERROR: file couldn't be opened (in %s)]
diff --git a/langpacks/ukrainian/Plugins/NotesReminders.txt b/langpacks/ukrainian/Plugins/NotesReminders.txt
index 3719e9b082..ef22c37a79 100644
--- a/langpacks/ukrainian/Plugins/NotesReminders.txt
+++ b/langpacks/ukrainian/Plugins/NotesReminders.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: NotesReminders.dll
 ;  Plugin: Sticky Notes & Reminders
-;  Version: 0.1.0.1
+;  Version: 0.2.0.2
 ;  Authors: Joe Kucera, Lubomir Kolev Ivanov, Georg Fischer
 ;============================================================
 [Sticky Notes & Reminders Implementation for Miranda NG.]
@@ -50,12 +50,12 @@
 Дозволяє різним звукам програватися одночасно (можливі небажані наслідки, якщо встановлений плагін користувацьких звуків)
 [Add Reminder]
 Додати нагадування
-[Trigger On Time && Date:]
-Дата &і час запуску:
 [Date]
 Дата
 [Time]
 Час
+[Repeat each day]
+
 [Reminder Note:]
 Нагадування:
 [None]
@@ -102,8 +102,6 @@
 &Видалити нагадування
 [D&elete All Reminders]
 В&идалити всі нагадування
-[Context Menu Note Popup]
-
 [&Hide Note]
 &Сховати нотатку
 [&Always On Top]
@@ -152,9 +150,6 @@
 Видалити &всі нотатки
 [&Show / Hide Notes]
 &Показати/Сховати нотатки
-;file \plugins\NotesAndReminders\src\globals.h
-[Notes & Reminders]
-Нотатки і нагадування
 ;file \plugins\NotesAndReminders\src\hotkeys.cpp
 [New Note]
 Нова нотатка
@@ -165,10 +160,6 @@
 [New Reminder]
 Нове нагадування
 ;file \plugins\NotesAndReminders\src\main.cpp
-[Are you sure you want to delete all notes?]
-Впевнені, що хочете видалити всі нотатки?!
-[Are you sure you want to delete all reminders?]
-Впевнені, що хочете видалити всі нагадування?!
 [Delete All Notes]
 Видалити всі нотатки
 [Show/Hide Notes]
@@ -195,20 +186,10 @@
 Переглянути нотатки
 [Sticky Notes]
 Нотатки
-[Plugins]
-Плагіни
 [Add New Note]
 Додати нотатку...
 [Add New Reminder]
 Додати нагадування...
-[Alerts]
-Сигнал
-[Reminder triggered]
-Спрацьовування нагадування
-[Reminder triggered (Alternative 1)]
-Спрацьовування нагадування (Альтернатива 1)
-[Reminder triggered (Alternative 2)]
-Спрацьовування нагадування (Альтернатива 2)
 [Notes && Reminders]
 Нотатки &і нагадування
 [New &Note]
@@ -221,6 +202,14 @@
 Перемістити на передній план
 [Miranda could not load the Notes & Reminders plugin, Msftedit.dll is missing. If you are using WINE, please make sure you have Msftedit.dll installed. Press 'Yes' to continue loading Miranda.]
 Неможливо завантажити плагін Notes & Reminders, оскільки Msftedit.dll відсутній. Якщо ви використовуєте WINE, будь ласка, переконайтеся, що Msftedit.dll встановлено. Натисніть "Так", щоб продовжити запуск Miranda NG.
+[Alerts]
+Сигнал
+[Reminder triggered]
+Спрацьовування нагадування
+[Reminder triggered (Alternative 1)]
+Спрацьовування нагадування (Альтернатива 1)
+[Reminder triggered (Alternative 2)]
+Спрацьовування нагадування (Альтернатива 2)
 ;file \plugins\NotesAndReminders\src\notes.cpp
 [Black]
 Чорний
@@ -268,6 +257,8 @@
 Нотатка
 [Date/Title]
 Дата/заголовок
+[Are you sure you want to delete all notes?]
+Впевнені, що хочете видалити всі нотатки?!
 ;file \plugins\NotesAndReminders\src\options.cpp
 [Sticky Note Caption]
 Заголовок
@@ -279,11 +270,17 @@
 Виконувані файли\0*.exe\0Усі файли\0*.*\0\0
 [Select Executable]
 Вибрати програму...
+[Plugins]
+Плагіни
 ;file \plugins\NotesAndReminders\src\reminders.cpp
 [Minutes]
 хвилин
 [Hours]
 годин
+[The specified time is invalid due to begin of daylight saving (summer time).]
+Зазначений час недійсний через перехід на літній час.
+[The specified time is invalid.]
+Зазначений час недійсний.
 [Hour]
 годину
 [Day]
@@ -292,10 +289,6 @@
 днів
 [Week]
 тиждень
-[The specified time is invalid due to begin of daylight saving (summer time).]
-Зазначений час недійсний через перехід на літній час.
-[The specified time is invalid.]
-Зазначений час недійсний.
 [The specified time offset is invalid.]
 Вказане зміщення часу неправильне.
 [&Update Reminder]
@@ -316,5 +309,10 @@
 Нагадування
 [Date of activation]
 Дата активації
+[Are you sure you want to delete all reminders?]
+Впевнені, що хочете видалити всі нагадування?!
 [Are you sure you want to delete this reminder?]
 Впевнені, що хочете видалити це нагадування?
+;file \plugins\NotesAndReminders\src\stdafx.h
+[Notes & Reminders]
+Нотатки і нагадування
diff --git a/langpacks/ukrainian/Plugins/PasteIt.txt b/langpacks/ukrainian/Plugins/PasteIt.txt
index 3383ca1189..6851197e20 100644
--- a/langpacks/ukrainian/Plugins/PasteIt.txt
+++ b/langpacks/ukrainian/Plugins/PasteIt.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: PasteIt.dll
 ;  Plugin: Paste it
-;  Version: 1.0.0.3
+;  Version: 1.0.0.4
 ;  Authors: Krzysztof Kral
 ;============================================================
 [Uploads the text to web page and sends the URL to your friends.]
@@ -142,12 +142,12 @@ HTTP-з'єднання Paste It
 [File '%s' is empty]
 Файл '%s' порожній
 ;file \plugins\PasteIt\src\PasteToWeb1.cpp
-[Error during sending text to web page: %s]
-Помилка при надсиланні тексту на веб-сторінку: %s
+[Error during sending text to web page: %S]
+Помилка при надсиланні тексту на веб-сторінку: %S
 [Error during sending text to web page]
 Помилка при надсиланні тексту на веб-сторінку
-[Error during getting user key from web page: %s]
-Помилка при отриманні ключа користувача від веб-сторінки: %s
+[Error during getting user key from web page: %S]
+Помилка при отриманні ключа користувача від веб-сторінки: %S
 [Paste expire date]
 Вставити дату закінчення
 [Never]
diff --git a/langpacks/ukrainian/Plugins/PluginUpdater.txt b/langpacks/ukrainian/Plugins/PluginUpdater.txt
index b85cceab68..3c43e268b5 100644
--- a/langpacks/ukrainian/Plugins/PluginUpdater.txt
+++ b/langpacks/ukrainian/Plugins/PluginUpdater.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: PluginUpdater.dll
 ;  Plugin: Plugin updater
-;  Version: 0.2.0.2
+;  Version: 0.2.0.3
 ;  Authors: Mataes, George Hazan
 ;============================================================
 [Installs and updates plugins and other Miranda NG components.]
diff --git a/langpacks/ukrainian/Plugins/PopupPlus.txt b/langpacks/ukrainian/Plugins/PopupPlus.txt
index 14f163e91c..f96dbdb080 100644
--- a/langpacks/ukrainian/Plugins/PopupPlus.txt
+++ b/langpacks/ukrainian/Plugins/PopupPlus.txt
@@ -1,6 +1,6 @@
 #muuid {26a9125d-7863-4e01-af0e-d14ef95c5054}
 ;============================================================
-;  File: Popup.dll
+;  File: PopupPlus.dll
 ;  Plugin: Popup plus
 ;  Version: 2.1.1.15
 ;  Authors: MPK, Merlin_de (Luca Santarelli, Victor Pavlychko)
@@ -82,7 +82,7 @@ History++ для історії вікон
 Тест
 [Download more skins]
 Завантажити скіни
-[Popup History]
+[Popup history]
 Історія сплив. вікон
 [Desktop]
 Робочий стіл
@@ -263,15 +263,11 @@ History++ для історії вікон
 [Avatar border]
 Рамка аватару
 ;file \plugins\Popup\src\history.cpp
-[Popup History is disabled]
+[Popup history is disabled]
 Історія спливаючих вікон вимкнена
-[Popup History message]
+[Popup history message]
 Історія спливаючих вікон
 ;file \plugins\Popup\src\icons.cpp
-[Popups are enabled]
-Вікна ввімкнені
-[Popups are disabled]
-Вікна вимкнені
 [With "favorite" overlay]
 З накладенням "Обраний"
 [With "fullscreen" overlay]
@@ -309,13 +305,13 @@ History++ для історії вікон
 Контакти
 [Advanced]
 Додатково
-[Toggle Popups]
+[Toggle popups]
 Увімк./вимк. сплив. вікна
-[Enable Popups]
+[Enable popups]
 Увімкнути спливаючі вікна
-[Disable Popups]
+[Disable popups]
 Вимкнути спливаючі вікна
-[Popup Plus]
+[Popup plus]
 Спливаючі вікна
 [Error: I could not register the Popup Window class.\r\nThe plugin will not operate.]
 Помилка: не вдалося зареєструвати клас Popup Window.\r\nПлагін не працюватиме.
diff --git a/langpacks/ukrainian/Plugins/SkypeWeb.txt b/langpacks/ukrainian/Plugins/SkypeWeb.txt
index a40f019d35..81f59a1622 100644
--- a/langpacks/ukrainian/Plugins/SkypeWeb.txt
+++ b/langpacks/ukrainian/Plugins/SkypeWeb.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: SkypeWeb.dll
 ;  Plugin: Skype protocol (Web)
-;  Version: 0.12.3.1
+;  Version: 0.12.3.3
 ;  Authors: Miranda NG team
 ;============================================================
 [Skype protocol support for Miranda NG. Based on new Skype for Web.]
diff --git a/langpacks/ukrainian/Plugins/SmileyAdd.txt b/langpacks/ukrainian/Plugins/SmileyAdd.txt
index 08185cf355..07facb32fc 100644
--- a/langpacks/ukrainian/Plugins/SmileyAdd.txt
+++ b/langpacks/ukrainian/Plugins/SmileyAdd.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: SmileyAdd.dll
 ;  Plugin: SmileyAdd
-;  Version: 0.3.1.0
+;  Version: 0.3.1.1
 ;  Authors: Peacow, nightwish, bid, borkra
 ;============================================================
 [Smiley support for Miranda NG.]
diff --git a/langpacks/ukrainian/Plugins/StatusManager.txt b/langpacks/ukrainian/Plugins/StatusManager.txt
index 4587bc743f..b0de8edb46 100644
--- a/langpacks/ukrainian/Plugins/StatusManager.txt
+++ b/langpacks/ukrainian/Plugins/StatusManager.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: StatusManager.dll
 ;  Plugin: Status manager
-;  Version: 1.2.0.4
+;  Version: 1.2.0.5
 ;  Authors: P Boon
 ;============================================================
 [A connection checker and auto away module. Also allows you to define the status Miranda should set on startup, configurable per protocol.]
diff --git a/langpacks/ukrainian/Plugins/TabSRMM.txt b/langpacks/ukrainian/Plugins/TabSRMM.txt
index 4457b30b58..558d06beeb 100644
--- a/langpacks/ukrainian/Plugins/TabSRMM.txt
+++ b/langpacks/ukrainian/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: TabSRMM.dll
 ;  Plugin: TabSRMM
-;  Version: 3.5.0.12
+;  Version: 3.5.0.13
 ;  Authors: The Miranda developers team and contributors
 ;============================================================
 [IM and group chat module for Miranda NG.]
@@ -178,8 +178,6 @@
 Помилки
 [Use the message log color theme for group chat popups]
 Використовувати кольори журналу повідомлень для сплив. вікон чатів
-[No compatible popup plugin was found. The event notification\nsystem is not available.]
-Плагін спливаючих вікон не знайдено. Сповіщення недоступні.
 [Dialog]
 Діалог
 [Cancel]
@@ -1697,10 +1695,6 @@ UID: %s (Shift+клік -> копіювати в буфер)\nКлік - Інф�
 Можливість вимкнена (використовується як оверлей)
 [Feature enabled (used as overlay)]
 Можливість увімкнена (використовується як оверлей)
-[Enable typing notification]
-
-[Disable typing notification]
-
 ;file \plugins\TabSRMM\src\msgs.h
 [Message windows - IM]
 Вікна повідомлень - IM
@@ -1984,10 +1978,10 @@ UID: %s (Shift+клік -> копіювати в буфер)\nКлік - Інф�
 Вимкнути сповіщення про &друк
 [Enable &typing notification]
 Увімкнути сповіщення про &друк
-[...is typing a message.]
-...друкує.
 [...has stopped typing.]
 ...закінчив друкувати
+[...is typing a message.]
+...друкує.
 [Contact started typing]
 Співрозмовник почав друкувати
 [Contact stopped typing]
diff --git a/langpacks/ukrainian/Plugins/UInfoEx.txt b/langpacks/ukrainian/Plugins/UInfoEx.txt
index 64fdb6c090..7ca4265e04 100644
--- a/langpacks/ukrainian/Plugins/UInfoEx.txt
+++ b/langpacks/ukrainian/Plugins/UInfoEx.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: UInfoEx.dll
 ;  Plugin: User info ext
-;  Version: 0.8.5.1
+;  Version: 0.8.5.2
 ;  Authors: DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
 ;============================================================
 [Extended UserInfo module for Miranda NG. Provides interface to edit all contact information.]
@@ -1110,12 +1110,10 @@ Web-дизайн
 \[b]%s (%S)...[/b]\n%d контактів залишилось
 [Abort Refreshing Contact Details]
 Скасувати оновлення даних контактів
-[Do you want to cancel the current refresh procedure?]
-Справді скасувати оновлення даних?
 [Miranda must be online for refreshing contact information!]
 Для оновлення даних необхідно, щоб протоколи були в мережі.
-[The function caused an exception!]
-Функція спричинила помилку.
+[Do you want to cancel the current refresh procedure?]
+Справді скасувати оновлення даних?
 ;file \plugins\UserInfoEx\src\svc_reminder.cpp
 [%s has %s today.]
 %s святкує %s сьогодні.
@@ -1216,16 +1214,8 @@ SaveFileDialog повернув помилку: %d
 ;file \plugins\UserInfoEx\src\ex_import\svc_ExImXML.cpp
 [Can't create xml file!\n%S]
 Неможливо створити XML-файл.\n%S
-[Export took %f ms]
-Експорт зайняв %f мс
 [Contact: %s (%S)]
 Контакт: %s (%S)
-[Importing %s caused error %d]
-Імпорт %s спричинив помилку %d
-[Loading contact %s from xml failed with error %d]
-Помилка %d при завантаженні контакту %s з xml
-[Importing Owner caused error %d]
-Імпорт Власника спричинив помилку %d
 [Parser is unable to load XMLCard "%s"\nError: %d\nDescription: %s]
 Неможливо завантажити XML-картку "%s"\nПомилка: %d\nОпис: %s
 [The selected file is no valid XMLCard]
@@ -1238,12 +1228,8 @@ SaveFileDialog повернув помилку: %d
 Інформацію Власника успішно імпортовано.
 [Selected XMLCard does not contain an owner contact!]
 Вибрана XML-картка не містить інформації власника.
-[Import took %f ms]
-Імпорт зайняв %f мс
 [added contacts: %u / %u\nadded settings: %u / %u\nadded events %u / %u\nduplicated events: %u]
 Додано контактів: %u / %u\nДодано налаштувань: %u / %u\nДодано подій %u / %u\nПродубльовано подій: %u
-[FATAL: An exception was thrown while importing contacts from xmlCard!]
-Фатальна помилка при імпорті контактів з XML-картки!
 ;file \plugins\UserInfoEx\src\Flags\svc_flags.cpp
 [Flags (UInfoEx)]
 Прапори (UInfoEx)
diff --git a/langpacks/ukrainian/Plugins/VKontakte.txt b/langpacks/ukrainian/Plugins/VKontakte.txt
index ec0ebb5ad3..e5a5cae1db 100644
--- a/langpacks/ukrainian/Plugins/VKontakte.txt
+++ b/langpacks/ukrainian/Plugins/VKontakte.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: VKontakte.dll
 ;  Plugin: VKontakte protocol
-;  Version: 0.1.8.1
+;  Version: 0.1.9.0
 ;  Authors: Miranda NG team
 ;============================================================
 [VKontakte protocol support for Miranda NG.]
diff --git a/langpacks/ukrainian/Plugins/Weather.txt b/langpacks/ukrainian/Plugins/Weather.txt
index d3fe0b7850..70c178b4f5 100644
--- a/langpacks/ukrainian/Plugins/Weather.txt
+++ b/langpacks/ukrainian/Plugins/Weather.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Retrieves weather information and displays it in your contact list.]
 Запит та відображення інформації про погоду у вашому списку контактів.
-;file \plugins\Weather\res\resource.rc
+;file \protocols\Weather\res\resource.rc
 [Update]
 Оновити
 [Brief Info]
@@ -254,7 +254,7 @@ URL додаткової інформації
 До старих
 [To default]
 За замовчанням
-;file \plugins\Weather\src\stdafx.h
+;file \protocols\Weather\src\stdafx.h
 [N/A]
 Недоступний
 [Invalid ID format, missing "/" (10)]
@@ -337,7 +337,7 @@ INI-файл погоди для цієї станції не знайдений
 Не вказано URL повного прогнозу погоди. Вкажіть його в налаштуваннях.
 [The URL for weather map has not been set. You can set it from the Edit Settings dialog.]
 Не вказано URL карти погоди. Вкажіть його в налаштуваннях.
-;file \plugins\Weather\src\weather.cpp
+;file \protocols\Weather\src\weather.cpp
 [Enable/disable auto update]
 Увімк./вимк. автооновлення
 [Auto Update Enabled]
@@ -348,7 +348,7 @@ INI-файл погоди для цієї станції не знайдений
 Погода змінилася
 [Alert Issued]
 Погодне попередження
-;file \plugins\Weather\src\weather_addstn.cpp
+;file \protocols\Weather\src\weather_addstn.cpp
 [Current weather information for %s.]
 Поточна інформація про погоду для %s.
 [%s is now the default weather station]
@@ -361,7 +361,7 @@ INI-файл погоди для цієї станції не знайдений
 <Введіть назву міста>
 [<Enter station ID here>]
 <Введіть ID міста>
-;file \plugins\Weather\src\weather_contacts.cpp
+;file \protocols\Weather\src\weather_contacts.cpp
 [Weather condition was not logged.]
 Журнал погоди не ведеться.
 [Get city name from ID]
@@ -378,7 +378,7 @@ INI-файл погоди для цієї станції не знайдений
 Текстові файли
 [All Files]
 Усі файли
-;file \plugins\Weather\src\weather_conv.cpp
+;file \protocols\Weather\src\weather_conv.cpp
 [mb]
 мбар
 [in]
@@ -391,15 +391,15 @@ INI-файл погоди для цієї станції не знайдений
 <Помилка>
 [HTTP Error %i]
 Помилка HTTP %i
-;file \plugins\Weather\src\weather_data.cpp
+;file \protocols\Weather\src\weather_data.cpp
 [<Enter city name here>]
 <Введіть назву міста>
 [Error when obtaining data: %s]
 Помилка при отриманні даних: %s
-;file \plugins\Weather\src\weather_http.cpp
+;file \protocols\Weather\src\weather_http.cpp
 [Weather HTTP connections]
 HTTP-з'єднання Weather
-;file \plugins\Weather\src\weather_icons.cpp
+;file \protocols\Weather\src\weather_icons.cpp
 [Protocol icon]
 Значок протоколу
 [Update Disabled]
@@ -420,7 +420,7 @@ HTTP-з'єднання Weather
 Без вікон
 [Edit Settings]
 Змінити налаштування
-;file \plugins\Weather\src\weather_info.cpp
+;file \protocols\Weather\src\weather_info.cpp
 [Name]
 Ім'я
 [Author]
@@ -459,21 +459,21 @@ HTTP-з'єднання Weather
 байт
 [Description:]
 Опис:
-;file \plugins\Weather\src\weather_ini.cpp
+;file \protocols\Weather\src\weather_ini.cpp
 [All update data has been reloaded.]
 Усі оновлені дані перезавантажені.
 [Invalid ini format for: %s]
 Власний формат INI для: %s
 [No update data file is found. Please check your Plugins\\Weather directory.]
 Не знайдено жодного файлу INI. Будь ласка, перевірте папку Plugins\\Weather.
-;file \plugins\Weather\src\weather_mwin.cpp
+;file \protocols\Weather\src\weather_mwin.cpp
 [Frame Font]
 Шрифт фрейму
 [Frame Title Font]
 Шрифт заголовка фрейму
 [Frame Background]
 Фон фрейму
-;file \plugins\Weather\src\weather_opt.cpp
+;file \protocols\Weather\src\weather_opt.cpp
 [Weather Protocol Text Preview]
 Перегляд протоколу погоди
 [Network]
@@ -484,8 +484,8 @@ HTTP-з'єднання Weather
 Показувати
 [Popups]
 Спливаючі вікна
-;file \plugins\Weather\src\weather_popup.cpp
-;file \plugins\Weather\src\weather_svcs.cpp
+;file \protocols\Weather\src\weather_popup.cpp
+;file \protocols\Weather\src\weather_svcs.cpp
 [Station ID]
 ID міста
 [Disable &weather notification]
@@ -512,10 +512,10 @@ ID міста
 Сповіщення про погоду
 [Display in a frame]
 Показувати у фреймі
-;file \plugins\Weather\src\weather_update.cpp
+;file \protocols\Weather\src\weather_update.cpp
 [Unable to retrieve weather information for %s]
 Неможливо знайти інформацію про погоду для %s
-;file \plugins\Weather\src\weather_userinfo.cpp
+;file \protocols\Weather\src\weather_userinfo.cpp
 [Variable]
 Змінна
 [Information]
diff --git a/langpacks/ukrainian/Plugins/WebView.txt b/langpacks/ukrainian/Plugins/WebView.txt
index 9ccc711e72..b9af8a563f 100644
--- a/langpacks/ukrainian/Plugins/WebView.txt
+++ b/langpacks/ukrainian/Plugins/WebView.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Adds web pages as contacts to your contact list and can display text and/or issue change alerts from those pages in a window.]
 Додає веб-сторінки як контакти до списку контактів і відображає текст і/або видає сповіщення про зміни цих сторінок у вікно.
-;file \plugins\WebView\res\webview.rc
+;file \protocols\WebView\res\webview.rc
 [Webview]
 Webview
 [Update data every]
@@ -180,7 +180,7 @@ Webview
 &Вибрати все
 [C&lear all]
 &Очистити все
-;file \plugins\WebView\src\main.cpp
+;file \protocols\WebView\src\main.cpp
 [Alert event]
 Сповіщення
 [Auto update disabled]
@@ -207,14 +207,14 @@ Webview
 Пінгувати веб-сторінку
 [Stop data processing]
 Припинити обробку даних
-;file \plugins\WebView\src\webview.cpp
+;file \protocols\WebView\src\webview.cpp
 [All Webview sites have been updated.]
 Усі сторінки оновлено.
 [Network]
 Мережа
 [Popups]
 Спливаючі вікна
-;file \plugins\WebView\src\webview_alerts.cpp
+;file \protocols\WebView\src\webview_alerts.cpp
 [Cannot write to file]
 Неможливо записати у файл
 [Last updated on]
@@ -245,7 +245,7 @@ Webview
 Неможливо прочитати з файлу кешу
 [Loaded from cache]
 Завантажено з кешу
-;file \plugins\WebView\src\webview_datawnd.cpp
+;file \protocols\WebView\src\webview_datawnd.cpp
 [ERROR: You have two or more Webview contacts with the same URL and contact name.]
 ПОМИЛКА: У вас є два або більше контактів WebView з однаковою URL-адресою та ім'ям контакту.
 [Alert options]
@@ -258,7 +258,7 @@ Webview
 Поверх усіх вікон
 [Disable stick to the front]
 Вимкнути "Поверх усіх вікон"
-;file \plugins\WebView\src\webview_getdata.cpp
+;file \protocols\WebView\src\webview_getdata.cpp
 [URL not supplied]
 URL-адреса не поставляється
 [Download in progress, please wait...]
@@ -305,7 +305,7 @@ URL-адреса не поставляється
 Скачано байтів
 [Alert test conditions not met; press the refresh button to view content.]
 Тест умов сповіщення не виконано, натисніть кнопку "Оновити", щоб переглянути вміст.
-;file \plugins\WebView\src\webview_opts.cpp
+;file \protocols\WebView\src\webview_opts.cpp
 [No whitespace removal]
 Не видаляти вільне місце
 [Minimal level of whitespace removal]
@@ -342,7 +342,7 @@ URL-адреса не поставляється
 Необхідно вказати ім'я контакту.
 [Invalid symbol present in contact name.]
 В імені контакту присутній неприпустимий символ.
-;file \plugins\WebView\src\webview_services.cpp
+;file \protocols\WebView\src\webview_services.cpp
 [Cache folder does not exist.]
 Папки кешу не існує.
 [Missing "psite.bat" file.]
diff --git a/langpacks/ukrainian/Plugins/WhoUsesMyFiles.txt b/langpacks/ukrainian/Plugins/WhoUsesMyFiles.txt
index dbeb700410..c71a91d8f3 100644
--- a/langpacks/ukrainian/Plugins/WhoUsesMyFiles.txt
+++ b/langpacks/ukrainian/Plugins/WhoUsesMyFiles.txt
@@ -55,12 +55,10 @@ WUMF: Поточні з'єднання
 [Show current connections]
 Показати з'єднання
 ;file \plugins\WhoUsesMyFiles\src\options.cpp
-[Popup plugin not found!]
-Не встановлений плагін сплив. вікон!
-[Error]
-Помилка
 [Common Dialog Error 0x%lx]
 Помилка діалогу 0x%lx
+[Error]
+Помилка
 [Not implemented yet...]
 Ще не реалізовано...
 [Who uses my files]
diff --git a/langpacks/ukrainian/Plugins/YAMN.txt b/langpacks/ukrainian/Plugins/YAMN.txt
index fabc8cebc3..39dd9b3ad5 100644
--- a/langpacks/ukrainian/Plugins/YAMN.txt
+++ b/langpacks/ukrainian/Plugins/YAMN.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Mail notifier and browser for Miranda NG. Included POP3 protocol.]
 Сповіщення про нову пошту та її перегляд у Miranda NG. Підтримується протокол POP3.
-;file \plugins\YAMN\res\YAMN.rc
+;file \protocols\YAMN\res\YAMN.rc
 [Installed plugins]
 Встановлені додаткові плагіни
 [Version:]
@@ -156,7 +156,7 @@
 Колір фону
 [Text color]
 Колір тексту
-;file \plugins\YAMN\src\main.cpp
+;file \protocols\YAMN\src\main.cpp
 [Check &mail (All Account)]
 Перевірити пошту (Всі)
 [Check &mail (This Account)]
@@ -171,17 +171,17 @@
 Перевірити пошту
 [Connect Fail]
 Втрата з'єднання
-;file \plugins\YAMN\src\main.h
+;file \protocols\YAMN\src\main.h
 [New mail message]
 Новий лист
 [Connect failed]
 Помилка підключення
-;file \plugins\YAMN\src\services.cpp
+;file \protocols\YAMN\src\services.cpp
 [Nick]
 Нік
 [No new mail message]
 Немає нових листів
-;file \plugins\YAMN\src\browser\badconnect.cpp
+;file \protocols\YAMN\src\browser\badconnect.cpp
 [%s - connection error]
 %s - помилка підключення
 [An error occurred. Error code: %d]
@@ -190,7 +190,7 @@
 Невідома помилка
 [ - connection error]
 - помилка підключення
-;file \plugins\YAMN\src\browser\mailbrowser.cpp
+;file \protocols\YAMN\src\browser\mailbrowser.cpp
 [%s - %d new mail messages, %d total]
 %s - %d нових листів (%d всього)
 [%s : %d new mail message(s), %d total]
@@ -229,15 +229,15 @@
 Видалити %d листів?
 [Delete confirmation]
 Підтвердження видалення
-;file \plugins\YAMN\src\mails\mime.cpp
+;file \protocols\YAMN\src\mails\mime.cpp
 [Translate header error]
 Помилка перекладу заголовка
 [Part]
 Частина
-;file \plugins\YAMN\src\proto\netlib.cpp
+;file \protocols\YAMN\src\proto\netlib.cpp
 [%s connection]
 З'єднання %s
-;file \plugins\YAMN\src\proto\pop3\pop3comm.cpp
+;file \protocols\YAMN\src\proto\pop3\pop3comm.cpp
 [Disconnected]
 Вимкнено
 [POP3 protocol (internal)]
@@ -314,7 +314,7 @@ OpenSSL не завантажений.
 Неможливо прочитати дані SSL.
 [Error %d-%d-%d-%d:]
 Помилка %d-%d-%d-%d:
-;file \plugins\YAMN\src\proto\pop3\pop3opt.cpp
+;file \protocols\YAMN\src\proto\pop3\pop3opt.cpp
 [Network]
 Мережа
 [Accounts]
diff --git a/langpacks/ukrainian/Untranslated/Actman.txt b/langpacks/ukrainian/Untranslated/Actman.txt
index ff7357286a..28b51cdb02 100644
--- a/langpacks/ukrainian/Untranslated/Actman.txt
+++ b/langpacks/ukrainian/Untranslated/Actman.txt
@@ -24,7 +24,7 @@
 [Shows the previous protocol in the frame]
 [Opens the options dialog, optionally at the specified page]
 [Empty updater download folder]
-[Popup Plus (popup.dll) latest YAPP (yapp.dll)]
+[Popup plus (PopupPlus.dll) latest StdPopup (StdPopup.dll)]
 [result of protocol service call]
 [Send a general request through the protocol chain for a contact]
 [str, account name]
diff --git a/langpacks/ukrainian/Untranslated/Clist_modern.txt b/langpacks/ukrainian/Untranslated/Clist_modern.txt
index 370ee99028..2bcce638f6 100644
--- a/langpacks/ukrainian/Untranslated/Clist_modern.txt
+++ b/langpacks/ukrainian/Untranslated/Clist_modern.txt
@@ -1,9 +1,3 @@
 [Editing view mode]
 [Layered]
-[Row design]
-[Empty %s cell]
-[column]
-[line]
-[columns]
-[lines]
-[ layered]
+[Last online]
diff --git a/langpacks/ukrainian/Untranslated/CurrencyRates.txt b/langpacks/ukrainian/Untranslated/CurrencyRates.txt
index ed3739f685..7064829d71 100644
--- a/langpacks/ukrainian/Untranslated/CurrencyRates.txt
+++ b/langpacks/ukrainian/Untranslated/CurrencyRates.txt
@@ -1,4 +1,6 @@
+[&Personal key:]
 [Enter text to display in contact list.]
+[This plugin requires a personal key. Press Yes to obtain it at the site and then enter the result in the Options dialog, otherwise this plugin will fail.]
 [Enter integer value]
 [Enter log file name.]
 [Enter log file format.]
diff --git a/langpacks/ukrainian/Untranslated/Db_autobackups.txt b/langpacks/ukrainian/Untranslated/Db_autobackups.txt
index b76c946c96..90abc03b2e 100644
--- a/langpacks/ukrainian/Untranslated/Db_autobackups.txt
+++ b/langpacks/ukrainian/Untranslated/Db_autobackups.txt
@@ -1,2 +1,4 @@
 [Backup file mask:]
 [Uploading to cloud failed]
+[Enable &AutoBackups notification]
+[Disable &AutoBackups notification]
diff --git a/langpacks/ukrainian/Untranslated/Discord.txt b/langpacks/ukrainian/Untranslated/Discord.txt
index 749009d682..7e8a2f520a 100644
--- a/langpacks/ukrainian/Untranslated/Discord.txt
+++ b/langpacks/ukrainian/Untranslated/Discord.txt
@@ -1,5 +1,6 @@
 [Discord support for Miranda NG.]
-[Use subgroups for guild's channels (requires restart)]
+[Enable group chats]
+[Use subgroups for server channels (requires restart)]
 [edited at]
 [Channel control]
 [Change &topic]
@@ -12,11 +13,15 @@
 [Enter channel name]
 [Enter invitation code you received]
 [Do you really want to leave the guild?]
+[Disable sync]
+[Enable sync]
 [Join guild]
 [Copy my Discord ID]
 [Leave guild]
 [Create new channel]
 [Copy Discord ID]
+[Enable guild sync]
+[Load server history]
 [%s gateway connection]
 [Protocol is offline or user isn't authorized yet]
 [Attachment]
diff --git a/langpacks/ukrainian/Untranslated/ICQ.txt b/langpacks/ukrainian/Untranslated/ICQ.txt
index 1abe5f76fc..c30e660bb0 100644
--- a/langpacks/ukrainian/Untranslated/ICQ.txt
+++ b/langpacks/ukrainian/Untranslated/ICQ.txt
@@ -1,4 +1,6 @@
 [Sign in/sign up using phone]
+[Use tray icon notifications]
+[Launch mailbox in a browser on click]
 [If a contact goes Offline, set this status instead and cache it for given timeout in seconds (0 - disabled)]
 [After that, set this status to a contact and move it offline after specified timeout in seconds (0 - disabled)]
 [Send group chat invitation]
@@ -13,7 +15,10 @@
 [&Invite a user]
 [&Leave/destroy chat]
 [Do you really want to remove it from ignore list?]
+[E-mail notification]
 [Remove Ignore]
+[You received e-mail from %s: %s]
+[You have %d unread emails]
 [Synchronize server groups]
 [Edit ignore list]
 [You have not entered an ICQ number.\nConfigure this in Options -> Network -> ICQ and try again.]
diff --git a/langpacks/ukrainian/Untranslated/Jabber.txt b/langpacks/ukrainian/Untranslated/Jabber.txt
index 3bee5fd700..1ef0ebfa24 100644
--- a/langpacks/ukrainian/Untranslated/Jabber.txt
+++ b/langpacks/ukrainian/Untranslated/Jabber.txt
@@ -1,5 +1,7 @@
 [JID:]
+[Filter:]
 [Supports message carbons (XEP-0280)]
+[Authentication]
 [Do you want to create OMEMO session with new device:]
 [OMEMO: New session]
 [Receive conversations from other devices (XEP-0280)]
@@ -11,4 +13,6 @@
 [League Of Legends (US)]
 [S.ms]
 [No valid OMEMO session exists]
+[Registration canceled]
+[Last activity]
 [Jabber vCard]
diff --git a/langpacks/ukrainian/Untranslated/NotesReminders.txt b/langpacks/ukrainian/Untranslated/NotesReminders.txt
index e1524a80de..cb41204879 100644
--- a/langpacks/ukrainian/Untranslated/NotesReminders.txt
+++ b/langpacks/ukrainian/Untranslated/NotesReminders.txt
@@ -1,2 +1,2 @@
+[Repeat each day]
 [reftime]
-[Context Menu Note Popup]
diff --git a/langpacks/ukrainian/Untranslated/TabSRMM.txt b/langpacks/ukrainian/Untranslated/TabSRMM.txt
deleted file mode 100644
index ef38956a93..0000000000
--- a/langpacks/ukrainian/Untranslated/TabSRMM.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-[Enable typing notification]
-[Disable typing notification]