186 files changed, 808 insertions, 706 deletions

diff --git a/include/delphi/m_popup.inc b/include/delphi/m_popup.inc
index 9ec0df58d5..15a2c66696 100644
--- a/include/delphi/m_popup.inc
+++ b/include/delphi/m_popup.inc
@@ -1,12 +1,12 @@
 {

 ===============================================================================

-                                PopUp plugin

-Plugin Name: PopUp

+                                Popup plugin

+Plugin Name: Popup

 Plugin authors: Luca Santarelli aka hrk (hrk@users.sourceforge.net)

                 Victor Pavlychko (nullbie@gmail.com)

 ===============================================================================

 The purpose of this plugin is to give developers a common "platform/interface"

-to show PopUps. It is born from the source code of NewStatusNotify, another

+to show Popups. It is born from the source code of NewStatusNotify, another

 plugin I've made.

 

 Remember that users *must* have this plugin enabled, or they won't get any

@@ -19,10 +19,10 @@ them!
 {$DEFINE M_POPUP}

 

 {

-NOTE! Since Popup 1.0.1.2 there is a main meun group called "PopUps" where I

+NOTE! Since Popup 1.0.1.2 there is a main meun group called "Popups" where I

 have put a "Enable/Disable" item. You can add your own "enable/disable" items

 by adding these lines before you call MS_CLIST_ADDMAINMENUITEM:

-mi.pszPopUpName = Translate("PopUps");

+mi.pszPopupName = Translate("Popups");

 mi.position = 0; //You don't need it and it's better if you put it to zero.

 }

 

@@ -67,7 +67,7 @@ type
     iSeconds        : int;      // Custom delay time in seconds.

                                 // -1 means "forever", 0 means = 'default time".

 { Data prior $02010003 version

-    lpzClass        : PAnsiChar;    // PopUp class. Used with skinning. See PopUp/AddClass for details

+    lpzClass        : PAnsiChar;    // Popup class. Used with skinning. See Popup/AddClass for details

     skinBack        : COLORREF; // Background color for colorizable skins

     cZero: array [0..15-SizeOf(PAnsiChar)-SizeOf(COLORREF)] of byte;

 }

@@ -128,7 +128,7 @@ The default WNDPROC does nothing.
 - PluginData is a pointer to a void, which means a pointer to anything. You can

 make your own structure to store the data you need (example: a status

 information, a date, your name, whatever) and give me a pointer to that struct.

-You will need to destroy that structure and free the memory when the PopUp is

+You will need to destroy that structure and free the memory when the Popup is

 going to be destroyed. You'll know this when you receive a UM_FREEPLUGINDATA.

 The name tells it all: free your own plugin data.

 

@@ -141,10 +141,10 @@ WM_PAINT, WM_PRINT, WM_PRINTCLIENT
 const

 {

   Creates, adds and shows a popup, given a (valid) POPUPDATA structure pointer.

-  wParam = (WPARAM)(*POPUPDATA)PopUpDataAddress

+  wParam = (WPARAM)(*POPUPDATA)PopupDataAddress

   lParam = 0

-  Returns: > 0 on success, 0 if creation went bad, -1 if the PopUpData contained unacceptable values.

-  NOTE: it returns -1 if the PopUpData was not valid, if there were already too many popups, if the module was disabled.

+  Returns: > 0 on success, 0 if creation went bad, -1 if the PopupData contained unacceptable values.

+  NOTE: it returns -1 if the PopupData was not valid, if there were already too many popups, if the module was disabled.

   Otherwise, it can return anything else...

 

 Popup Plus 2.0.4.0+

@@ -162,21 +162,21 @@ You may pass additional creation flags via lParam:
   APF_NO_POPUP     = 8;

   APF_NEWDATA      = $10;

 

-  MS_POPUP_ADDPOPUPW:PAnsiChar = 'PopUp/AddPopUpW';

-  MS_POPUP_ADDPOPUP :PAnsiChar = 'PopUp/AddPopUpEx';

+  MS_POPUP_ADDPOPUPW:PAnsiChar = 'Popup/AddPopupW';

+  MS_POPUP_ADDPOPUP :PAnsiChar = 'Popup/AddPopupEx';

 

 {

-  Returns the handle to the contact associated to the specified PopUpWindow.

+  Returns the handle to the contact associated to the specified PopupWindow.

   You will probably need to know this handle inside your WNDPROC. Exampole: you want to open the MessageWindow. :-)

   Call MS_POPUP_GETCONTACT on the hWnd you were given in the WNDPROC.

-  wParam = (WPARAM)(HWND)hPopUpWindow

+  wParam = (WPARAM)(HWND)hPopupWindow

   lParam = 0;

   Returns: the HANDLE of the contact. Can return NULL, meaning it's the main contact. -1 means failure.

 }

-  MS_POPUP_GETCONTACT:PAnsiChar = 'PopUp/GetContact';

+  MS_POPUP_GETCONTACT:PAnsiChar = 'Popup/GetContact';

 

 {

-  wParam = hPopUpWindow

+  wParam = hPopupWindow

   lParam = PluginDataAddress;

   Returns: the address of the PLUGINDATA structure. Can return NULL, meaning nothing was given. -1 means failure.

   IMPORTANT NOTE: it doesn't seem to work if you do:

@@ -184,19 +184,19 @@ You may pass additional creation flags via lParam:
   and then use that struct.

   Do this, instead:

   aPointerToStruct = CallService(..., (LPARAM)aPointerToAStruct);

-  and it will work. Just look at the example I've written above (PopUpDlgProc).

+  and it will work. Just look at the example I've written above (PopupDlgProc).

 }

-  MS_POPUP_GETPLUGINDATA:PAnsiChar = 'PopUp/GetPluginData';

+  MS_POPUP_GETPLUGINDATA:PAnsiChar = 'Popup/GetPluginData';

 

 {

   wParam = 0

   lParam = 0

   Returns: 0 if the user has chosen not to have the second line, 1 if he choose to have the second line.

 }

-  MS_POPUP_ISSECONDLINESHOWN:PAnsiChar = 'PopUp/IsSecondLineShown';

+  MS_POPUP_ISSECONDLINESHOWN:PAnsiChar = 'Popup/IsSecondLineShown';

 

 {

-  Requests an action or an answer from PopUp module.

+  Requests an action or an answer from Popup module.

   wParam = (WPARAM)wpQuery

   returns 0 on success, -1 on error, 1 on stupid calls ;-)

 }

@@ -204,7 +204,7 @@ You may pass additional creation flags via lParam:
   PUQS_DISABLEPOPUPS = 2; // " "

   PUQS_GETSTATUS     = 3; // Returns 1 if popups are enabled, 0 if popups are disabled.

 

-  MS_POPUP_QUERY:PAnsiChar = 'PopUp/Query';

+  MS_POPUP_QUERY:PAnsiChar = 'Popup/Query';

 

 {

   UM_FREEPLUGINDATA

@@ -220,28 +220,28 @@ You may pass additional creation flags via lParam:
 

 {

   UM_INITPOPUP

-  wParam = (WPARAM)(HWND)hPopUpWindow (but this is useless, since I'll directly send it to your hPopUpWindow

+  wParam = (WPARAM)(HWND)hPopupWindow (but this is useless, since I'll directly send it to your hPopupWindow

   lParam = 0.

-  This message is sent to the PopUp when its creation has been finished, so POPUPDATA (and thus your PluginData) is reachable.

+  This message is sent to the Popup when its creation has been finished, so POPUPDATA (and thus your PluginData) is reachable.

   Catch it if you needed to catch WM_CREATE or WM_INITDIALOG, which you'll never ever get in your entire popup-life.

   Return value: if you process this message, return 0. If you don't process it, return 0. Do whatever you like ;-)

 }

   UM_INITPOPUP = (WM_USER + $202);

 

 {

-  wParam = hPopUpWindow

+  wParam = hPopupWindow

   lParam = lpzNewText

   returns: > 0 for success, -1 for failure, 0 if the failure is due to second line not being shown. (but you could call PUIsSecondLineShown() before changing the text...)

   Changes the text displayed in the second line of the popup.

 }

-  MS_POPUP_CHANGETEXTW:PAnsiChar = 'PopUp/ChangetextW';

+  MS_POPUP_CHANGETEXTW:PAnsiChar = 'Popup/ChangetextW';

 

 {

-  wParam = (WPARAM)(HWND)hPopUpWindow

+  wParam = (WPARAM)(HWND)hPopupWindow

   lParam = (LPARAM)(POPUPDATAEX*)newData

   Changes the entire popup

 }

-  MS_POPUP_CHANGEW:PAnsiChar = 'PopUp/ChangeW';

+  MS_POPUP_CHANGEW:PAnsiChar = 'Popup/ChangeW';

 

 {

  UM_CHANGEPOPUP

@@ -292,17 +292,17 @@ const
   SM_ERROR        = $03; //Cross icon.

 {

   This is mainly for developers.

-  Shows a warning message in a PopUp. It's useful if you need a = 'MessageBox" like function,

+  Shows a warning message in a Popup. It's useful if you need a = 'MessageBox" like function,

   but you don't want a modal window (which will interfere with a DialogProcedure. MessageBox

   steals focus and control, this one not.

   wParam = lpzMessage

   lParam = SM_* flag

   Returns: 0 if the popup was shown, -1 in case of failure.

 }

-  MS_POPUP_SHOWMESSAGE :PAnsiChar = 'PopUp/ShowMessage';

-  MS_POPUP_SHOWMESSAGEW:PAnsiChar = 'PopUp/ShowMessageW';

+  MS_POPUP_SHOWMESSAGE :PAnsiChar = 'Popup/ShowMessage';

+  MS_POPUP_SHOWMESSAGEW:PAnsiChar = 'Popup/ShowMessageW';

 

-{ PopUp/RegisterActions

+{ Popup/RegisterActions

 Registers your action in popup action list

 

 wParam = (WPARAM)(LPPOPUPACTION)actions

@@ -310,7 +310,7 @@ lParam = (LPARAM)actionCount
 

 Returns: 0 if the popup was shown, -1 in case of failure.

 }

-  MS_POPUP_REGISTERACTIONS:PAnsiChar = 'PopUp/RegisterActions';

+  MS_POPUP_REGISTERACTIONS:PAnsiChar = 'Popup/RegisterActions';

 

 //------------- Class API ----------------//

 

@@ -333,8 +333,8 @@ const
 

 // wParam = 0

 // lParam = (POPUPCLASS *)&pc

-  MS_POPUP_REGISTERCLASS = 'PopUp/RegisterClass';

-  MS_POPUP_UNREGISTERCLASS = 'PopUp/UnregisterClass';

+  MS_POPUP_REGISTERCLASS = 'Popup/RegisterClass';

+  MS_POPUP_UNREGISTERCLASS = 'Popup/UnregisterClass';

 

 type

   TPOPUPDATACLASS = record

@@ -350,7 +350,7 @@ type
 const

 // wParam = 0

 // lParam = (POPUPDATACLASS *)&pdc

-  MS_POPUP_ADDPOPUPCLASS = 'PopUp/AddPopupClass';

+  MS_POPUP_ADDPOPUPCLASS = 'Popup/AddPopupClass';

 

 (* OLD

 {

@@ -360,7 +360,7 @@ const
   would became able to choose skin for your popups independently from others)

 

   You have to register popup class before using it. To do so call

-  "PopUp/AddClass" with lParam = (LPARAM)(const AnsiChar * )popUpClassName.

+  "Popup/AddClass" with lParam = (LPARAM)(const AnsiChar * )popUpClassName.

 

   All class names are translated (via Translate()) before being added to list.

   You should use english names for them.

@@ -370,12 +370,12 @@ const
   Note that you can add clases after popup wal loaded, e.g. you shoul intercept

   ME_SYSTEM_MODULESLOADED event

 }

-  MS_POPUP_ADDCLASS = 'PopUp/AddClass';

+  MS_POPUP_ADDCLASS = 'Popup/AddClass';

 

   POPUP_CLASS_DEFAULT = 'Default';

   POPUP_CLASS_WARNING = 'Warning';

   POPUP_CLASS_NOTIFY  = 'Notify';

-  POPUP_CLASS_OLDAPI  = 'PopUp 1.0.1.x compatability'; // for internal purposes

+  POPUP_CLASS_OLDAPI  = 'Popup 1.0.1.x compatability'; // for internal purposes

 

 const

   NFOPT_POPUP2_BACKCOLOR    = 'Popup2/BackColor';

diff --git a/langpacks/belarusian/=DUPES=.txt b/langpacks/belarusian/=DUPES=.txt
index 31d5c055c6..780d685528 100644
--- a/langpacks/belarusian/=DUPES=.txt
+++ b/langpacks/belarusian/=DUPES=.txt
@@ -354,7 +354,7 @@ xСтату� %s
 Выключаны

 [Disconnects]

 �дключ�нні

-[Dismiss PopUp]

+[Dismiss Popup]

 Зачыніць

 [Dismiss]

 Прыбраць

@@ -462,7 +462,7 @@ E-Mail
 С�бры

 [From popup plugin]

 Па змаўчанні

-[From PopUp plugin]

+[From Popup plugin]

 Па змаўчанні

 [From]

 �д

@@ -846,13 +846,13 @@ E-Mail
 У�плывальнае акно

 [Popup timeout:]

 Прац�гла�ць:

-[PopUp]

+[Popup]

 У�плывальнае акно

 [Popup]

 У�плывальны� вокны

 [Popups]

 У�плывальны� вокны

-[PopUps]

+[Popups]

 У�плывальны� вокны

 [Port]

 Порт

@@ -1034,7 +1034,7 @@ E-Mail
 Вый�ці ўдзельнікаў

 [Show popup]

 Паказваць у�пл. акно

-[Show PopUps when I connect]

+[Show Popups when I connect]

 Вокны пры злуч�нні

 [Show popups]

 Паказваць вокны

@@ -1346,7 +1346,7 @@ Web �таронка
 Кнопкі мышы

 [Popup Delay]

 Затрымка акна

-[PopUp Options]

+[Popup Options]

 У�плывальны� вокны

 [Popup Title]

 Загаловак акна

@@ -2084,7 +2084,7 @@ ID кары�тача:
 Паказаць запраш�нні да гульні

 [as events in the contact list]

 падзе�мі ў �пі�е кантактаў

-[in PopUp windows]

+[in Popup windows]

 у ў�плывальных вокнах

 [Load &skin...]

 Загрузіць &�кін...

@@ -3324,17 +3324,17 @@ Web Дызайн
 Вонкава� гі�торы�

 [Internal History]

 Унутрана� гі�торы�

-[PopUp Notify]

+[Popup Notify]

 �пав�шч�нне у�пл. вокнамі

-[PopUp Enabled]

+[Popup Enabled]

 У�пл. вокны ўключаны

-[PopUp Disabled]

+[Popup Disabled]

 У�пл. вокны адключаны

 [Enable/Disable external logging for this contact]

 Уключыць/выключыць запі� у вонкавы лог дл� г�тага кантакту

 [Maximum entries]

 Запі�аў

-[PopUp text]

+[Popup text]

 Т�к�т акна

 [Enable/Disable internal logging for this contact]

 Уключыць/выключыць запі� у ўнутраны лог дл� г�тага кантакту

@@ -3348,7 +3348,7 @@ Web Дызайн
 Гі�торы�

 [Log format]

 Фармат Журнала

-[PopUp display time]

+[Popup display time]

 Гадзіна адлю�траванн� акна

 [Temporarily disable Popups]

 Ча�ова выключыць вокны

@@ -3512,7 +3512,7 @@ Web Дызайн
 Выключыць апав�шч�нні пра змену �тату�у

 [Enable status &notification]

 Уключыць апав�шч�нні пра змену �тату�у

-[Automatically turn off PopUps and Sounds on status change]

+[Automatically turn off Popups and Sounds on status change]

 Выключыць вокны і гукі пры змене �тату�у

 [Configure]

 �аладзіць

@@ -3528,8 +3528,8 @@ Web Дызайн
 &Паказваць пап�р�дні �тату�

 [&Log status changes to file]

 Запі�ваць змены �тату�у ў файл

-[&From PopUp plugin]

-У�талёўкі PopUp

+[&From Popup plugin]

+У�талёўкі Popup

 [&Custom]

 �аладзіць

 [P&ermanent]

@@ -3714,11 +3714,11 @@ xСтату�ы
 Толькі адно вакно на кантакт

 [Show &entry in the main menu]

 Пункт у галоўным меню

-[PopUp timeout (is typing)]

+[Popup timeout (is typing)]

 Прац�гла�ць (набірае)

 [From protocol]

 З пратаколу

-[PopUp timeout (stopped typing)]

+[Popup timeout (stopped typing)]

 Прац�гла�ць (�кончыў набіраць)

 [...is typing a message.]

 ... набірае т�к�т.

diff --git a/langpacks/belarusian/LinkList.txt b/langpacks/belarusian/LinkList.txt
index 6af2691484..9ed7199245 100644
--- a/langpacks/belarusian/LinkList.txt
+++ b/langpacks/belarusian/LinkList.txt
@@ -92,7 +92,7 @@ http://svn.miranda-ng.org/main/trunk/langpacks/belarusian/Plugins/PackUpdater.tx
 http://svn.miranda-ng.org/main/trunk/langpacks/belarusian/Plugins/PasteIt.txt

 http://svn.miranda-ng.org/main/trunk/langpacks/belarusian/Plugins/PluginUpdater.txt

 http://svn.miranda-ng.org/main/trunk/langpacks/belarusian/Plugins/PManagerEx.txt

-http://svn.miranda-ng.org/main/trunk/langpacks/belarusian/Plugins/PopUp.txt

+http://svn.miranda-ng.org/main/trunk/langpacks/belarusian/Plugins/Popup.txt

 http://svn.miranda-ng.org/main/trunk/langpacks/belarusian/Plugins/QuickContacts.txt

 http://svn.miranda-ng.org/main/trunk/langpacks/belarusian/Plugins/QuickMessages.txt

 http://svn.miranda-ng.org/main/trunk/langpacks/belarusian/Plugins/QuickReplies.txt

diff --git a/langpacks/belarusian/Plugins/BuddyExpectator.txt b/langpacks/belarusian/Plugins/BuddyExpectator.txt
index e6f928f83f..1220020cef 100644
--- a/langpacks/belarusian/Plugins/BuddyExpectator.txt
+++ b/langpacks/belarusian/Plugins/BuddyExpectator.txt
@@ -72,7 +72,7 @@
 [Enable "Miss you" feature]

 Уключыць функцыю "Чакаю ц�бе"

 [Use Popups colors]

-Колеры PopUp

+Колеры Popup

 [weeks]

 тыдн�ў

 [months]

diff --git a/langpacks/belarusian/Plugins/ChangeKeyboardLayout.txt b/langpacks/belarusian/Plugins/ChangeKeyboardLayout.txt
index 524368b53d..0c9213870f 100644
--- a/langpacks/belarusian/Plugins/ChangeKeyboardLayout.txt
+++ b/langpacks/belarusian/Plugins/ChangeKeyboardLayout.txt
@@ -37,7 +37,7 @@
 Зм�н�ць пры:

 [Log operations]

 Дзе�нні над ча�опі�ам

-[Show result in PopUp]

+[Show result in Popup]

 Паказаць вынік у акне

 [Layout of text is the current layout]

 Ра�кладка т�к�ту г�та б�гуча� ра�кладка

@@ -49,7 +49,7 @@
 Інвертаваць р�гі�тр

 [Changing Layout]

 Змена ра�кладкі

-[PopUp colours]

+[Popup colours]

 Колеры у�пл. вокнаў

 [Windows colours]

 Колеры Windows

diff --git a/langpacks/belarusian/Plugins/MRA.txt b/langpacks/belarusian/Plugins/MRA.txt
index 39ca1fb697..3216e4f300 100644
--- a/langpacks/belarusian/Plugins/MRA.txt
+++ b/langpacks/belarusian/Plugins/MRA.txt
@@ -271,7 +271,7 @@ MraFilesQueueConnectionReceived: уваходнае далучÑ�нне прынÑ
 Памер блока пры адпраўцы:

 [512 - 65536 bytes]

 512 - 65536 байт

-[PopUp type]

+[Popup type]

 Тып акна

 [Popup settings]

 �алады ў�плывальнага акна

diff --git a/langpacks/belarusian/Plugins/NewEventNotify.txt b/langpacks/belarusian/Plugins/NewEventNotify.txt
index 882f3cb6d4..719873204e 100644
--- a/langpacks/belarusian/Plugins/NewEventNotify.txt
+++ b/langpacks/belarusian/Plugins/NewEventNotify.txt
@@ -2,8 +2,8 @@
 ;  File: NewEventNotify.dll

 ;  Module: NewEventNotify

 

-[Notifies you when you receive a message, url, file or any other event by displaying a popup. Uses the PopUp-Plugin by hrk. Original plugin was written by icebreaker, modified by Prezes and some bugfixes were made by vj, vlko, Nightwish, TheLeech and others. More fixes & updates by Joe @ Whale.]

-�пав�шчае пра атрыманне паведамленн�, URL, файла ці іншай падзеі, адлю�троўваючы інфармацыю ва ў�плывальных вокнах. Дл� працы неабходзен PopUp ад Luca Santarelli ці аналагічны.

+[Notifies you when you receive a message, url, file or any other event by displaying a popup. Uses the Popup-Plugin by hrk. Original plugin was written by icebreaker, modified by Prezes and some bugfixes were made by vj, vlko, Nightwish, TheLeech and others. More fixes & updates by Joe @ Whale.]

+�пав�шчае пра атрыманне паведамленн�, URL, файла ці іншай падзеі, адлю�троўваючы інфармацыю ва ў�плывальных вокнах. Дл� працы неабходзен Popup ад Luca Santarelli ці аналагічны.

 [You were added!]

 Ва� дадалі

 [Requests your authorisation]

@@ -35,7 +35,7 @@
 [No popups for RSS contacts]

 Выключыць дл� RSS навін

 [Use OSD plugin instead of popups]

-Выкары�тоўваць модуль OSD заме�т PopUp

+Выкары�тоўваць модуль OSD заме�т Popup

 [Hide Popup when sending new message]

 Хаваць пры адпраўцы новага паведамленн�

 [Last message display first]

@@ -48,7 +48,7 @@
 Выключыць дл� прачытаных

 [Number of begin shown messages]

 Колька�ць паведамленн�ў дл� пачатку паказу

-[Show entry in the PopUps menu]

+[Show entry in the Popups menu]

 Пункт у меню "Ў�плывальны� вокны"

 [Show Headers]

 Загалоўкі

diff --git a/langpacks/belarusian/Plugins/PopUp.txt b/langpacks/belarusian/Plugins/PopUp.txt
index de3a18b9ed..ab9b6842ff 100644
--- a/langpacks/belarusian/Plugins/PopUp.txt
+++ b/langpacks/belarusian/Plugins/PopUp.txt
@@ -1,6 +1,6 @@
 #muuid {26a9125d-7863-4e01-af0e-d14ef95c5054}

 ;  File: popup.dll

-;  Module: Popup Interoperability, PopUp Plus

+;  Module: Popup Interoperability, Popup Plus

 [Popup Mode: Auto]

 Р�жым у�плывальных вокнаў: па змаўчанні

 [Popup Mode: Favourtite]

@@ -113,11 +113,11 @@ History++ дл� гі�торыі вокнаў
 �длю�троўваць ча�

 [Show s&econd line]

 Паказваць другі радок

-[En&large PopUps by]

+[En&large Popups by]

 &Пав�лічваць вокны на

 [&Dynamically resize the popups]

 Сапраўды &падбіраць памер вокнаў

-[A&nimate PopUps (98/ME/2000/XP)]

+[A&nimate Popups (98/ME/2000/XP)]

 �німацы� вокнаў (98/ME/2000/XP)

 [Fade &in/out (2000/XP)]

 Плыўны паказ (2000/XP)

@@ -153,7 +153,7 @@ History++ дл� гі�торыі вокнаў
 ... пло�кі �тыль

 [Miscellanea]

 Іншае

-[PopUp Delay (seconds)]

+[Popup Delay (seconds)]

 �кно бачнае (�екунд)

 [Hey, this is a status message!]

 Прывітанне, г�та паведамленне пра змену �тату�у!

@@ -195,7 +195,7 @@ History++ дл� гі�торыі вокнаў
 Заў�ёды

 [Never show]

 �іколі

-[Reorder PopUps]

+[Reorder Popups]

 Перам�шчаць вокны

 [&Minimum width]

 &Мінімальна� шырын�

@@ -221,7 +221,7 @@ History++ дл� гі�торыі вокнаў
 Выключыць у�плывальны� вокны

 [Enable &popup module]

 Уключыць у�плывальны� вокны

-[Concurrent PopUps]

+[Concurrent Popups]

 �екалькі вокнаў

 [Use multiple threads]

 �екалькі �трумен�ў

@@ -237,13 +237,13 @@ History++ дл� гі�торыі вокнаў
 Колер фону

 [Default text colour]

 Колер т�к�ту

-[A&nimate PopUps]

+[A&nimate Popups]

 �німацы� вокнаў

 [Slide popups while rordering]

 Зрушваць пры пера�артаванні

 [Infinite popup delay]

 �е зачын�ць вокны

-[Disable PopUps when fullscreen]

+[Disable Popups when fullscreen]

 Выкл. у поўна�кранным р�жыме

 [Do not close hovered popups]

 �е зачын�ць вокны пад кур�орам

@@ -273,7 +273,7 @@ History++ дл� гі�торыі вокнаў
 BBCode ([b]..[/b] - тоў�ты)

 [Truncate very long lines]

 �бразаць доўгі� радкі

-[PopUps drop shadow (WinXP+)]

+[Popups drop shadow (WinXP+)]

 Цень ад вокнаў (WinXP)

 [Skin preferences]

 �алады �кіна

@@ -486,16 +486,16 @@ BBCode ([b]..[/b] - тоў�ты)
 [Show headerbar]

 Пан�ль загалоўка

 [...skin for old plugins]

-...�кіны дл� �тарых вер�ій PopUp

-[PopUp class:]

-Кла�ы PopUp:

-[PopUp Interoperability]

+...�кіны дл� �тарых вер�ій Popup

+[Popup class:]

+Кла�ы Popup:

+[Popup Interoperability]

 Сум�шчальны� ў�плывальны� вокны

-[Provides a common PopUp interface for different plugins. Development of famous PopUp seems to be stopped so this is an update for  Luca Santarelli`s PopUp. Now it supports wrapping and emoticons ;). But this is just alpha-version and so contains lots of bugs :(]

+[Provides a common Popup interface for different plugins. Development of famous Popup seems to be stopped so this is an update for  Luca Santarelli`s Popup. Now it supports wrapping and emoticons ;). But this is just alpha-version and so contains lots of bugs :(]

 Дапаўн�е ў�плывальны інт�рфей� дл� розных модул�ў да праграмы. Развіццё в�домага ў�плывальнага модул� будзе �пынена. Г�та абнаўленне ад Luca Santarelli . Зараз �но падтрымлівае перано� і дадатковы� значкі. Г�та альфа вер�і� і таму ўтрымоўвае ў �абе шмат памылак. Пераклад Homeric, Radion

 [Reload skins]

 �бнавіць �пі�

-[Using SmileyAdd's settings is preferred due to bugs in internal MSL loading code. Also it allows you to select the same emoticons both for PopUp and message dialog.]

+[Using SmileyAdd's settings is preferred due to bugs in internal MSL loading code. Also it allows you to select the same emoticons both for Popup and message dialog.]

 SmileyAdd пераважней з-за д�фектаў ва ўнутраным MSL кодзе. Г�та дазвал�е вам выбіраць ты� ж значкі дл� ў�плывальных вокнаў і ды�логу ў паведамленн�х.

 [Show colours in text bloc]

 Паказваць колеры ў т�к�тавым блоку

diff --git a/langpacks/belarusian/Plugins/SMCN.txt b/langpacks/belarusian/Plugins/SMCN.txt
index df3e24e4c7..b87eaaf6f3 100644
--- a/langpacks/belarusian/Plugins/SMCN.txt
+++ b/langpacks/belarusian/Plugins/SMCN.txt
@@ -10,9 +10,9 @@
 Гі�торы� �татутных паведамленн�ў

 [List Contacts with Status Message]

 Стату�.паведамленні кантактаў

-[Disable SMCN PopUps]

+[Disable SMCN Popups]

 Выкл. у�пл. акна пра змену �тату�у

-[Enable SMCN PopUps]

+[Enable SMCN Popups]

 Вкл. у�пл. акна пра змену �тату�у

 [Status Message Changed]

 Статутнае паведамленне зм�ніла��

diff --git a/langpacks/belarusian/Plugins/SecureIM.txt b/langpacks/belarusian/Plugins/SecureIM.txt
index 7b6cf51808..4459a4e54a 100644
--- a/langpacks/belarusian/Plugins/SecureIM.txt
+++ b/langpacks/belarusian/Plugins/SecureIM.txt
@@ -87,7 +87,7 @@ UIN/E-mail/JID/Кампутар
 Індыкатар у імі

 [Indicator :]

 Індыкатар :

-[SecureIM PopUp Colors]

+[SecureIM Popup Colors]

 Колеры ў�плывальных паведамленн�ў SecureIM

 [Key agreement colors]

 �бмен ключамі

@@ -109,7 +109,7 @@ UIN/E-mail/JID/Кампутар
 Заў�ёды �прабаваць

 [Key Exchange Timeout :]

 Ча� абмену ключамі :

-[PopUp Timeout]

+[Popup Timeout]

 Прац�гла�ць

 [Time in Seconds]

 Ча� (з)

@@ -131,7 +131,7 @@ UIN/E-mail/JID/Кампутар
 Стварыць SecureIM злуч�нне

 [Enable Secure File Transfer]

 Уключыць шыфроўку файлаў

-[0 = Default PopUp Timeout Value]

+[0 = Default Popup Timeout Value]

 0 = Па змаўчанні 

 [SecureIM 1.0.4.4]

 Шыфраванне паведамленн�ў

diff --git a/langpacks/belarusian/Plugins/SeenPlugin.txt b/langpacks/belarusian/Plugins/SeenPlugin.txt
index cbaf3e97e5..0d4efa83fc 100644
--- a/langpacks/belarusian/Plugins/SeenPlugin.txt
+++ b/langpacks/belarusian/Plugins/SeenPlugin.txt
@@ -97,7 +97,7 @@
 �пошн�е з'�ўленне

 [Reset colors]

 Скід кветак

-[PopUp Colors]

+[Popup Colors]

 Колеры вокнаў

 [Use popups]

 У�пл. акна

diff --git a/langpacks/belarusian/Plugins/WUMF.txt b/langpacks/belarusian/Plugins/WUMF.txt
index 2188ee3b9d..da8f9d18eb 100644
--- a/langpacks/belarusian/Plugins/WUMF.txt
+++ b/langpacks/belarusian/Plugins/WUMF.txt
@@ -1,7 +1,7 @@
 #muuid {80dca515-973a-4a7e-8b85-5d8ec88fc5a7}

 ;  File: wumf.dll

 ;  Module: Who Uses My Files

-[Scans for network users of your shared files and notify you with popups. Uses PopUps Interoperability by Luca Santarelli. PopUps plugin must be activated!]

+[Scans for network users of your shared files and notify you with popups. Uses Popups Interoperability by Luca Santarelli. Popups plugin must be activated!]

 Скануе �етку ў пошуках кары�тачоў, �кі� выкары�тоўваюць вашы файлы, адкрыты� дл� до�тупу па �етцы і апав�шчае ў�плывальнымі вокнамі.

 [WUMF: Who Use My Files?]

 Хто выкары�тоўвае мае файлы?

@@ -12,19 +12,19 @@ WUMF: Паказаць падлуч�нні
 [Enable WUMF popups]

 Уключыць WUMF вокны

 [Popup color settings]

-�алады колеру PopUp

+�алады колеру Popup

 [Choose colors]

 �браць колер

-[Use default PopUp colors]

-Колеры PopUp

+[Use default Popup colors]

+Колеры Popup

 [Popup delay settings]

-�алады паказу PopUp

+�алады паказу Popup

 [Choose delay time]

 �аладзіць �амому

 [Show infinitely]

 Уве�ь ча�

-[Default PopUp delay]

-Як у PopUp

+[Default Popup delay]

+Як у Popup

 [File access filter && logging settings]

 �алады фільтраў ча�опі�а

 [Log into text file]

diff --git a/langpacks/belarusian/Plugins/Weather.txt b/langpacks/belarusian/Plugins/Weather.txt
index 54b50cb7d1..94690ce9b5 100644
--- a/langpacks/belarusian/Plugins/Weather.txt
+++ b/langpacks/belarusian/Plugins/Weather.txt
@@ -35,7 +35,7 @@
 Вонкавы файл

 [Other Options]

 Іншы� налады

-[Disable PopUp for this station]

+[Disable Popup for this station]

 �е выводзіць у�плывальнае акно

 [Brief Info]

 Коратка

@@ -369,7 +369,7 @@ HTTP падлуч�нне Weather
 �алада �па�ылак

 [Do not display weather condition as protocol status]

 �е паказваць �тан надвор'� �к �татут пратаколу

-[PopUp Text]

+[Popup Text]

 У�плывальны т�к�т

 [Weather Protocol Text Options]

 Шаблоны ды�логаў надвор'� 

diff --git a/langpacks/belarusian/Plugins/tabsrmm.txt b/langpacks/belarusian/Plugins/tabsrmm.txt
index eb9125bf42..e6aa4c5417 100644
--- a/langpacks/belarusian/Plugins/tabsrmm.txt
+++ b/langpacks/belarusian/Plugins/tabsrmm.txt
@@ -1370,7 +1370,7 @@ ID кары�тача ў пан�лі �тату�у
 [tabSRMM Information]

 Інфармацы� tabSRMM

 [U&se Popup colours]

-Колер плагіна PopUp

+Колер плагіна Popup

 [Contact not on list. You may add it...]

 Кантакт не ў �пі�е. Вы можаце дадаць �го...

 [\n\nClient: ]

@@ -1451,8 +1451,8 @@ ID кары�тача ў пан�лі �тату�у
 ...піша

 [...stopped typing]

 ...�кончыў пі�аць

-[PopUps timeout]

-Паўза дл� вакна PopUp

+[Popups timeout]

+Паўза дл� вакна Popup

 [About tabSRMM]

 Пра TabSRMM

 [No Message Sessions opened]

diff --git a/langpacks/bulgarian/langpack_bulgarian.txt b/langpacks/bulgarian/langpack_bulgarian.txt
index aa64afb195..e9bd377770 100644
--- a/langpacks/bulgarian/langpack_bulgarian.txt
+++ b/langpacks/bulgarian/langpack_bulgarian.txt
@@ -18,7 +18,7 @@ Plugins-included: advaimg, aim, avs, clist_modern, clist_mw, clist_nicer, dbchec
 ; Äîìàøíà ñòðàíèöà: http://polzvam.info/

 

 ; D:\Translation\MirandaNG\SVN\trunk\include\m_popup.h

-[PopUps]

+[Popups]

 ÐopUps

 

 ; D:\Translation\MirandaNG\SVN\trunk\plugins\!Deprecated\NewAwaySysMod\AwayOpt.cpp

@@ -320,8 +320,8 @@ Tahoma
 Ïðåäóïðåæäåíèå

 [Notify]

 Óâåäîìÿâàíå

-[PopUp 1.0.1.x compatability]

-Ñúâìåñòèìîñò ñ PopUp 1.0.1.x

+[Popup 1.0.1.x compatability]

+Ñúâìåñòèìîñò ñ Popup 1.0.1.x

 

 ; D:\Translation\MirandaNG\SVN\trunk\plugins\!NotAdopted\Skype\Skript1.rc

 [Set]

@@ -584,8 +584,8 @@ AM/PM
 Ïðèåìàíå

 [Show]

 Ïîêàçâàíå

-[&From PopUp plugin]

-Îò ïðèñòàâêàòà PopUp

+[&From Popup plugin]

+Îò ïðèñòàâêàòà Popup

 [&Custom]

 Èçáîð

 [P&ermanent]

@@ -1528,8 +1528,8 @@ Miranda NG å çàêëþ÷åíà.\nÂúâåäåòå ïàðîëàòà çà îòêëþ÷âàíå.
 Äâóïîñî÷íà ñìÿíà (åêñïåðèìåíòàëíî)

 [Copy result to clipboard]

 Êîïèðàíå íà ðåçóëòàòà â êëèïáîðäà

-[Show result in PopUp]

-Ïîêàçâàíå íà ðåçóëòàòà â PopUp

+[Show result in Popup]

+Ïîêàçâàíå íà ðåçóëòàòà â Popup

 [Strings for keyboard layouts]

 Íèçîâå çà êëàâèàòóðíèòå ïîäðåäáè

 [Invert current state]

@@ -1550,8 +1550,8 @@ Miranda NG å çàêëþ÷åíà.\nÂúâåäåòå ïàðîëàòà çà îòêëþ÷âàíå.
 Íàçàä

 [Timeout]

 Âðåìåòðàåíå

-[From PopUp plugin]

-Îò PopUp ïðèñòàâêàòà

+[From Popup plugin]

+Îò Popup ïðèñòàâêàòà

 [Copy to clipboard]

 Çàïèñ â êëèïáîðäà

 

@@ -3577,7 +3577,7 @@ Database Editor++ Òúðñåíå è çàìåñòâàíå
 [Warn when deleting modules]

 Ïðåäóïðåæäåíèå ïðè èçòðèâàíå íà ìîäóë

 [Use popups when watched settings change values]

-Óâåäîìÿâàíå ñ PopUp ïðè ïðîìÿíà íà íàáëþäàâàíà ñòîéíîñò

+Óâåäîìÿâàíå ñ Popup ïðè ïðîìÿíà íà íàáëþäàâàíà ñòîéíîñò

 [Modules to ALWAYS mark as known (e.g core modules)]

 Ìîäóëè, êîèòî ÂÈÍÀÃÈ ùå áúäàò ìàðêèðàíè êàòî ïîçíàòè

 [Put a space or comma between each module name]

@@ -5353,7 +5353,7 @@ OTR ñúçäàâàíå íà íîâ ÷àñòåí êëþ÷
 [Show OTR system messages inline]

 Ïîêàçâàíå íà OTR ñèñòåìíèòå ñúîáùåíèÿ â ïðîçîðåöà çà ñúîáùåíèÿ

 [Show OTR system messages as popup]

-Ïîêàçâàíå íà OTR ñèñòåìíèòå ñúîáùåíèÿ êàòî PopUp

+Ïîêàçâàíå íà OTR ñèñòåìíèòå ñúîáùåíèÿ êàòî Popup

 [Show verification dialog when receiving unverified fingerprint]

 Èçèñêâàíå íà ïîòâúðæäàâàíå ïðè ïîëó÷àâàíå íà íåïîòâúðäåí îòïå÷àòúê

 [Set OTR policy per protocol]

@@ -5723,7 +5723,7 @@ popup ñ òåêñò çà ñúñòîÿíèå
 

 ; D:\Translation\MirandaNG\SVN\trunk\plugins\NewEventNotify\res\resource.rc

 [Popup Options]

-PopUp íàñòðîéêè

+Popup íàñòðîéêè

 [Dismiss Popup]

 Çàòâàðÿíå íà Popup

 

@@ -5787,7 +5787,7 @@ PopUp íàñòðîéêè
 [Use custom colours]

 Çàäàäåíè öâåòîâå

 [Use Popup colours]

-Îò PopUp ïðèñòàâêàòà

+Îò Popup ïðèñòàâêàòà

 [Popup text]

 Òåêñò íà Popup-à

 [Show previous status too]

@@ -6025,7 +6025,7 @@ PopUp íàñòðîéêè
 [Use &Windows colours]

 Öâåòîâå îò Windows

 [Use Pop&up colours]

-Îò PopUp ïðèñòàâêàòà

+Îò Popup ïðèñòàâêàòà

 [Boxes]

 Êóòèè

 

@@ -7188,8 +7188,8 @@ Unicode å èçêëþ÷åí
 Ïðîòîêîëè çà íàáëþäàâàíå:

 [Use popups]

 Ïîëçâàíå íà popups

-[PopUp Colors]

-PopUp öâåòîâå

+[Popup Colors]

+Popup öâåòîâå

 [Reset colors]

 Àíóëèðàíå

 [You missed following contacts:]

@@ -7933,7 +7933,7 @@ StopSpam: èçïðàòåòå ñúîáùåíèå è îòãîâîðåòå íà âúïðîñà. /English: send a message
 [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 ïðèñòàâêà.

+Ñèñòåìàòà çà óâåäîìÿâàíå å íåàêòèâíà, çàùîòî íå å îòêðèòà ñúâìåñòèìà Popup ïðèñòàâêà.

 [All modes]

 Âñè÷êè ðåæèìè

 [Choose modes]

@@ -8159,19 +8159,19 @@ Windows Aero - íàñòðîéêè
 [...stopped t&yping]

 ... ñïðÿ äà ïèøå

 [U&se Popup colours]

-Öâåòîâå îò PopUp ïðèñòàâêàòà

+Öâåòîâå îò Popup ïðèñòàâêàòà

 [&Use Windows colours]

 Öâåòîâå îò Windows

 [Only &one popup for each contact]

 Ïî åäèí popup íà êîíòàêò

 [Show &entry in the main menu]

 Äîáàâÿíå íà åëåìåíò â ãëàâíîòî ìåíþ

-[PopUp timeout (is typing)]

-PopUp âðåìåòðàåíå (ïèøå)

+[Popup timeout (is typing)]

+Popup âðåìåòðàåíå (ïèøå)

 [From protocol]

 Îò ïðîòîêîëà

-[PopUp timeout (stopped typing)]

-PopUp âðåìåòðàåíå (ñïðÿ äà ïèøå)

+[Popup timeout (stopped typing)]

+Popup âðåìåòðàåíå (ñïðÿ äà ïèøå)

 [Edit template]

 Ðåäàêòèðàíå íà øàáëîíà

 [Double click a template to edit it. Select a template from the list box and click "Update Preview" to show a preview message.]

@@ -9279,9 +9279,9 @@ tabSRMM ñúîáùåíèå (%s)
 [Enable &typing notification]

 Âêëþ÷âàíå íà óâåäîìÿâàíèÿòà ïðè ïèñàíå

 [Warning: Popup plugin not found.]

-Âíèìàíèå: Íå å îòêðèòà PopUp ïðèñòàâêà.

+Âíèìàíèå: Íå å îòêðèòà Popup ïðèñòàâêà.

 [Warning: Current Popup plugin version is not supported.]

-Âíèìàíèå: Âåðñèÿòà íà PopUp ïðèñòàâêàòà íå ñå ïîääúðæà.

+Âíèìàíèå: Âåðñèÿòà íà Popup ïðèñòàâêàòà íå ñå ïîääúðæà.

 [...is typing a message.]

 ...ïèøå ñúîáùåíèå.

 [...has stopped typing.]

@@ -15141,7 +15141,7 @@ Xml ôàéëîâå (*.xml)
 

 ; D:\Translation\MirandaNG\SVN\trunk\protocols\Twitter\res\twitter.rc

 [Use Popup colors]

-Öâåòîâå îò PopUp ïðèñòàâêàòà

+Öâåòîâå îò Popup ïðèñòàâêàòà

 [Use custom colors]

 Èçáîð íà öâåòîâå

 [Timeouts]

@@ -15232,10 +15232,10 @@ URL çà îùå èíô.
 Çàäàâàíå êàòî ñòàíäàðòíà ñòàíöèÿ

 [Disable automatic update for this station]

 Áåç àâòîìàòè÷íî îáíîâÿâàíå çà ìåòåîñòàíöèÿòà

-[Disable PopUp for this station]

-Áåç PopUp çà ñòàíöèÿòà

-[PopUp Options]

-PopUp íàñòðîéêè

+[Disable Popup for this station]

+Áåç Popup çà ñòàíöèÿòà

+[Popup Options]

+Popup íàñòðîéêè

 [Popup only when condition changes]

 Popup ñàìî ïðè ïðîìÿíà íà óñëîâèÿòà

 [Popup Actions]

@@ -15292,8 +15292,8 @@ Popup òåêñò
 Îáùî èçïîëçâàíà ïàìåò

 [Reload INI]

 Ïðåçàðåæäàíå

-[Dismiss PopUp]

-Çàòâàðÿíå íà PopUp

+[Dismiss Popup]

+Çàòâàðÿíå íà Popup

 [Open brief information]

 Îòâàðÿíå íà êðàòêà ïðîãíîçà

 [Open complete forecast]

@@ -15715,7 +15715,7 @@ Copyright:
 [Userlist row distance (pixels):]

 Âèñî÷èíà íà ðåä â ñïèñúêà ñ ïðÿêîðè (ïèêñåëà):

 [Popups for the Chat plugin]

-PopUp çà ïðèñòàâêàòà Chat

+Popup çà ïðèñòàâêàòà Chat

 

 ; D:\Translation\MirandaNG\SVN\trunk\src\core\stdchat\src\options.cpp

 [Use a tabbed interface]

diff --git a/langpacks/czech/LinkList.txt b/langpacks/czech/LinkList.txt
index 2f44158cfa..783727e026 100644
--- a/langpacks/czech/LinkList.txt
+++ b/langpacks/czech/LinkList.txt
@@ -96,7 +96,7 @@ http://svn.miranda-ng.org/main/trunk/langpacks/czech/Plugins/PasteIt.txt
 http://svn.miranda-ng.org/main/trunk/langpacks/czech/Plugins/Ping.txt

 http://svn.miranda-ng.org/main/trunk/langpacks/czech/Plugins/PluginUpdater.txt

 http://svn.miranda-ng.org/main/trunk/langpacks/czech/Plugins/PManagerEx.txt

-http://svn.miranda-ng.org/main/trunk/langpacks/czech/Plugins/PopUp.txt

+http://svn.miranda-ng.org/main/trunk/langpacks/czech/Plugins/Popup.txt

 http://svn.miranda-ng.org/main/trunk/langpacks/czech/Plugins/QuickContacts.txt

 http://svn.miranda-ng.org/main/trunk/langpacks/czech/Plugins/QuickMessages.txt

 http://svn.miranda-ng.org/main/trunk/langpacks/czech/Plugins/QuickReplies.txt

diff --git a/langpacks/czech/Plugins/AdvancedAutoAway.txt b/langpacks/czech/Plugins/AdvancedAutoAway.txt
index 03f99d4117..c65c44108e 100644
--- a/langpacks/czech/Plugins/AdvancedAutoAway.txt
+++ b/langpacks/czech/Plugins/AdvancedAutoAway.txt
@@ -154,7 +154,7 @@ Zobrazit při pokusu o navázání spojení
 Zobrazit po úspěšném navázání spojení

 [Show other messages]

 Zobrazit ostatní zprávy

-[From PopUp plugin]

+[From Popup plugin]

 Globální nastavení

 [Custom]

 Vlastní

diff --git a/langpacks/czech/Plugins/AvatarHistory.txt b/langpacks/czech/Plugins/AvatarHistory.txt
index ed7bc2f645..4391eeaeff 100644
--- a/langpacks/czech/Plugins/AvatarHistory.txt
+++ b/langpacks/czech/Plugins/AvatarHistory.txt
@@ -163,7 +163,7 @@ Testovací kontakt
 Testovací popis

 [Avatar]

 Avatar

-[PopUps]

+[Popups]

 Oznámení

 [Avatar Change]

 Změna avataru

diff --git a/langpacks/czech/Plugins/BuddyExpectator.txt b/langpacks/czech/Plugins/BuddyExpectator.txt
index d94067b254..1369f90503 100644
--- a/langpacks/czech/Plugins/BuddyExpectator.txt
+++ b/langpacks/czech/Plugins/BuddyExpectator.txt
@@ -128,7 +128,7 @@ Odstranit kontakt
 

 [Contacts]

 Kontakty

-[PopUps]

+[Popups]

 Oznámení

 [not detected]

 

diff --git a/langpacks/czech/Plugins/ChangeKeyboardLayout.txt b/langpacks/czech/Plugins/ChangeKeyboardLayout.txt
index 1f3caf7198..cc40b2a9ce 100644
--- a/langpacks/czech/Plugins/ChangeKeyboardLayout.txt
+++ b/langpacks/czech/Plugins/ChangeKeyboardLayout.txt
@@ -26,7 +26,7 @@ Možnosti
 

 [Copy result to clipboard]

 

-[Show result in PopUp]

+[Show result in Popup]

 

 [Strings for keyboard layouts]

 

@@ -46,7 +46,7 @@ Výchozí
 

 [Colours]

 Barvy

-[PopUp colours]

+[Popup colours]

 

 [Windows colours]

 

@@ -58,7 +58,7 @@ Pozadí
 Text

 [Timeout]

 Doba zobrazení

-[From PopUp plugin]

+[From Popup plugin]

 Globální nastavení

 [Permanent]

 Trvale

@@ -86,5 +86,5 @@ Oznámení
 

 [Message Sessions]

 Komunikace

-[PopUps]

+[Popups]

 Oznámení

diff --git a/langpacks/czech/Plugins/ClientChangeNotify.txt b/langpacks/czech/Plugins/ClientChangeNotify.txt
index a891fb604b..606b332d27 100644
--- a/langpacks/czech/Plugins/ClientChangeNotify.txt
+++ b/langpacks/czech/Plugins/ClientChangeNotify.txt
@@ -79,7 +79,7 @@ změnil klienta na %s
 Vypnout oznámení o změně klienta

 [Enable c&lient change notification]

 Zapnout oznámení o změně klienta

-[PopUps]

+[Popups]

 Oznámení

 [ClientChangeNotify: Client changed]

 Změna klienta

diff --git a/langpacks/czech/Plugins/Facebook.txt b/langpacks/czech/Plugins/Facebook.txt
index 8a21bd6798..60bceaf63a 100644
--- a/langpacks/czech/Plugins/Facebook.txt
+++ b/langpacks/czech/Plugins/Facebook.txt
@@ -171,7 +171,7 @@ Sítě
 Ú�et

 [Advanced]

 Extra

-[PopUps]

+[Popups]

 Oznámení

 [Events]

 Události

diff --git a/langpacks/czech/Plugins/GTalkExt.txt b/langpacks/czech/Plugins/GTalkExt.txt
index da5e1ca7a0..9c909b09f8 100644
--- a/langpacks/czech/Plugins/GTalkExt.txt
+++ b/langpacks/czech/Plugins/GTalkExt.txt
@@ -47,7 +47,7 @@ Pře�íst poštu
 [You've received an e-mail\n%s unread threads]

 

 ;file \protocols\GTalkExt\src\options.cpp

-[PopUps]

+[Popups]

 Oznámení

 [Network]

 Sítě

diff --git a/langpacks/czech/Plugins/ICQ.txt b/langpacks/czech/Plugins/ICQ.txt
index 40ae7594c8..3cabed560c 100644
--- a/langpacks/czech/Plugins/ICQ.txt
+++ b/langpacks/czech/Plugins/ICQ.txt
@@ -1364,7 +1364,7 @@ Kontakty
 Možnosti

 [Privacy]

 Soukromí

-[PopUps]

+[Popups]

 Oznámení

 ;file \protocols\IcqOscarJ\src\icq_popups.cpp

 [Popup Title]

diff --git a/langpacks/czech/Plugins/KeepStatus.txt b/langpacks/czech/Plugins/KeepStatus.txt
index 15c1649ead..5a30a0a365 100644
--- a/langpacks/czech/Plugins/KeepStatus.txt
+++ b/langpacks/czech/Plugins/KeepStatus.txt
@@ -154,7 +154,7 @@ Zobrazit při pokusu o navázání spojení
 Zobrazit po úspěšném navázání spojení

 [Show other messages]

 Zobrazit ostatní zprávy

-[From PopUp plugin]

+[From Popup plugin]

 Globální nastavení

 [Custom]

 Vlastní

@@ -302,7 +302,7 @@ Obecné
 Extra

 [You broke the Internet!]

 Kole�ko se polámalo!

-[PopUps]

+[Popups]

 Oznámení

 ;file \Plugins\StatusPlugins\commonstatus.cpp

 [I've been away since %time%.]

diff --git a/langpacks/czech/Plugins/MRA.txt b/langpacks/czech/Plugins/MRA.txt
index cdf74e66a2..19ae33575f 100644
--- a/langpacks/czech/Plugins/MRA.txt
+++ b/langpacks/czech/Plugins/MRA.txt
@@ -124,7 +124,7 @@ E-mail:
 

 [Leave empty if you dont want change password]

 

-[PopUp type]

+[Popup type]

 

 [Popup settings]

 

@@ -289,7 +289,7 @@ Menu kontaktu
 Rozšířený stav

 [Custom Status]

 Rozšířený stav

-;file \protocols\MRA\src\MraPopUp.cpp

+;file \protocols\MRA\src\MraPopup.cpp

 [None]

 ---

 [Debug]

@@ -304,7 +304,7 @@ Upozornění
 Chyba

 [NewMail]

 

-[PopUps]

+[Popups]

 Oznámení

 ;file \protocols\MRA\src\MraProto.cpp

 [%s connection]

diff --git a/langpacks/czech/Plugins/NewEventNotify.txt b/langpacks/czech/Plugins/NewEventNotify.txt
index b9fdb938fd..57def13496 100644
--- a/langpacks/czech/Plugins/NewEventNotify.txt
+++ b/langpacks/czech/Plugins/NewEventNotify.txt
@@ -10,7 +10,7 @@
 ;file \plugins\NewEventNotify\res\resource.rc

 [General Options]

 Obecné možnosti

-[Show entry in the PopUps menu]

+[Show entry in the Popups menu]

 Zobrazit i v nabídce Oznámení

 [Temporarily disable Event Popups]

 Do�asně vypnout oznámení

@@ -82,7 +82,7 @@ Rozhovor
 [Message Received]

 

 ;file \plugins\NewEventNotify\src\menuitem.cpp

-[PopUps]

+[Popups]

 Oznámení

 ;file \plugins\NewEventNotify\src\neweventnotify.h

 [Contacts]

diff --git a/langpacks/czech/Plugins/NewXstatusNotify.txt b/langpacks/czech/Plugins/NewXstatusNotify.txt
index 48c7709e9b..34aa1286ef 100644
--- a/langpacks/czech/Plugins/NewXstatusNotify.txt
+++ b/langpacks/czech/Plugins/NewXstatusNotify.txt
@@ -172,7 +172,7 @@ Zrušit
 

 [General]

 Obecné

-[Show PopUps when I connect]

+[Show Popups when I connect]

 Zobrazit oznámení při připojení

 [Ignore empty status messages]

 

@@ -330,7 +330,7 @@ Protokol
 Filtrování

 [Message log]

 Záznam komunikace

-[PopUps]

+[Popups]

 Oznámení

 ;file \plugins\NewXstatusNotify\src\popup.h

 [Open message window]

diff --git a/langpacks/czech/Plugins/Omegle.txt b/langpacks/czech/Plugins/Omegle.txt
index 6f258ffd85..01568c0e63 100644
--- a/langpacks/czech/Plugins/Omegle.txt
+++ b/langpacks/czech/Plugins/Omegle.txt
@@ -13,7 +13,7 @@ Server:
 [Language:]

 Jazyk:

 [Visible name:]

-Zobrazované jméno:

+Viditelné jméno:

 [Meet strangers with common interests (separated by commas):]

 Hledat cizince se spole�nými zájmy (oddělené �árkami):

 [Automatically send this message to stranger after connection:]

@@ -23,7 +23,7 @@ Tento text bude odeslán když napíšete zprávu "/asl":
 [Last used question (Question mode):]

 Poslední použitá otázka (režim otázek):

 [I want Omegle to reuse my questions if they are good enough (Question mode)]

-Chci aby Omegle používalo mé otázky znovu, pokud budou dost dobré (režim otázek):

+Omegle může použít mé otázky znovu, pokud budou dost dobré (režim otázek)

 [Automatically connect to stranger when protocol is turned online]

 Automaticky se připojit k cizinci při přepnutí protokolu do stavu online

 [Automatically connect to another stranger when current disconnects]

diff --git a/langpacks/czech/Plugins/PackUpdater.txt b/langpacks/czech/Plugins/PackUpdater.txt
index 04fea8a935..aa451fa69d 100644
--- a/langpacks/czech/Plugins/PackUpdater.txt
+++ b/langpacks/czech/Plugins/PackUpdater.txt
@@ -82,7 +82,7 @@ sek.
 

 [Boxes]

 

-[PopUps]

+[Popups]

 Oznámení

 ;file \plugins\PackUpdater\Src\Events.cpp

 [Check for pack updates]

diff --git a/langpacks/czech/Plugins/Ping.txt b/langpacks/czech/Plugins/Ping.txt
index d324516f78..9a75d3327b 100644
--- a/langpacks/czech/Plugins/Ping.txt
+++ b/langpacks/czech/Plugins/Ping.txt
@@ -22,7 +22,7 @@ Do souboru
 Název souboru:

 [Network]

 Sítě

-[PopUps]

+[Popups]

 Oznámení

 [Reply]

 Odpovědět

diff --git a/langpacks/czech/Plugins/PluginUpdater.txt b/langpacks/czech/Plugins/PluginUpdater.txt
index 37f2d9abb3..ee0a8c9d3c 100644
--- a/langpacks/czech/Plugins/PluginUpdater.txt
+++ b/langpacks/czech/Plugins/PluginUpdater.txt
@@ -88,7 +88,7 @@ sek.
 

 [Boxes]

 

-[PopUps]

+[Popups]

 Oznámení

 ;file \plugins\PluginUpdater\src\Notifications.cpp

 [Skipped.]

diff --git a/langpacks/czech/Plugins/PopUp.txt b/langpacks/czech/Plugins/PopUp.txt
index 0ceef3089f..349219e30a 100644
--- a/langpacks/czech/Plugins/PopUp.txt
+++ b/langpacks/czech/Plugins/PopUp.txt
@@ -1,7 +1,7 @@
 #muuid {26a9125d-7863-4e01-af0e-d14ef95c5054}

 ;============================================================

-;  File: PopUp.dll

-;  Plugin: PopUp plus

+;  File: Popup.dll

+;  Plugin: Popup plus

 ;  Version: 2.1.1.7

 ;  Authors: MPK, Merlin_de (Luca Santarelli, Victor Pavlychko)

 ;============================================================

@@ -311,7 +311,7 @@ Zapnout oznámení (&globálně)
 Vypnout oznámení (&globálně)

 [Popup Plus]

 Oznámení plus

-[Error: I could not register the PopUp Window class.\r\nThe plugin will not operate.]

+[Error: I could not register the Popup Window class.\r\nThe plugin will not operate.]

 

 ;file \plugins\Popup\src\opt_adv.cpp

 [No effect]

diff --git a/langpacks/czech/Plugins/Quotes.txt b/langpacks/czech/Plugins/Quotes.txt
index 4bdffdf694..b9c7f5fc61 100644
--- a/langpacks/czech/Plugins/Quotes.txt
+++ b/langpacks/czech/Plugins/Quotes.txt
@@ -82,7 +82,7 @@ Barva pozadí
 Barva textu

 [Delay]

 Prodleva

-[From PopUp plugin]

+[From Popup plugin]

 Globální nastavení

 [Custom]

 Vlastní

diff --git a/langpacks/czech/Plugins/SMCN.txt b/langpacks/czech/Plugins/SMCN.txt
index 6362891132..f2c9d637a2 100644
--- a/langpacks/czech/Plugins/SMCN.txt
+++ b/langpacks/czech/Plugins/SMCN.txt
@@ -14,9 +14,9 @@
 

 [List Contacts with Status Message]

 

-[Disable SMCN PopUps]

+[Disable SMCN Popups]

 

-[Enable SMCN PopUps]

+[Enable SMCN Popups]

 

 [Status Message Changed]

 

diff --git a/langpacks/czech/Plugins/Scriver.txt b/langpacks/czech/Plugins/Scriver.txt
index ae0cda835d..c0416e175f 100644
--- a/langpacks/czech/Plugins/Scriver.txt
+++ b/langpacks/czech/Plugins/Scriver.txt
@@ -896,7 +896,7 @@ Vzhled
 

 [Select Folder]

 Vyberte požadovanou složku

-[PopUps]

+[Popups]

 Oznámení

 [Group chats]

 Skupinové rozhovory

diff --git a/langpacks/czech/Plugins/SecureIM.txt b/langpacks/czech/Plugins/SecureIM.txt
index 264bf4ec1b..25d3d974b6 100644
--- a/langpacks/czech/Plugins/SecureIM.txt
+++ b/langpacks/czech/Plugins/SecureIM.txt
@@ -100,17 +100,17 @@ Potvrzení klí�ů
 Šifrované spojení

 [Send/Receive encrypted colors]

 Šifrované odesílání a příjem

-[SecureIM PopUp Colors]

+[SecureIM Popup Colors]

 Nastavení barev

 [Preview]

 Náhled

 [Events]

 Události

-[PopUp Timeout]

+[Popup Timeout]

 Doba zobrazení

 [Time in Seconds]

 Čas v sekundách

-[0 = Default PopUp Timeout Value]

+[0 = Default Popup Timeout Value]

 0 = výchozí hodnota

 [Show a popup on established connection]

 Indikovat vytvoření spojení

@@ -415,7 +415,7 @@ Služby
 

 [Message Popup]

 

-[PopUps]

+[Popups]

 Oznámení

 ;file \plugins\SecureIM\src\svcs_srmm.cpp

 [SecureIM [Native]]

diff --git a/langpacks/czech/Plugins/SeenPlugin.txt b/langpacks/czech/Plugins/SeenPlugin.txt
index 0fe7d8e6f7..a07f5d07f0 100644
--- a/langpacks/czech/Plugins/SeenPlugin.txt
+++ b/langpacks/czech/Plugins/SeenPlugin.txt
@@ -40,7 +40,7 @@ Použít oznámení
 Název

 [Text]

 Text

-[PopUp Colors]

+[Popup Colors]

 Barvy oznámení

 [Online]

 Online

@@ -108,7 +108,7 @@ Naposledy spatřen
 Last Seen - seznam proměnných

 [Contacts]

 Kontakty

-[PopUps]

+[Popups]

 Oznámení

 ;file \plugins\SeenPlugin\src\seen.h

 [%n is %s (%u)]

diff --git a/langpacks/czech/Plugins/StartupStatus.txt b/langpacks/czech/Plugins/StartupStatus.txt
index a76132ceec..70627017a9 100644
--- a/langpacks/czech/Plugins/StartupStatus.txt
+++ b/langpacks/czech/Plugins/StartupStatus.txt
@@ -154,7 +154,7 @@ Zobrazit při pokusu o navázání spojení
 Zobrazit po úspěšném navázání spojení

 [Show other messages]

 Zobrazit ostatní zprávy

-[From PopUp plugin]

+[From Popup plugin]

 Globální nastavení

 [Custom]

 Vlastní

diff --git a/langpacks/czech/Plugins/TabSRMM.txt b/langpacks/czech/Plugins/TabSRMM.txt
index 14e0664c33..5be739f630 100644
--- a/langpacks/czech/Plugins/TabSRMM.txt
+++ b/langpacks/czech/Plugins/TabSRMM.txt
@@ -489,7 +489,7 @@ Nastavení Windows Aero
 Použít Aero UI elementy (pouze pokud není použito vlastní téma)

 [Use Windows 7 task bar enhancements (restart required)]

 Použít Windows 7 vylepšení lišty úloh (vyžadován restart)

-[PopUps]

+[Popups]

 Oznámení

 [...is &typing]

 ... píše zprá&vu

@@ -507,7 +507,7 @@ Pouze jedn&o oznámení na kontakt
 Zobrazit položku v hlavním m&enu

 [...is typing]

 

-[From PopUp plugin]

+[From Popup plugin]

 Globální nastavení

 [From protocol]

 Dle protokolu

@@ -517,7 +517,7 @@ Trvale
 Vlastní

 [...stopped typing]

 

-[PopUps timeout]

+[Popups timeout]

 

 [Templates]

 Å ablony

diff --git a/langpacks/czech/Plugins/Tlen.txt b/langpacks/czech/Plugins/Tlen.txt
index 3198c1a716..ecfe414b64 100644
--- a/langpacks/czech/Plugins/Tlen.txt
+++ b/langpacks/czech/Plugins/Tlen.txt
@@ -81,7 +81,7 @@ Pozadí
 Text

 [Delay]

 Prodleva

-[&From PopUp plugin]

+[&From Popup plugin]

 G&lobální nastavení

 [&Custom]

 &Vlastní

diff --git a/langpacks/czech/Plugins/TooltipNotify.txt b/langpacks/czech/Plugins/TooltipNotify.txt
index bfb410b997..c3985e377b 100644
--- a/langpacks/czech/Plugins/TooltipNotify.txt
+++ b/langpacks/czech/Plugins/TooltipNotify.txt
@@ -83,7 +83,7 @@ Změna stavu (přechod offline)
 Změna stavu (ostatní)

 [Tooltip Notify: Typing]

 Změna stavu (psaní zprávy)

-[PopUps]

+[Popups]

 Oznámení

 [** New contacts **]

 ** nové kontakty **

diff --git a/langpacks/czech/Plugins/TrafficCounter.txt b/langpacks/czech/Plugins/TrafficCounter.txt
index 91fdaa9be5..4d6ae1ccf7 100644
--- a/langpacks/czech/Plugins/TrafficCounter.txt
+++ b/langpacks/czech/Plugins/TrafficCounter.txt
@@ -32,7 +32,7 @@ Barva textu:
 Obnovit výchozí

 [Popup timeout]

 Doba zobrazení

-[From PopUp plugin]

+[From Popup plugin]

 Globální nastavení

 [Custom]

 Vlastní

@@ -95,7 +95,7 @@ Možnosti
 Po�itadlo dat

 [Statistics]

 Statistika

-[PopUps]

+[Popups]

 Oznámení

 ;file \plugins\TrafficCounter\src\statistics.cpp

 [Bytes]

diff --git a/langpacks/czech/Plugins/Twitter.txt b/langpacks/czech/Plugins/Twitter.txt
index 9b1aa16867..0e473deab2 100644
--- a/langpacks/czech/Plugins/Twitter.txt
+++ b/langpacks/czech/Plugins/Twitter.txt
@@ -88,7 +88,7 @@ Avatary
 Sítě

 [Basic]

 Obecné

-[PopUps]

+[Popups]

 Oznámení

 [%s server connection]

 %s - spojení se serverem

diff --git a/langpacks/czech/Plugins/UInfoEx.txt b/langpacks/czech/Plugins/UInfoEx.txt
index 49242759c3..500ffe1f9d 100644
--- a/langpacks/czech/Plugins/UInfoEx.txt
+++ b/langpacks/czech/Plugins/UInfoEx.txt
@@ -140,7 +140,7 @@ Použít barvy Windows
 Použít výchozí barvy

 [Delay]

 Prodleva

-[From PopUp plugin]

+[From Popup plugin]

 Globální nastavení

 [Custom]

 Vlastní

@@ -699,7 +699,7 @@ Kontakty
 Extra

 [Details Dialog]

 Detaily

-[PopUps]

+[Popups]

 Oznámení

 ;file \plugins\UserInfoEx\src\psp_profile.cpp

 [Past]

diff --git a/langpacks/czech/Plugins/Weather.txt b/langpacks/czech/Plugins/Weather.txt
index 9109f26011..1b0d45818e 100644
--- a/langpacks/czech/Plugins/Weather.txt
+++ b/langpacks/czech/Plugins/Weather.txt
@@ -124,13 +124,13 @@ Ostatní možnosti
 Nastavit jako výchozí stanici

 [Disable automatic update for this station]

 Vypnout automatickou aktualizaci

-[Disable PopUp for this station]

+[Disable Popup for this station]

 Vypnout oznámení pro tuto stanici

 [Change]

 Změnit

 [Cancel]

 Zrušit

-[PopUp Options]

+[Popup Options]

 Možnosti oznámení

 [Enable popups]

 Povolit oznámení

@@ -156,7 +156,7 @@ Doba zobrazení
 Prodleva

 [seconds]

 sek.

-[From PopUp plugin]

+[From Popup plugin]

 Globální nastavení

 [Permanent]

 Trvale

@@ -236,7 +236,7 @@ Přidat novou meteorologickou stanici a zavřít dialog
 Město:

 [Menu]

 Menu

-[Dismiss PopUp]

+[Dismiss Popup]

 Zavřít oznámení

 [Open brief information]

 Zobrazit stru�nou předpově�

@@ -458,7 +458,7 @@ Sítě
 Obecné

 [Display]

 Zobrazení

-[PopUps]

+[Popups]

 Oznámení

 [%c\tcurrent condition\n%d\tcurrent date\n%e\tdewpoint\n%f\tfeel-like temp\n%h\ttoday's high\n%i\twind direction\n%l\ttoday's low\n%m\thumidity\n%n\tstation name\n%p\tpressure\n%r\tsunrise time\n%s\tstation ID\n%t\ttemperature\n%u\tupdate time\n%v\tvisibility\n%w\twind speed\n%y\tsun set]

 %c\taktuální předpově�\n%d\taktuální datum\n%e\trosný bod\n%f\tsubj. teplota\n%h\tdenní maximum\n%i\tsměr větru\n%l\tdenní minimum\n%m\tvlhkost\n%n\tnázev stanice\n%p\ttlak\n%r\tvýchod slunce\n%s\tIdentifikátor\n%t\tteplota\n%u\tposl. aktualizace\n%v\tviditelnost\n%w\trychlost větru\n%y\tzápad slunce

diff --git a/langpacks/czech/Plugins/WhoUsesMyFiles.txt b/langpacks/czech/Plugins/WhoUsesMyFiles.txt
index 07ce88b2fa..5c452e3913 100644
--- a/langpacks/czech/Plugins/WhoUsesMyFiles.txt
+++ b/langpacks/czech/Plugins/WhoUsesMyFiles.txt
@@ -14,7 +14,7 @@
 OK

 [Popup delay settings]

 

-[PopUp Delay (seconds)]

+[Popup Delay (seconds)]

 

 [Background color]

 Barva pozadí

@@ -24,7 +24,7 @@ Barva textu
 &Náhled

 [Show infinitely]

 

-[Default PopUp delay]

+[Default Popup delay]

 

 [Choose delay time]

 

@@ -32,13 +32,13 @@ Barva textu
 

 [Use windows colors]

 Použít barvy Windows

-[Use default PopUp colors]

+[Use default Popup colors]

 

 [Choose colors]

 

 [File access filter && logging settings]

 

-[Please note that this settings has effect only with PopUps Interoperability plugin version 1.0.1.9 or higher]

+[Please note that this settings has effect only with Popups Interoperability plugin version 1.0.1.9 or higher]

 

 [Log into text file]

 

@@ -76,7 +76,7 @@ Soubor
 ;file \plugins\WhoUsesMyFiles\src\wumfplug.cpp

 [Error crerating menu]

 

-[PopUp plugin not found!]

+[Popup plugin not found!]

 

 [WUMF plugin]

 

@@ -96,7 +96,7 @@ Soubor
 

 [Services]

 Služby

-[PopUps]

+[Popups]

 Oznámení

 [WUMF: Show connections]

 

diff --git a/langpacks/czech/Plugins/YAMN.txt b/langpacks/czech/Plugins/YAMN.txt
index 2615742845..68dbfb21f5 100644
--- a/langpacks/czech/Plugins/YAMN.txt
+++ b/langpacks/czech/Plugins/YAMN.txt
@@ -333,7 +333,7 @@ Sítě
 Obecné

 [Plugins]

 Doplňky

-[PopUps]

+[Popups]

 Oznámení

 [No account selected]

 Není vybraný ú�et

diff --git a/langpacks/czech/Plugins/YAPP.txt b/langpacks/czech/Plugins/YAPP.txt
index 8210ffee40..8286e7ee54 100644
--- a/langpacks/czech/Plugins/YAPP.txt
+++ b/langpacks/czech/Plugins/YAPP.txt
@@ -114,7 +114,7 @@ Celoobrazovkový režim
 

 [Error]

 Chyba

-[PopUps]

+[Popups]

 Oznámení

 [Settings]

 Nastavení

diff --git a/langpacks/czech/Untranslated/ChangeKeyboardLayout.txt b/langpacks/czech/Untranslated/ChangeKeyboardLayout.txt
index b190634c8f..0f32211dc3 100644
--- a/langpacks/czech/Untranslated/ChangeKeyboardLayout.txt
+++ b/langpacks/czech/Untranslated/ChangeKeyboardLayout.txt
@@ -6,7 +6,7 @@
 [Two-way changing layout (experimental)]

 [Log operations]

 [Copy result to clipboard]

-[Show result in PopUp]

+[Show result in Popup]

 [Strings for keyboard layouts]

 [EN]

 [Invert current state]

@@ -14,7 +14,7 @@
 [Leave as it is]

 [Set Caps Lock state when inverting lettercase:]

 [Change active keyboard layout in system]

-[PopUp colours]

+[Popup colours]

 [Windows colours]

 [Custom colours]

 [ChangeKeyboardLayout]

diff --git a/langpacks/czech/Untranslated/MRA.txt b/langpacks/czech/Untranslated/MRA.txt
index c4bf618df4..a9e05e9308 100644
--- a/langpacks/czech/Untranslated/MRA.txt
+++ b/langpacks/czech/Untranslated/MRA.txt
@@ -31,7 +31,7 @@
 [Create a new Mail.ru account using the Mail.ru website]

 [Retrieve a lost password]

 [Leave empty if you dont want change password]

-[PopUp type]

+[Popup type]

 [Popup settings]

 [Enable Anti Spam]

 [Check temp contacts]

diff --git a/langpacks/czech/Untranslated/PopUp.txt b/langpacks/czech/Untranslated/PopUp.txt
index ba565be31e..b47027db79 100644
--- a/langpacks/czech/Untranslated/PopUp.txt
+++ b/langpacks/czech/Untranslated/PopUp.txt
@@ -4,7 +4,7 @@
 [Popup History is disabled]

 [Popup History message]

 [Disable popups]

-[Error: I could not register the PopUp Window class.\r\nThe plugin will not operate.]

+[Error: I could not register the Popup Window class.\r\nThe plugin will not operate.]

 [Ph'nglui mglw'nafh Cthulhu R'lyeh wgah'nagl fhtagn!]

 [/Offline]

 [/Online]

diff --git a/langpacks/czech/Untranslated/SMCN.txt b/langpacks/czech/Untranslated/SMCN.txt
index 9be1baed84..a61293ba5a 100644
--- a/langpacks/czech/Untranslated/SMCN.txt
+++ b/langpacks/czech/Untranslated/SMCN.txt
@@ -3,8 +3,8 @@
 [Disable &status message change notification]

 [View Status Message History]

 [List Contacts with Status Message]

-[Disable SMCN PopUps]

-[Enable SMCN PopUps]

+[Disable SMCN Popups]

+[Enable SMCN Popups]

 [Status Message Changed]

 [changes his/her status message to:]

 [cleares his/her status message]

diff --git a/langpacks/czech/Untranslated/TabSRMM.txt b/langpacks/czech/Untranslated/TabSRMM.txt
index 33b82a5976..accd540157 100644
--- a/langpacks/czech/Untranslated/TabSRMM.txt
+++ b/langpacks/czech/Untranslated/TabSRMM.txt
@@ -2,7 +2,7 @@
 [Google]

 [...is typing]

 [...stopped typing]

-[PopUps timeout]

+[Popups timeout]

 [Copyright 2004-2011 by the Miranda IM project, 2012-2013 by the Miranda NG project. More detailed copyright information can be found in the included README file.]

 [Check1]

 [LogLink]

diff --git a/langpacks/czech/Untranslated/WhoUsesMyFiles.txt b/langpacks/czech/Untranslated/WhoUsesMyFiles.txt
index b044f68a63..2b935c9042 100644
--- a/langpacks/czech/Untranslated/WhoUsesMyFiles.txt
+++ b/langpacks/czech/Untranslated/WhoUsesMyFiles.txt
@@ -1,15 +1,15 @@
 [Scans for network users of your shared files and notify you with popups.]

 [WUMF: Current connections]

 [Popup delay settings]

-[PopUp Delay (seconds)]

+[Popup Delay (seconds)]

 [Show infinitely]

-[Default PopUp delay]

+[Default Popup delay]

 [Choose delay time]

 [Popup color settings]

-[Use default PopUp colors]

+[Use default Popup colors]

 [Choose colors]

 [File access filter && logging settings]

-[Please note that this settings has effect only with PopUps Interoperability plugin version 1.0.1.9 or higher]

+[Please note that this settings has effect only with Popups Interoperability plugin version 1.0.1.9 or higher]

 [Log into text file]

 [Log folders access]

 [Alerts on folders access]

@@ -24,7 +24,7 @@
 [Error opening file]

 [Error memory allocation]

 [Error crerating menu]

-[PopUp plugin not found!]

+[Popup plugin not found!]

 [WUMF plugin]

 [Enable WUMF popups]

 [Disable WUMF popups]

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 251c5f6bb9..53dc3bdfc4 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -319,7 +319,7 @@
 [Timeout (s)]

 [Text]

 [Background]

-[(The timeout require at least PopUp plugin v 1.0.1.9. Setting it to 0 means default setting and -1 means indefinite time)]

+[(The timeout require at least Popup plugin v 1.0.1.9. Setting it to 0 means default setting and -1 means indefinite time)]

 [List]

 [&Message]

 [Clear lo&g]

diff --git a/langpacks/english/Langpack_english.txt b/langpacks/english/Langpack_english.txt
index c70c430447..238911da82 100644
--- a/langpacks/english/Langpack_english.txt
+++ b/langpacks/english/Langpack_english.txt
@@ -319,7 +319,7 @@
 [Timeout (s)]

 [Text]

 [Background]

-[(The timeout require at least PopUp plugin v 1.0.1.9. Setting it to 0 means default setting and -1 means indefinite time)]

+[(The timeout require at least Popup plugin v 1.0.1.9. Setting it to 0 means default setting and -1 means indefinite time)]

 [List]

 [&Message]

 [Clear lo&g]

@@ -1846,7 +1846,7 @@
 [Show when a connection attempt is made]

 [Show when reconnection has finished]

 [Show other messages]

-[From PopUp plugin]

+[From Popup plugin]

 [Custom]

 [Permanent]

 [Show additional information in popups]

@@ -2532,7 +2532,7 @@
 [Test Contact]

 [Test description]

 [Avatar]

-[PopUps]

+[Popups]

 [Avatar Change]

 ;file \plugins\AvatarHistory\src\utils.cpp

 [Unknown UIN]

@@ -3067,7 +3067,7 @@
 [Contact name]

 [has returned after being absent since %d days]

 [Contacts]

-[PopUps]

+[Popups]

 [not detected]

 [not found]

 [This contact has been absent for an extended period of time.]

@@ -3166,7 +3166,7 @@
 [Two-way changing layout (experimental)]

 [Log operations]

 [Copy result to clipboard]

-[Show result in PopUp]

+[Show result in Popup]

 [Strings for keyboard layouts]

 [EN]

 [Default]

@@ -3176,13 +3176,13 @@
 [Set Caps Lock state when inverting lettercase:]

 [Change active keyboard layout in system]

 [Colours]

-[PopUp colours]

+[Popup colours]

 [Windows colours]

 [Custom colours]

 [Back]

 [Text]

 [Timeout]

-[From PopUp plugin]

+[From Popup plugin]

 [Permanent]

 [Custom]

 [On left click]

@@ -3197,7 +3197,7 @@
 [Changing Layout]

 [Changing Case]

 [Message Sessions]

-[PopUps]

+[Popups]

 #muuid {b68a8906-748b-435d-930e-21cc6e8f3b3f}

 ;============================================================

 ;  File: ClientChangeNotify.dll

@@ -3243,7 +3243,7 @@
 [Use global settings (default)]

 [Disable c&lient change notification]

 [Enable c&lient change notification]

-[PopUps]

+[Popups]

 [ClientChangeNotify: Client changed]

 [ClientChangeNotify]

 [`[`!cdate()-!ctime()`]`  ?cinfo(%subject%,display) (?cinfo(%subject%,id)) changed client to %extratext%]

@@ -5000,7 +5000,7 @@
 ;============================================================

 [Replaces (for the selected contacts only) the Cyrillic letters in the outgoing messages with the phonetically equivalent Latin letter combinations.]

 ;file \plugins\CyrTranslit\src\MirandaContact.cpp

-[&Transliterate (ФЫВ�->FYVA)]

+[&Transliterate (ÔŰÂŔ->FYVA)]

 #muuid {a0138fc6-4c52-4501-af93-7d3e20bcae5b}

 ;============================================================

 ;  File: DbChecker.dll

@@ -5590,7 +5590,7 @@
 ;============================================================

 ;  File: Facebook.dll

 ;  Plugin: Facebook RM

-;  Version: 0.0.9.6

+;  Version: 0.1.0.0

 ;  Authors: Michal Zelinka, Robert Pösel

 ;============================================================

 [Facebook protocol support for Miranda NG.]

@@ -5629,6 +5629,9 @@
 [Also disconnect chat when going to offline]

 [Map non-standard statuses to Invisible (instead of Online)]

 [Enable support for Custom smileys (EXPERIMENTAL + BUGGY!)]

+[Use local time for received messages]

+[Send "Seen" info when marking messages as read]

+[Use this server for opening links:]

 ;file \protocols\FacebookRM\src\communication.cpp

 [Login error: Some Facebook things are required.]

 [Your account requires HTTPS connection. Activating.]

@@ -5649,6 +5652,9 @@
 [Photos]

 [Links]

 [Apps and Games]

+[Classic website]

+[Mobile website]

+[Smartphone website]

 ;file \protocols\FacebookRM\src\contacts.cpp

 [Contact was removed from your server list.]

 [Error occured when removing contact from server.]

@@ -5681,7 +5687,7 @@
 [Network]

 [Account]

 [Advanced]

-[PopUps]

+[Popups]

 [Events]

 [Loading newsfeeds...]

 [Checking friend requests...]

@@ -6506,7 +6512,7 @@
 ;file \protocols\GTalkExt\src\notifications.cpp

 [You've received an e-mail\n%s unread threads]

 ;file \protocols\GTalkExt\src\options.cpp

-[PopUps]

+[Popups]

 [Network]

 [* Primitive type system\n]

 [* No overloading\n]

@@ -7735,7 +7741,7 @@
 [Contacts]

 [Features]

 [Privacy]

-[PopUps]

+[Popups]

 ;file \protocols\IcqOscarJ\src\icq_popups.cpp

 [Popup Title]

 [Sample Note]

@@ -10080,7 +10086,7 @@
 [Show when a connection attempt is made]

 [Show when reconnection has finished]

 [Show other messages]

-[From PopUp plugin]

+[From Popup plugin]

 [Custom]

 [Permanent]

 [Show additional information in popups]

@@ -10155,7 +10161,7 @@
 [Basic]

 [Advanced]

 [You broke the Internet!]

-[PopUps]

+[Popups]

 ;file \Plugins\StatusPlugins\commonstatus.cpp

 [I've been away since %time%.]

 [Give it up, I'm not in!]

@@ -10949,7 +10955,7 @@
 [Create a new Mail.ru account using the Mail.ru website]

 [Retrieve a lost password]

 [Leave empty if you dont want change password]

-[PopUp type]

+[Popup type]

 [Popup settings]

 [Enable]

 [&Use Windows colors]

@@ -11035,7 +11041,7 @@
 [Contact Menu]

 [Extra status]

 [Custom Status]

-;file \protocols\MRA\src\MraPopUp.cpp

+;file \protocols\MRA\src\MraPopup.cpp

 [None]

 [Debug]

 [Information]

@@ -11043,7 +11049,7 @@
 [Warning]

 [Error]

 [NewMail]

-[PopUps]

+[Popups]

 ;file \protocols\MRA\src\MraProto.cpp

 [%s connection]

 [Mail.ru Xstatus]

@@ -11675,7 +11681,7 @@
 [Notifies you when you receive a message, url, file or any other event by displaying a popup.]

 ;file \plugins\NewEventNotify\res\resource.rc

 [General Options]

-[Show entry in the PopUps menu]

+[Show entry in the Popups menu]

 [Temporarily disable Event Popups]

 [Show Preview of Event in Popup]

 [Popup Options]

@@ -11712,7 +11718,7 @@
 [Message Session]

 [Message Received]

 ;file \plugins\NewEventNotify\src\menuitem.cpp

-[PopUps]

+[Popups]

 ;file \plugins\NewEventNotify\src\neweventnotify.h

 [Contacts]

 [You were added!]

@@ -11814,7 +11820,7 @@
 #muuid {ebf19652-e434-4d79-9897-91a0ff226f51}

 ;============================================================

 ;  File: NewXstatusNotify.dll

-;  Plugin: NewXstatusNotify

+;  Plugin: xStatus Notify

 ;  Version: 1.4.0.9

 ;  Authors: Luca Santarelli, Vasilich, yaho

 ;============================================================

@@ -11902,7 +11908,7 @@
 [Prevent identical logs]

 [On opening ML:]

 [General]

-[Show PopUps when I connect]

+[Show Popups when I connect]

 [Ignore empty status messages]

 [Protocols]

 [Enable/Disable protocols which you don't wish to be notified for:]

@@ -11983,7 +11989,7 @@
 [Protocol]

 [Filtering]

 [Message log]

-[PopUps]

+[Popups]

 ;file \plugins\NewXstatusNotify\src\popup.h

 [Open message window]

 [Close popup]

@@ -12692,6 +12698,7 @@
 [Connecting...]

 [Waiting for Stranger...]

 ;file \protocols\Omegle\src\constants.h

+[Random]

 [Stranger is using Omegle's mobile Web site (omegle.com on a phone or tablet)]

 [You and stranger speak the same language.]

 ;file \protocols\Omegle\src\proto.cpp

@@ -12762,7 +12769,7 @@
 [* Needs popup actions to be enabled]

 [Not sets for "Message boxes"]

 [Boxes]

-[PopUps]

+[Popups]

 ;file \plugins\PackUpdater\Src\Events.cpp

 [Check for pack updates]

 [Pack Updater]

@@ -12902,7 +12909,7 @@
 [Log to File]

 [Log Filename:]

 [Network]

-[PopUps]

+[Popups]

 [Reply]

 [Block Repetitions]

 [View Log]

@@ -13027,7 +13034,7 @@
 [* Needs popup actions to be enabled]

 [Not sets for "Message boxes"]

 [Boxes]

-[PopUps]

+[Popups]

 ;file \plugins\PluginUpdater\src\Notifications.cpp

 [Skipped.]

 [Will be deleted!]

@@ -13074,8 +13081,8 @@
 [Database]

 #muuid {26a9125d-7863-4e01-af0e-d14ef95c5054}

 ;============================================================

-;  File: PopUp.dll

-;  Plugin: PopUp plus

+;  File: Popup.dll

+;  Plugin: Popup plus

 ;  Version: 2.1.1.7

 ;  Authors: MPK, Merlin_de (Luca Santarelli, Victor Pavlychko)

 ;============================================================

@@ -13236,7 +13243,7 @@
 [Enable &popup module]

 [Disable &popup module]

 [Popup Plus]

-[Error: I could not register the PopUp Window class.\r\nThe plugin will not operate.]

+[Error: I could not register the Popup Window class.\r\nThe plugin will not operate.]

 ;file \plugins\Popup\src\opt_adv.cpp

 [No effect]

 [Fade in/out]

@@ -13571,7 +13578,7 @@
 [Background colour]

 [Text colour]

 [Delay]

-[From PopUp plugin]

+[From Popup plugin]

 [Custom]

 [Permanent]

 [Do not add to popup's history]

@@ -14190,7 +14197,7 @@
 [Appearance]

 [Default events to show in new chat rooms if the 'event filter' is enabled]

 [Select Folder]

-[PopUps]

+[Popups]

 [Group chats]

 [Message is highlighted]

 [User has performed an action]

@@ -14298,12 +14305,12 @@
 [Key agreement colors]

 [Secure connection colors]

 [Send/Receive encrypted colors]

-[SecureIM PopUp Colors]

+[SecureIM Popup Colors]

 [Preview]

 [Events]

-[PopUp Timeout]

+[Popup Timeout]

 [Time in Seconds]

-[0 = Default PopUp Timeout Value]

+[0 = Default Popup Timeout Value]

 [Show a popup on established connection]

 [Show a popup on disabled connection]

 [Show a popup on key send]

@@ -14458,7 +14465,7 @@
 [Key Popup]

 [Secure Popup]

 [Message Popup]

-[PopUps]

+[Popups]

 ;file \plugins\SecureIM\src\svcs_srmm.cpp

 [SecureIM [Native]]

 [SecureIM [PGP]]

@@ -14489,7 +14496,7 @@
 [Use popups]

 [Title]

 [Text]

-[PopUp Colors]

+[Popup Colors]

 [Online]

 [Away]

 [NA]

@@ -14525,7 +14532,7 @@
 ;file \plugins\SeenPlugin\src\options.cpp

 [Last Seen Variables]

 [Contacts]

-[PopUps]

+[Popups]

 ;file \plugins\SeenPlugin\src\seen.h

 [%n is %s (%u)]

 [%i(%r)%bWas %o]

@@ -15189,8 +15196,8 @@
 [Disable &status message change notification]

 [View Status Message History]

 [List Contacts with Status Message]

-[Disable SMCN PopUps]

-[Enable SMCN PopUps]

+[Disable SMCN Popups]

+[Enable SMCN Popups]

 [Status Message Changed]

 [changes his/her status message to:]

 [cleares his/her status message]

@@ -15349,6 +15356,90 @@
 ;file \plugins\SMS\src\SMS_svc.cpp

 [Incoming SMS Message]

 [Incoming SMS Confirmation]

+;#muuid for Spamotron not found, please specify manually!

+;langpack template for Spamotron

+;file \plugins\Spamotron\res\spamotron.rc

+[Do not send challenge request if message score above]

+[Auto-learn messages from approved contacts as ham]

+[Filtering options]

+[Learning options]

+[Auto-learn outgoing messages as ham]

+[Spam]

+[Ham]

+[Learn message:]

+[Auto approve contact if message score below]

+[Do not enable any of these options until Spam-o-tron have learned at least 20 of ham and 50 of spam messages.]

+[Learned ham messages:]

+[Learned spam messages:]

+[Analyze]

+[Auto-learn messages from contacts if not approved in]

+[days as spam]

+[Enabled]

+[and learn as ham]

+[Enabled accounts:]

+[Do not reply to messages with words in this list:]

+[Do not reply to the same message more than]

+[Flood protection]

+[Do not send more than]

+[messages to one contact per day]

+[times a day]

+[Settings]

+[Outgoing message]

+[Incoming message with any word from list:]

+[Auto approve on:]

+[Hide contact until verified]

+[Add permanently to list on verified]

+[Log actions to system history]

+[Mode:]

+[Responses: (saved in %response%, %response-n% variables)]

+[will be saved in %mathexpr%]

+[Reset to defaults]

+[Reply on success:]

+[Send challenge on authorization request:]

+[Keep blocked messages in contact history]

+[Case-sensitive]

+[Send challenge on incoming message:]

+[and mark them unread after approval]

+[Enable popup notifications]

+[Contact blocked]

+[Contact approved]

+[Appearance]

+[Foreground]

+[Background]

+[Timeout]

+[Default colors]

+[Default timeout]

+[Preview]

+[Windows colors]

+[Challenge sent]

+;file \plugins\Spamotron\src\bayes.cpp

+[Bayes database path]

+;file \plugins\Spamotron\src\common.h

+[Spam-o-tron needs to verify you're not a bot. Reply with "%response%" without quotes.]

+[Spam-o-tron needs to verify you're not a bot. Reply with a result of expression %mathexpr%.]

+[Verified.]

+[Spam-o-tron delayed authorization request. First reply with "%response%" without quotes.]

+[Spam-o-tron delayed authorization request. First reply with a result of expression %mathexpr%.]

+;file \plugins\Spamotron\src\options.cpp

+[Simple]

+[Math expression]

+[Round-robin]

+[Random]

+[Will be automatically evaluated from %mathexpr%]

+[Invalid regular expression.\nKeeping previous value.]

+[Message score]

+;file \plugins\Spamotron\src\spamotron.cpp

+[Contact %s approved.]

+[Message from %s rejected because it reached a maximum for challenge requests per day.]

+[Message from %s rejected because it reached a maximum for same responses per day.]

+[Message from %s dropped because it has a word from black list.]

+[Message from %s dropped because of high spam score.]

+[Sending plain challenge to %s.]

+[Sending round-robin challenge to %s.]

+[Sending random challenge to %s.]

+[Sending math expression challenge to %s.]

+;file \plugins\Spamotron\src\utils.cpp

+[Their message was]

 #muuid {36753ae3-840b-4797-94a5-fd9f5852b942}

 ;============================================================

 ;  File: SpellChecker.dll

@@ -15567,7 +15658,7 @@
 [Show when a connection attempt is made]

 [Show when reconnection has finished]

 [Show other messages]

-[From PopUp plugin]

+[From Popup plugin]

 [Custom]

 [Permanent]

 [Show additional information in popups]

@@ -16043,7 +16134,7 @@
 [Windows Aero settings]

 [Use Aero UI elements(only when not using a custom skin)]

 [Use Windows 7 task bar enhancements (restart required)]

-[PopUps]

+[Popups]

 [...is &typing]

 [...stopped t&yping]

 [Back]

@@ -16052,12 +16143,12 @@
 [Only &one popup for each contact]

 [Show &entry in the main menu]

 [...is typing]

-[From PopUp plugin]

+[From Popup plugin]

 [From protocol]

 [Permanent]

 [Custom]

 [...stopped typing]

-[PopUps timeout]

+[Popups timeout]

 [Templates]

 [Edit template]

 [Double click a template to edit it. Select a template from the list box and click "Update Preview" to show a preview message.]

@@ -16328,7 +16419,7 @@
 [Globally OFF]

 [On, if present, always in bottom display]

 [Don't show them]

-;file \plugins\TabSRMM\src\controls.cpp

+;file \plugins\TabSRMM\src\controls - Kopie.cpp

 [&User]

 [&Room]

 [Sounds are %s. Click to toggle status, hold SHIFT and click to set for all open containers]

@@ -16337,6 +16428,8 @@
 [Sending typing notifications is %s.]

 [Session list.\nClick left for a list of open sessions.\nClick right to access favorites and quickly configure message window behavior]

 [There are %d pending send jobs. Message length: %d bytes, message length limit: %d bytes\n\n%d messages are queued for later delivery]

+;file \plugins\TabSRMM\src\controls working.cpp

+;file \plugins\TabSRMM\src\controls.cpp

 ;file \plugins\TabSRMM\src\eventpopups.cpp

 [One of your popup actions is set to DISMISS EVENT.\nNote that this options may have unwanted side effects as it REMOVES the event from the unread queue.\nThis may lead to events not showing up as "new". If you don't want this behaviour, please review the Event Notifications settings page.]

 [Incoming file]

@@ -17398,7 +17491,7 @@
 [Background]

 [Text]

 [Delay]

-[&From PopUp plugin]

+[&From Popup plugin]

 [&Custom]

 [P&ermanent]

 [Preview]

@@ -17593,7 +17686,7 @@
 [Tooltip Notify: Offline]

 [Tooltip Notify: Other]

 [Tooltip Notify: Typing]

-[PopUps]

+[Popups]

 [** New contacts **]

 [** Unknown contacts **]

 [Not Idle]

@@ -17650,7 +17743,7 @@
 [Text colour:]

 [Reset to default]

 [Popup timeout]

-[From PopUp plugin]

+[From Popup plugin]

 [Custom]

 [Test]

 [Show now]

@@ -17682,7 +17775,7 @@
 [Options]

 [Traffic counter]

 [Statistics]

-[PopUps]

+[Popups]

 ;file \plugins\TrafficCounter\src\statistics.cpp

 [Bytes]

 [KB]

@@ -17780,7 +17873,7 @@
 [Send Tweet...]

 [Network]

 [Basic]

-[PopUps]

+[Popups]

 [%s server connection]

 [Unable to get Netlib connection for Twitter]

 [Twitter]

@@ -17868,7 +17961,7 @@
 [Use Windows colours]

 [Use default colours]

 [Delay]

-[From PopUp plugin]

+[From Popup plugin]

 [Custom]

 [Permanent]

 [Show reminder messages as popups (if reminder is enabled)]

@@ -18156,7 +18249,7 @@
 [Contacts]

 [Advanced]

 [Details Dialog]

-[PopUps]

+[Popups]

 ;file \plugins\UserInfoEx\src\psp_profile.cpp

 [Past]

 [Affiliation]

@@ -19171,10 +19264,10 @@
 [Other Options]

 [Set as default station]

 [Disable automatic update for this station]

-[Disable PopUp for this station]

+[Disable Popup for this station]

 [Change]

 [Cancel]

-[PopUp Options]

+[Popup Options]

 [Enable popups]

 [Popup only when condition changes]

 [Colours]

@@ -19187,7 +19280,7 @@
 [Popup Delay]

 [Delay]

 [seconds]

-[From PopUp plugin]

+[From Popup plugin]

 [Permanent]

 [Popup Text]

 [Popup Title]

@@ -19227,7 +19320,7 @@
 [Reload INI]

 [City:]

 [Menu]

-[Dismiss PopUp]

+[Dismiss Popup]

 [Open brief information]

 [Open complete forecast]

 [Open weather map]

@@ -19344,7 +19437,7 @@
 [Network]

 [General]

 [Display]

-[PopUps]

+[Popups]

 [%c\tcurrent condition\n%d\tcurrent date\n%e\tdewpoint\n%f\tfeel-like temp\n%h\ttoday's high\n%i\twind direction\n%l\ttoday's low\n%m\thumidity\n%n\tstation name\n%p\tpressure\n%r\tsunrise time\n%s\tstation ID\n%t\ttemperature\n%u\tupdate time\n%v\tvisibility\n%w\twind speed\n%y\tsun set]

 [Weather Protocol Text Preview]

 ;file \plugins\Weather\src\weather_popup.cpp

@@ -19516,19 +19609,19 @@
 [WUMF: Current connections]

 [OK]

 [Popup delay settings]

-[PopUp Delay (seconds)]

+[Popup Delay (seconds)]

 [Background color]

 [Text color]

 [Previe&w]

 [Show infinitely]

-[Default PopUp delay]

+[Default Popup delay]

 [Choose delay time]

 [Popup color settings]

 [Use windows colors]

-[Use default PopUp colors]

+[Use default Popup colors]

 [Choose colors]

 [File access filter && logging settings]

-[Please note that this settings has effect only with PopUps Interoperability plugin version 1.0.1.9 or higher]

+[Please note that this settings has effect only with Popups Interoperability plugin version 1.0.1.9 or higher]

 [Log into text file]

 [Log folders access]

 [Alerts on folders access]

@@ -19548,7 +19641,7 @@
 [Error memory allocation]

 ;file \plugins\WhoUsesMyFiles\src\wumfplug.cpp

 [Error crerating menu]

-[PopUp plugin not found!]

+[Popup plugin not found!]

 [WUMF plugin]

 [Enable WUMF popups]

 [Disable WUMF popups]

@@ -19558,7 +19651,7 @@
 [Show connections list]

 [Wumf]

 [Services]

-[PopUps]

+[Popups]

 [WUMF: Show connections]

 #muuid {9b8e1735-970d-4ce0-930c-a561956bdca2}

 ;langpack template for Xfire

@@ -20146,7 +20239,7 @@
 [Accounts]

 [General]

 [Plugins]

-[PopUps]

+[Popups]

 [No account selected]

 [Time left to next check [s]: %d]

 [New Account]

@@ -20230,7 +20323,7 @@
 [Vertical animate]

 [You cannot set a default timeout of 0.\nValue has been reset.]

 [Error]

-[PopUps]

+[Popups]

 [Settings]

 [Classes]

 ;file \plugins\YAPP\src\services.cpp

diff --git a/langpacks/english/Plugins/AdvancedAutoAway.txt b/langpacks/english/Plugins/AdvancedAutoAway.txt
index 310fb5073b..c6e61d51a9 100644
--- a/langpacks/english/Plugins/AdvancedAutoAway.txt
+++ b/langpacks/english/Plugins/AdvancedAutoAway.txt
@@ -80,7 +80,7 @@
 [Show when a connection attempt is made]

 [Show when reconnection has finished]

 [Show other messages]

-[From PopUp plugin]

+[From Popup plugin]

 [Custom]

 [Permanent]

 [Show additional information in popups]

diff --git a/langpacks/english/Plugins/AvatarHistory.txt b/langpacks/english/Plugins/AvatarHistory.txt
index 6e9b05c051..1908c0df88 100644
--- a/langpacks/english/Plugins/AvatarHistory.txt
+++ b/langpacks/english/Plugins/AvatarHistory.txt
@@ -87,7 +87,7 @@
 [Test Contact]

 [Test description]

 [Avatar]

-[PopUps]

+[Popups]

 [Avatar Change]

 ;file \plugins\AvatarHistory\src\utils.cpp

 [Unknown UIN]

diff --git a/langpacks/english/Plugins/BuddyExpectator.txt b/langpacks/english/Plugins/BuddyExpectator.txt
index 50187c0205..60f961b2d7 100644
--- a/langpacks/english/Plugins/BuddyExpectator.txt
+++ b/langpacks/english/Plugins/BuddyExpectator.txt
@@ -68,7 +68,7 @@
 [Contact name]

 [has returned after being absent since %d days]

 [Contacts]

-[PopUps]

+[Popups]

 [not detected]

 [not found]

 [This contact has been absent for an extended period of time.]

diff --git a/langpacks/english/Plugins/ChangeKeyboardLayout.txt b/langpacks/english/Plugins/ChangeKeyboardLayout.txt
index 35cf20cc47..d52186a5d1 100644
--- a/langpacks/english/Plugins/ChangeKeyboardLayout.txt
+++ b/langpacks/english/Plugins/ChangeKeyboardLayout.txt
@@ -16,7 +16,7 @@
 [Two-way changing layout (experimental)]

 [Log operations]

 [Copy result to clipboard]

-[Show result in PopUp]

+[Show result in Popup]

 [Strings for keyboard layouts]

 [EN]

 [Default]

@@ -26,13 +26,13 @@
 [Set Caps Lock state when inverting lettercase:]

 [Change active keyboard layout in system]

 [Colours]

-[PopUp colours]

+[Popup colours]

 [Windows colours]

 [Custom colours]

 [Back]

 [Text]

 [Timeout]

-[From PopUp plugin]

+[From Popup plugin]

 [Permanent]

 [Custom]

 [On left click]

@@ -47,4 +47,4 @@
 [Changing Layout]

 [Changing Case]

 [Message Sessions]

-[PopUps]

+[Popups]

diff --git a/langpacks/english/Plugins/ClientChangeNotify.txt b/langpacks/english/Plugins/ClientChangeNotify.txt
index 9666b0397d..07155db072 100644
--- a/langpacks/english/Plugins/ClientChangeNotify.txt
+++ b/langpacks/english/Plugins/ClientChangeNotify.txt
@@ -43,7 +43,7 @@
 [Use global settings (default)]

 [Disable c&lient change notification]

 [Enable c&lient change notification]

-[PopUps]

+[Popups]

 [ClientChangeNotify: Client changed]

 [ClientChangeNotify]

 [`[`!cdate()-!ctime()`]`  ?cinfo(%subject%,display) (?cinfo(%subject%,id)) changed client to %extratext%]

diff --git a/langpacks/english/Plugins/CyrTranslit.txt b/langpacks/english/Plugins/CyrTranslit.txt
index cc7062b272..c3f786a58a 100644
--- a/langpacks/english/Plugins/CyrTranslit.txt
+++ b/langpacks/english/Plugins/CyrTranslit.txt
@@ -7,4 +7,4 @@
 ;============================================================

 [Replaces (for the selected contacts only) the Cyrillic letters in the outgoing messages with the phonetically equivalent Latin letter combinations.]

 ;file \plugins\CyrTranslit\src\MirandaContact.cpp

-[&Transliterate (ФЫВ�->FYVA)]

+[&Transliterate (ÔŰÂŔ->FYVA)]

diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 6c6a504769..c952cb9a44 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Facebook.dll

 ;  Plugin: Facebook RM

-;  Version: 0.0.9.6

+;  Version: 0.1.0.0

 ;  Authors: Michal Zelinka, Robert Pösel

 ;============================================================

 [Facebook protocol support for Miranda NG.]

@@ -41,6 +41,9 @@
 [Also disconnect chat when going to offline]

 [Map non-standard statuses to Invisible (instead of Online)]

 [Enable support for Custom smileys (EXPERIMENTAL + BUGGY!)]

+[Use local time for received messages]

+[Send "Seen" info when marking messages as read]

+[Use this server for opening links:]

 ;file \protocols\FacebookRM\src\communication.cpp

 [Login error: Some Facebook things are required.]

 [Your account requires HTTPS connection. Activating.]

@@ -61,6 +64,9 @@
 [Photos]

 [Links]

 [Apps and Games]

+[Classic website]

+[Mobile website]

+[Smartphone website]

 ;file \protocols\FacebookRM\src\contacts.cpp

 [Contact was removed from your server list.]

 [Error occured when removing contact from server.]

@@ -93,7 +99,7 @@
 [Network]

 [Account]

 [Advanced]

-[PopUps]

+[Popups]

 [Events]

 [Loading newsfeeds...]

 [Checking friend requests...]

diff --git a/langpacks/english/Plugins/GTalkExt.txt b/langpacks/english/Plugins/GTalkExt.txt
index 2c89a26cfd..29be1487c0 100644
--- a/langpacks/english/Plugins/GTalkExt.txt
+++ b/langpacks/english/Plugins/GTalkExt.txt
@@ -28,7 +28,7 @@
 ;file \protocols\GTalkExt\src\notifications.cpp

 [You've received an e-mail\n%s unread threads]

 ;file \protocols\GTalkExt\src\options.cpp

-[PopUps]

+[Popups]

 [Network]

 [* Primitive type system\n]

 [* No overloading\n]

diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt
index 54a8099a5d..fcc81965e3 100644
--- a/langpacks/english/Plugins/ICQ.txt
+++ b/langpacks/english/Plugins/ICQ.txt
@@ -692,7 +692,7 @@
 [Contacts]

 [Features]

 [Privacy]

-[PopUps]

+[Popups]

 ;file \protocols\IcqOscarJ\src\icq_popups.cpp

 [Popup Title]

 [Sample Note]

diff --git a/langpacks/english/Plugins/KeepStatus.txt b/langpacks/english/Plugins/KeepStatus.txt
index 9f3c42093b..cdf3919a7c 100644
--- a/langpacks/english/Plugins/KeepStatus.txt
+++ b/langpacks/english/Plugins/KeepStatus.txt
@@ -80,7 +80,7 @@
 [Show when a connection attempt is made]

 [Show when reconnection has finished]

 [Show other messages]

-[From PopUp plugin]

+[From Popup plugin]

 [Custom]

 [Permanent]

 [Show additional information in popups]

@@ -155,7 +155,7 @@
 [Basic]

 [Advanced]

 [You broke the Internet!]

-[PopUps]

+[Popups]

 ;file \Plugins\StatusPlugins\commonstatus.cpp

 [I've been away since %time%.]

 [Give it up, I'm not in!]

diff --git a/langpacks/english/Plugins/MRA.txt b/langpacks/english/Plugins/MRA.txt
index f656375185..b8284b1e14 100644
--- a/langpacks/english/Plugins/MRA.txt
+++ b/langpacks/english/Plugins/MRA.txt
@@ -65,7 +65,7 @@
 [Create a new Mail.ru account using the Mail.ru website]

 [Retrieve a lost password]

 [Leave empty if you dont want change password]

-[PopUp type]

+[Popup type]

 [Popup settings]

 [Enable]

 [&Use Windows colors]

@@ -151,7 +151,7 @@
 [Contact Menu]

 [Extra status]

 [Custom Status]

-;file \protocols\MRA\src\MraPopUp.cpp

+;file \protocols\MRA\src\MraPopup.cpp

 [None]

 [Debug]

 [Information]

@@ -159,7 +159,7 @@
 [Warning]

 [Error]

 [NewMail]

-[PopUps]

+[Popups]

 ;file \protocols\MRA\src\MraProto.cpp

 [%s connection]

 [Mail.ru Xstatus]

diff --git a/langpacks/english/Plugins/NewEventNotify.txt b/langpacks/english/Plugins/NewEventNotify.txt
index 6411ae3eb8..4ab9b63a1b 100644
--- a/langpacks/english/Plugins/NewEventNotify.txt
+++ b/langpacks/english/Plugins/NewEventNotify.txt
@@ -8,7 +8,7 @@
 [Notifies you when you receive a message, url, file or any other event by displaying a popup.]

 ;file \plugins\NewEventNotify\res\resource.rc

 [General Options]

-[Show entry in the PopUps menu]

+[Show entry in the Popups menu]

 [Temporarily disable Event Popups]

 [Show Preview of Event in Popup]

 [Popup Options]

@@ -45,7 +45,7 @@
 [Message Session]

 [Message Received]

 ;file \plugins\NewEventNotify\src\menuitem.cpp

-[PopUps]

+[Popups]

 ;file \plugins\NewEventNotify\src\neweventnotify.h

 [Contacts]

 [You were added!]

diff --git a/langpacks/english/Plugins/NewXstatusNotify.txt b/langpacks/english/Plugins/NewXstatusNotify.txt
index 04b6f99dfc..1607866fcc 100644
--- a/langpacks/english/Plugins/NewXstatusNotify.txt
+++ b/langpacks/english/Plugins/NewXstatusNotify.txt
@@ -1,7 +1,7 @@
 #muuid {ebf19652-e434-4d79-9897-91a0ff226f51}

 ;============================================================

 ;  File: NewXstatusNotify.dll

-;  Plugin: NewXstatusNotify

+;  Plugin: xStatus Notify

 ;  Version: 1.4.0.9

 ;  Authors: Luca Santarelli, Vasilich, yaho

 ;============================================================

@@ -89,7 +89,7 @@
 [Prevent identical logs]

 [On opening ML:]

 [General]

-[Show PopUps when I connect]

+[Show Popups when I connect]

 [Ignore empty status messages]

 [Protocols]

 [Enable/Disable protocols which you don't wish to be notified for:]

@@ -170,7 +170,7 @@
 [Protocol]

 [Filtering]

 [Message log]

-[PopUps]

+[Popups]

 ;file \plugins\NewXstatusNotify\src\popup.h

 [Open message window]

 [Close popup]

diff --git a/langpacks/english/Plugins/Omegle.txt b/langpacks/english/Plugins/Omegle.txt
index b1101d0601..b75ed55b3a 100644
--- a/langpacks/english/Plugins/Omegle.txt
+++ b/langpacks/english/Plugins/Omegle.txt
@@ -55,6 +55,7 @@
 [Connecting...]

 [Waiting for Stranger...]

 ;file \protocols\Omegle\src\constants.h

+[Random]

 [Stranger is using Omegle's mobile Web site (omegle.com on a phone or tablet)]

 [You and stranger speak the same language.]

 ;file \protocols\Omegle\src\proto.cpp

diff --git a/langpacks/english/Plugins/PackUpdater.txt b/langpacks/english/Plugins/PackUpdater.txt
index 683050d6aa..5186d40d77 100644
--- a/langpacks/english/Plugins/PackUpdater.txt
+++ b/langpacks/english/Plugins/PackUpdater.txt
@@ -44,7 +44,7 @@
 [* Needs popup actions to be enabled]

 [Not sets for "Message boxes"]

 [Boxes]

-[PopUps]

+[Popups]

 ;file \plugins\PackUpdater\Src\Events.cpp

 [Check for pack updates]

 [Pack Updater]

diff --git a/langpacks/english/Plugins/Ping.txt b/langpacks/english/Plugins/Ping.txt
index 4d14dbc512..cab0c02de7 100644
--- a/langpacks/english/Plugins/Ping.txt
+++ b/langpacks/english/Plugins/Ping.txt
@@ -14,7 +14,7 @@
 [Log to File]

 [Log Filename:]

 [Network]

-[PopUps]

+[Popups]

 [Reply]

 [Block Repetitions]

 [View Log]

diff --git a/langpacks/english/Plugins/PluginUpdater.txt b/langpacks/english/Plugins/PluginUpdater.txt
index ac08a5f278..96eaecebec 100644
--- a/langpacks/english/Plugins/PluginUpdater.txt
+++ b/langpacks/english/Plugins/PluginUpdater.txt
@@ -47,7 +47,7 @@
 [* Needs popup actions to be enabled]

 [Not sets for "Message boxes"]

 [Boxes]

-[PopUps]

+[Popups]

 ;file \plugins\PluginUpdater\src\Notifications.cpp

 [Skipped.]

 [Will be deleted!]

diff --git a/langpacks/english/Plugins/PopUp.txt b/langpacks/english/Plugins/PopUp.txt
index ffd34e7c40..e9322e0b6d 100644
--- a/langpacks/english/Plugins/PopUp.txt
+++ b/langpacks/english/Plugins/PopUp.txt
@@ -1,7 +1,7 @@
 #muuid {26a9125d-7863-4e01-af0e-d14ef95c5054}

 ;============================================================

-;  File: PopUp.dll

-;  Plugin: PopUp plus

+;  File: Popup.dll

+;  Plugin: Popup plus

 ;  Version: 2.1.1.7

 ;  Authors: MPK, Merlin_de (Luca Santarelli, Victor Pavlychko)

 ;============================================================

@@ -162,7 +162,7 @@
 [Enable &popup module]

 [Disable &popup module]

 [Popup Plus]

-[Error: I could not register the PopUp Window class.\r\nThe plugin will not operate.]

+[Error: I could not register the Popup Window class.\r\nThe plugin will not operate.]

 ;file \plugins\Popup\src\opt_adv.cpp

 [No effect]

 [Fade in/out]

diff --git a/langpacks/english/Plugins/Quotes.txt b/langpacks/english/Plugins/Quotes.txt
index 66b82b7ecf..d5edc2fd84 100644
--- a/langpacks/english/Plugins/Quotes.txt
+++ b/langpacks/english/Plugins/Quotes.txt
@@ -44,7 +44,7 @@
 [Background colour]

 [Text colour]

 [Delay]

-[From PopUp plugin]

+[From Popup plugin]

 [Custom]

 [Permanent]

 [Do not add to popup's history]

diff --git a/langpacks/english/Plugins/SMCN.txt b/langpacks/english/Plugins/SMCN.txt
index f06407466e..f0f6d0ca4f 100644
--- a/langpacks/english/Plugins/SMCN.txt
+++ b/langpacks/english/Plugins/SMCN.txt
@@ -9,8 +9,8 @@
 [Disable &status message change notification]

 [View Status Message History]

 [List Contacts with Status Message]

-[Disable SMCN PopUps]

-[Enable SMCN PopUps]

+[Disable SMCN Popups]

+[Enable SMCN Popups]

 [Status Message Changed]

 [changes his/her status message to:]

 [cleares his/her status message]

diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index 1dd7d228e6..40620809b1 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -458,7 +458,7 @@
 [Appearance]

 [Default events to show in new chat rooms if the 'event filter' is enabled]

 [Select Folder]

-[PopUps]

+[Popups]

 [Group chats]

 [Message is highlighted]

 [User has performed an action]

diff --git a/langpacks/english/Plugins/SecureIM.txt b/langpacks/english/Plugins/SecureIM.txt
index 87c17aa0e1..c199db7684 100644
--- a/langpacks/english/Plugins/SecureIM.txt
+++ b/langpacks/english/Plugins/SecureIM.txt
@@ -53,12 +53,12 @@
 [Key agreement colors]

 [Secure connection colors]

 [Send/Receive encrypted colors]

-[SecureIM PopUp Colors]

+[SecureIM Popup Colors]

 [Preview]

 [Events]

-[PopUp Timeout]

+[Popup Timeout]

 [Time in Seconds]

-[0 = Default PopUp Timeout Value]

+[0 = Default Popup Timeout Value]

 [Show a popup on established connection]

 [Show a popup on disabled connection]

 [Show a popup on key send]

@@ -213,7 +213,7 @@
 [Key Popup]

 [Secure Popup]

 [Message Popup]

-[PopUps]

+[Popups]

 ;file \plugins\SecureIM\src\svcs_srmm.cpp

 [SecureIM [Native]]

 [SecureIM [PGP]]

diff --git a/langpacks/english/Plugins/SeenPlugin.txt b/langpacks/english/Plugins/SeenPlugin.txt
index bbb2d2074d..a4c2cb4bd9 100644
--- a/langpacks/english/Plugins/SeenPlugin.txt
+++ b/langpacks/english/Plugins/SeenPlugin.txt
@@ -23,7 +23,7 @@
 [Use popups]

 [Title]

 [Text]

-[PopUp Colors]

+[Popup Colors]

 [Online]

 [Away]

 [NA]

@@ -59,7 +59,7 @@
 ;file \plugins\SeenPlugin\src\options.cpp

 [Last Seen Variables]

 [Contacts]

-[PopUps]

+[Popups]

 ;file \plugins\SeenPlugin\src\seen.h

 [%n is %s (%u)]

 [%i(%r)%bWas %o]

diff --git a/langpacks/english/Plugins/StartupStatus.txt b/langpacks/english/Plugins/StartupStatus.txt
index 9753f5948a..4bbc818344 100644
--- a/langpacks/english/Plugins/StartupStatus.txt
+++ b/langpacks/english/Plugins/StartupStatus.txt
@@ -80,7 +80,7 @@
 [Show when a connection attempt is made]

 [Show when reconnection has finished]

 [Show other messages]

-[From PopUp plugin]

+[From Popup plugin]

 [Custom]

 [Permanent]

 [Show additional information in popups]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index a6553c641b..1f1e8df647 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -248,7 +248,7 @@
 [Windows Aero settings]

 [Use Aero UI elements(only when not using a custom skin)]

 [Use Windows 7 task bar enhancements (restart required)]

-[PopUps]

+[Popups]

 [...is &typing]

 [...stopped t&yping]

 [Back]

@@ -257,12 +257,12 @@
 [Only &one popup for each contact]

 [Show &entry in the main menu]

 [...is typing]

-[From PopUp plugin]

+[From Popup plugin]

 [From protocol]

 [Permanent]

 [Custom]

 [...stopped typing]

-[PopUps timeout]

+[Popups timeout]

 [Templates]

 [Edit template]

 [Double click a template to edit it. Select a template from the list box and click "Update Preview" to show a preview message.]

@@ -533,7 +533,7 @@
 [Globally OFF]

 [On, if present, always in bottom display]

 [Don't show them]

-;file \plugins\TabSRMM\src\controls.cpp

+;file \plugins\TabSRMM\src\controls - Kopie.cpp

 [&User]

 [&Room]

 [Sounds are %s. Click to toggle status, hold SHIFT and click to set for all open containers]

@@ -542,6 +542,8 @@
 [Sending typing notifications is %s.]

 [Session list.\nClick left for a list of open sessions.\nClick right to access favorites and quickly configure message window behavior]

 [There are %d pending send jobs. Message length: %d bytes, message length limit: %d bytes\n\n%d messages are queued for later delivery]

+;file \plugins\TabSRMM\src\controls working.cpp

+;file \plugins\TabSRMM\src\controls.cpp

 ;file \plugins\TabSRMM\src\eventpopups.cpp

 [One of your popup actions is set to DISMISS EVENT.\nNote that this options may have unwanted side effects as it REMOVES the event from the unread queue.\nThis may lead to events not showing up as "new". If you don't want this behaviour, please review the Event Notifications settings page.]

 [Incoming file]

diff --git a/langpacks/english/Plugins/Tlen.txt b/langpacks/english/Plugins/Tlen.txt
index e0693cd9d7..25a8635490 100644
--- a/langpacks/english/Plugins/Tlen.txt
+++ b/langpacks/english/Plugins/Tlen.txt
@@ -41,7 +41,7 @@
 [Background]

 [Text]

 [Delay]

-[&From PopUp plugin]

+[&From Popup plugin]

 [&Custom]

 [P&ermanent]

 [Preview]

diff --git a/langpacks/english/Plugins/TooltipNotify.txt b/langpacks/english/Plugins/TooltipNotify.txt
index 3841f22d6a..23aa9ae3db 100644
--- a/langpacks/english/Plugins/TooltipNotify.txt
+++ b/langpacks/english/Plugins/TooltipNotify.txt
@@ -45,7 +45,7 @@
 [Tooltip Notify: Offline]

 [Tooltip Notify: Other]

 [Tooltip Notify: Typing]

-[PopUps]

+[Popups]

 [** New contacts **]

 [** Unknown contacts **]

 [Not Idle]

diff --git a/langpacks/english/Plugins/TrafficCounter.txt b/langpacks/english/Plugins/TrafficCounter.txt
index 7a4d6c3c54..e1de7f87aa 100644
--- a/langpacks/english/Plugins/TrafficCounter.txt
+++ b/langpacks/english/Plugins/TrafficCounter.txt
@@ -19,7 +19,7 @@
 [Text colour:]

 [Reset to default]

 [Popup timeout]

-[From PopUp plugin]

+[From Popup plugin]

 [Custom]

 [Test]

 [Show now]

@@ -51,7 +51,7 @@
 [Options]

 [Traffic counter]

 [Statistics]

-[PopUps]

+[Popups]

 ;file \plugins\TrafficCounter\src\statistics.cpp

 [Bytes]

 [KB]

diff --git a/langpacks/english/Plugins/Twitter.txt b/langpacks/english/Plugins/Twitter.txt
index 53c587a1fd..ce110f5cc1 100644
--- a/langpacks/english/Plugins/Twitter.txt
+++ b/langpacks/english/Plugins/Twitter.txt
@@ -48,7 +48,7 @@
 [Send Tweet...]

 [Network]

 [Basic]

-[PopUps]

+[Popups]

 [%s server connection]

 [Unable to get Netlib connection for Twitter]

 [Twitter]

diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt
index 5bd15c1a15..b075e927a0 100644
--- a/langpacks/english/Plugins/UInfoEx.txt
+++ b/langpacks/english/Plugins/UInfoEx.txt
@@ -73,7 +73,7 @@
 [Use Windows colours]

 [Use default colours]

 [Delay]

-[From PopUp plugin]

+[From Popup plugin]

 [Custom]

 [Permanent]

 [Show reminder messages as popups (if reminder is enabled)]

@@ -361,7 +361,7 @@
 [Contacts]

 [Advanced]

 [Details Dialog]

-[PopUps]

+[Popups]

 ;file \plugins\UserInfoEx\src\psp_profile.cpp

 [Past]

 [Affiliation]

diff --git a/langpacks/english/Plugins/Weather.txt b/langpacks/english/Plugins/Weather.txt
index 33c8c29ebb..398245d390 100644
--- a/langpacks/english/Plugins/Weather.txt
+++ b/langpacks/english/Plugins/Weather.txt
@@ -65,10 +65,10 @@
 [Other Options]

 [Set as default station]

 [Disable automatic update for this station]

-[Disable PopUp for this station]

+[Disable Popup for this station]

 [Change]

 [Cancel]

-[PopUp Options]

+[Popup Options]

 [Enable popups]

 [Popup only when condition changes]

 [Colours]

@@ -81,7 +81,7 @@
 [Popup Delay]

 [Delay]

 [seconds]

-[From PopUp plugin]

+[From Popup plugin]

 [Permanent]

 [Popup Text]

 [Popup Title]

@@ -121,7 +121,7 @@
 [Reload INI]

 [City:]

 [Menu]

-[Dismiss PopUp]

+[Dismiss Popup]

 [Open brief information]

 [Open complete forecast]

 [Open weather map]

@@ -238,7 +238,7 @@
 [Network]

 [General]

 [Display]

-[PopUps]

+[Popups]

 [%c\tcurrent condition\n%d\tcurrent date\n%e\tdewpoint\n%f\tfeel-like temp\n%h\ttoday's high\n%i\twind direction\n%l\ttoday's low\n%m\thumidity\n%n\tstation name\n%p\tpressure\n%r\tsunrise time\n%s\tstation ID\n%t\ttemperature\n%u\tupdate time\n%v\tvisibility\n%w\twind speed\n%y\tsun set]

 [Weather Protocol Text Preview]

 ;file \plugins\Weather\src\weather_popup.cpp

diff --git a/langpacks/english/Plugins/WhoUsesMyFiles.txt b/langpacks/english/Plugins/WhoUsesMyFiles.txt
index 22923c0daf..6a2ba50004 100644
--- a/langpacks/english/Plugins/WhoUsesMyFiles.txt
+++ b/langpacks/english/Plugins/WhoUsesMyFiles.txt
@@ -10,19 +10,19 @@
 [WUMF: Current connections]

 [OK]

 [Popup delay settings]

-[PopUp Delay (seconds)]

+[Popup Delay (seconds)]

 [Background color]

 [Text color]

 [Previe&w]

 [Show infinitely]

-[Default PopUp delay]

+[Default Popup delay]

 [Choose delay time]

 [Popup color settings]

 [Use windows colors]

-[Use default PopUp colors]

+[Use default Popup colors]

 [Choose colors]

 [File access filter && logging settings]

-[Please note that this settings has effect only with PopUps Interoperability plugin version 1.0.1.9 or higher]

+[Please note that this settings has effect only with Popups Interoperability plugin version 1.0.1.9 or higher]

 [Log into text file]

 [Log folders access]

 [Alerts on folders access]

@@ -42,7 +42,7 @@
 [Error memory allocation]

 ;file \plugins\WhoUsesMyFiles\src\wumfplug.cpp

 [Error crerating menu]

-[PopUp plugin not found!]

+[Popup plugin not found!]

 [WUMF plugin]

 [Enable WUMF popups]

 [Disable WUMF popups]

@@ -52,5 +52,5 @@
 [Show connections list]

 [Wumf]

 [Services]

-[PopUps]

+[Popups]

 [WUMF: Show connections]

diff --git a/langpacks/english/Plugins/YAMN.txt b/langpacks/english/Plugins/YAMN.txt
index bfb4f9f91e..06191b27d9 100644
--- a/langpacks/english/Plugins/YAMN.txt
+++ b/langpacks/english/Plugins/YAMN.txt
@@ -174,7 +174,7 @@
 [Accounts]

 [General]

 [Plugins]

-[PopUps]

+[Popups]

 [No account selected]

 [Time left to next check [s]: %d]

 [New Account]

diff --git a/langpacks/english/Plugins/YAPP.txt b/langpacks/english/Plugins/YAPP.txt
index bbf999f1ce..3767e8387f 100644
--- a/langpacks/english/Plugins/YAPP.txt
+++ b/langpacks/english/Plugins/YAPP.txt
@@ -61,7 +61,7 @@
 [Vertical animate]

 [You cannot set a default timeout of 0.\nValue has been reset.]

 [Error]

-[PopUps]

+[Popups]

 [Settings]

 [Classes]

 ;file \plugins\YAPP\src\services.cpp

diff --git a/langpacks/german/=CORE=.txt b/langpacks/german/=CORE=.txt
index 95f8296752..d4fbaca73c 100644
--- a/langpacks/german/=CORE=.txt
+++ b/langpacks/german/=CORE=.txt
@@ -632,7 +632,7 @@ Zeitüberschreitung (s)
 Text

 [Background]

 Hintergrund

-[(The timeout require at least PopUp plugin v 1.0.1.9. Setting it to 0 means default setting and -1 means indefinite time)]

+[(The timeout require at least Popup plugin v 1.0.1.9. Setting it to 0 means default setting and -1 means indefinite time)]

  0 = Standardwert vom Popup-Plugin\n-1 = Dauerhafte Anzeige

 [List]

 Liste

diff --git a/langpacks/german/Deprecated/langpack_german.txt b/langpacks/german/Deprecated/langpack_german.txt
index 61f280e294..29c78d6f20 100644
--- a/langpacks/german/Deprecated/langpack_german.txt
+++ b/langpacks/german/Deprecated/langpack_german.txt
@@ -649,7 +649,7 @@ Anzeigedauer
 Verwerfen

 [Dismiss popup]

 Popup schließen

-[Dismiss PopUp]

+[Dismiss Popup]

 Popup schließen

 [Dismiss Popup]

 Popup schließen

@@ -881,9 +881,9 @@ Frequenz
 von

 [From]

 Von

-[From PopUp plugin]

+[From Popup plugin]

 Vom Popup-Plugin

-[&From PopUp plugin]

+[&From Popup plugin]

 Vom Popup-Plugin

 [From popup plugin]

 Vom Popup-Plugin

@@ -1487,15 +1487,15 @@ Nachmittags
 Popup

 [Popup]

 Popup

-[PopUp]

+[Popup]

 Popup

 [popups]

 Popups

-[PopUps]

+[Popups]

 Popups

-[PopUp 1.0.1.x compatability]

+[Popup 1.0.1.x compatability]

 Popup-1.0.1.x-Kompatibilität

-[PopUp click]

+[Popup click]

 Popup-Klick

 [Popup colors]

 Popup-Farben

@@ -1785,7 +1785,7 @@ Avatare anzeigen
 [Show headers]

 Kopfzeilen anzeigen

 [Show/hide popups]

-PopUps anzeigen/verstecken

+Popups anzeigen/verstecken

 [Show history]

 Verlauf zeigen

 [Show History]

@@ -5640,7 +5640,7 @@ Selben Stil wie im Verlaufsfenster verwenden
 Benutzerdefinierte Farben

 [Timeout (s)]

 Zeitüberschreitung (s)

-[(The timeout require at least PopUp plugin v 1.0.1.9. Setting it to 0 means default setting and -1 means indefinite time)]

+[(The timeout require at least Popup plugin v 1.0.1.9. Setting it to 0 means default setting and -1 means indefinite time)]

  0 = Standardwert vom Popup-Plugin\n-1 = Dauerhafte Anzeige

 [Clear lo&g]

 Verlauf löschen

@@ -6014,13 +6014,13 @@ Warnung: Popup-Plugin nicht gefunden!
 Warnung: Installiertes Popup-Plugin wird nicht unterstützt! Bitte installieren Sie eine aktuellere Version!

 

 ;  Typing

-[PopUp timeout (is typing)]

+[Popup timeout (is typing)]

 Anzeigedauer (tippt gerade)

 [From protocol]

 Vom Protokoll

 

 ;  Stopped Typing

-[PopUp timeout (stopped typing)]

+[Popup timeout (stopped typing)]

 Anzeigedauer (tippt nicht mehr)

 

 ;  Contact List

@@ -8811,7 +8811,7 @@ Layout des Textes ist aktuelles Layout
 Ergebnisbehandlung

 [Copy result to clipboard]

 Ergebnis in Zwischenablage kopieren

-[Show result in PopUp]

+[Show result in Popup]

 Ergebnis als Popup zeigen

 [Strings for keyboard layouts]

 Zeichenketten für Tastaturlayout

@@ -8823,7 +8823,7 @@ Aktuellen Status umkehren
 Ausschalten

 [Leave as it is]

 Beibehalten

-[PopUp colours]

+[Popup colours]

 Popupfarben

 [Custom colours]

 Eigene Farben

@@ -11378,7 +11378,7 @@ Man kann unterschiedliche Einstellungen für jedes Protokoll setzen
 [The status of "pushed-down" protocols won't be changed]

 Der Status von "gedrückten" Protokollen wird nicht geändert werden.

 [Popups should ... while process is running]

-PopUps sollten bei laufendem Prozess...

+Popups sollten bei laufendem Prozess...

 [Sounds should ... while process is running]

 Klänge sollten bei laufendem Prozess...

 [be enabled]

@@ -11893,8 +11893,8 @@ Sende eine Meldung, wenn Du länger nachdenken willst
 Zeige eine Einladungsnachricht

 [as events in the contact list]

 als Ereignis in der Kontaktliste

-[in PopUp windows]

-in PopUp Fenster

+[in Popup windows]

+in Popup Fenster

 [Resend your move until the reply coming, every]

 Wiederhole Deinen Zug bis jede Antwort kommt

 [Query for continuation of the saved game]

@@ -17834,14 +17834,14 @@ Fehler unterdrücken
 keine Startüberprüfung

 [Silently]

 Unbemerkt

-[Use PopUps]

+[Use Popups]

 Popups zeigen

 [Show Result]

 Ergebnis zeigen

 [Don't re-request mail box Automatically]

 Posteingang nicht automatisch erneut abfragen

 

-[Visit GMail on E-Mail PopUp click]

+[Visit GMail on E-Mail Popup click]

 GMail bei Klick auf Popup besuchen

 

 [Check Now!]

@@ -18359,7 +18359,7 @@ Maximale Dateigröße
 Hinweis:

 [Old status]

 Alter Status

-[PopUp Colors]

+[Popup Colors]

 Farben

 [Popup interoperability missing or disabled. You need Popups plugin]

 Popupfunktionalität fehlt oder ist deaktiviert. Sie benötigen ein Popup-Plugin.

@@ -18746,7 +18746,7 @@ Mit Zeichen markieren
 Zeichen vor den Namen setzen

 [Use MultiWindow icon]

 MultiWindow-Icon verwenden

-[Use PopUp]

+[Use Popup]

 Popups zeigen

 [Timeout:]

 Dauer:

@@ -19425,7 +19425,7 @@ MRIM-Proxyverbindungen aktivieren
 Block-Größe der gesendeten Datei:

 [512 - 65536 bytes]

 512 - 65536 Bytes

-[PopUp type]

+[Popup type]

 Popup-Typ

 [Popup settings]

 Popup-Einstellungen

@@ -23141,7 +23141,7 @@ Status zu "Online" wechseln nach ersetzen des Profils
 

 [Event Notify]

 Ereignismeldungen

-[Show entry in the PopUps menu]

+[Show entry in the Popups menu]

 Eintrag in Hauptmenü -> Popups

 [Temporarily disable Event Popups]

 Ereignismeldungen deaktivieren

@@ -23297,7 +23297,7 @@ Kontakt telefoniert gerade.
 

 [Use default...]

 Benutze Standard...

-[Show PopUps when I connect]

+[Show Popups when I connect]

 Popups beim Verbinden

 [&Log status changes to file]

 Statusänderungen in &Logdatei speichern

@@ -24401,7 +24401,7 @@ Externen Verlauf
 Internen Verlauf

 [Maximum entries]

 Maximalen Eintrage

-[PopUp text]

+[Popup text]

 Popup Text

 

 [My Custom Name]

@@ -24427,7 +24427,7 @@ Log-Format.
 [Use contact's custom nickname to display popup]

 Eigenen Alias in Popup verwenden

 

-[PopUp display time]

+[Popup display time]

 Anzeigedauer

 [Maximun history entry]

 Maximale Verlaufseinträge

@@ -25094,8 +25094,8 @@ PING ZIELE
 

 

 

-[En&large PopUps by]

-Erweiterte PopUps von

+[En&large Popups by]

+Erweiterte Popups von

 [Content && Style]

 Inhalt && Stil

 [Display time]

@@ -25240,7 +25240,7 @@ Uhrzeit anzeigen
 Einfache Uhr (für konfigurierbare Fonts)

 [Avatar to the right(if enabled above)]

 Avatar auf der rechten Seite (falls oben aktiviert)

-[Customizable PopUp colors]

+[Customizable Popup colors]

 Anpassbare Popup-Farben

 [Customizable font colors]

 Anpassbare Schriftfarben

@@ -25469,8 +25469,8 @@ Popup-Fehler Benachrichtigung
 Fehler bei der Vorschau-Fenster-Klasse Registrierung.

 [Do you really want to reset Popup Plus settings?]

 Möchten Sie wirklich alle Popup-Plus-Optionen zurücksetzen?

-[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.

+[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.

 

 

 ; BlackStone Skin

@@ -27147,18 +27147,18 @@ Sichere Nachricht (eingehend)
 [Outgoing Secure Message]

 Sichere Nachricht (ausgehend)

 

-[SecureIM PopUp Colors]

+[SecureIM Popup Colors]

 Farben der Popups

 [Key agreement colors]

 Schlüsselaustausch

 [Secure connection colors]

 Sichere Verbindung

 

-[PopUp Timeout]

+[Popup Timeout]

 Anzeigedauer

 [Time in Seconds]

 Zeit in Sekunden

-[0 = Default PopUp Timeout Value]

+[0 = Default Popup Timeout Value]

 0 = Standard

 

 [Show a popup on each secure receive]

@@ -29471,7 +29471,7 @@ Empfangen
 ; Link: http://www.torun.mm.pl/~slotwin/smcn/smcnotifytest.zip

 ; Ãœbersetzung: Foso am 28.3.07

 

-[Enable PopUps]

+[Enable Popups]

 Popups aktivieren

 [Only if status message has changed]

 Nur wenn sich die Statusnachricht geändert hat

@@ -29515,7 +29515,7 @@ Verlauf de-/aktivieren für diesen Kontakt
 Speichern in Datei für diesen Kontakt de-/aktivieren

 [Keep History]

 Verlauf behalten

-[Show PopUps]

+[Show Popups]

 Popups zeigen

 [Log To File]

 Loggen in Datei

@@ -33031,8 +33031,8 @@ Zum Gesprächsverlauf hinzufügen
 [Automatically split messages that are too long]

 Zu lange Nachrichten automatisch aufteilen

 

-[Show a PopUp]

-PopUp zeigen

+[Show a Popup]

+Popup zeigen

 [Use default text colour]

 Standard Textfarbe nutzen

 [Use default background colour]

@@ -35922,13 +35922,13 @@ Popup Verzögerung
 Verzögerung wählen

 [Show infinitely]

 Ewig zeigen

-[Default PopUp delay]

+[Default Popup delay]

 Standard Popup Verzögerung

 [Popup color settings]

 Popup Farben

 [Choose colors]

 Farben wählen

-[Use default PopUp colors]

+[Use default Popup colors]

 Standard Popup Farben

 [File access filter & logging settings ]

 Dateizugriffsfilter & Aufzeichnungseinstellungen

@@ -36371,10 +36371,10 @@ Andere Einstellungen
 Zur Standard-Station machen

 [Disable automatic update for this station]

 Automatische Aktualisierung für diese Station deaktivieren

-[Disable PopUp for this station]

+[Disable Popup for this station]

 Popups für diese Station deaktivieren

 

-[PopUp Options]

+[Popup Options]

 Popup-Einstellungen

 [Popup only when condition changes]

 Popups nur bei Wetteränderung

@@ -37308,7 +37308,7 @@ Unterdrücke Fehlermeldungen
 Deaktiviere Download-Schutz

 [(Not Recommended)]

 (Nicht empfehlenswert)

-[Display using PopUp or OSD plugin]

+[Display using Popup or OSD plugin]

 Via PopupPlus- oder OSD-Plugin

 [Open web page]

 Webseite öffnen

@@ -38343,10 +38343,10 @@ Lautstärke um 1% verringern
 'Jump to file'-Dialog öffnen

 [Add current track as a bookmark]

 Aktuellen Track als Bookmark einfügen

-[Close PopUp immediately after left click]

-PopUp nach Linksklick schließen

-[Close PopUp immediately after right click]

-PopUp nach Rechtsklick schließen

+[Close Popup immediately after left click]

+Popup nach Linksklick schließen

+[Close Popup immediately after right click]

+Popup nach Rechtsklick schließen

 

 ; ##############################################

 ; End of langpack: WinampNotify

@@ -39715,7 +39715,7 @@ Benachrichtige in Kontaktliste
 

 [Notify use:]

 Benachrichtigung über:

-[PopUp plugin:]

+[Popup plugin:]

 Popup-Plugin

 [Preview]

 Vorschau

diff --git a/langpacks/german/LinkList.txt b/langpacks/german/LinkList.txt
index 337e12ae39..71edaa4a00 100644
--- a/langpacks/german/LinkList.txt
+++ b/langpacks/german/LinkList.txt
@@ -92,7 +92,7 @@ http://svn.miranda-ng.org/main/trunk/langpacks/german/Plugins/PasteIt.txt
 http://svn.miranda-ng.org/main/trunk/langpacks/german/Plugins/Ping.txt

 http://svn.miranda-ng.org/main/trunk/langpacks/german/Plugins/PluginUpdater.txt

 http://svn.miranda-ng.org/main/trunk/langpacks/german/Plugins/PManagerEx.txt

-http://svn.miranda-ng.org/main/trunk/langpacks/german/Plugins/PopUp.txt

+http://svn.miranda-ng.org/main/trunk/langpacks/german/Plugins/Popup.txt

 http://svn.miranda-ng.org/main/trunk/langpacks/german/Plugins/QuickContacts.txt

 http://svn.miranda-ng.org/main/trunk/langpacks/german/Plugins/QuickMessages.txt

 http://svn.miranda-ng.org/main/trunk/langpacks/german/Plugins/QuickReplies.txt

diff --git a/langpacks/german/Plugins/AdvancedAutoAway.txt b/langpacks/german/Plugins/AdvancedAutoAway.txt
index 51705e15a5..eb8f4ada28 100644
--- a/langpacks/german/Plugins/AdvancedAutoAway.txt
+++ b/langpacks/german/Plugins/AdvancedAutoAway.txt
@@ -154,7 +154,7 @@ Bei Versuch des Neuverbindens
 Wenn Wiederverbinden beendet

 [Show other messages]

 Andere Meldungen anzeigen

-[From PopUp plugin]

+[From Popup plugin]

 Vom Popup-Plugin

 [Custom]

 Benutzerdef.

diff --git a/langpacks/german/Plugins/AvatarHistory.txt b/langpacks/german/Plugins/AvatarHistory.txt
index 6aa8516565..41eb206071 100644
--- a/langpacks/german/Plugins/AvatarHistory.txt
+++ b/langpacks/german/Plugins/AvatarHistory.txt
@@ -165,7 +165,7 @@ Avataroverlay
 ;file \plugins\AvatarHistory\src\options.cpp

 [Avatar]

 Avatar

-[PopUps]

+[Popups]

 Popups

 [Avatar Change]

 Avataränderung

diff --git a/langpacks/german/Plugins/BuddyExpectator.txt b/langpacks/german/Plugins/BuddyExpectator.txt
index 9071e0cf21..624e342d82 100644
--- a/langpacks/german/Plugins/BuddyExpectator.txt
+++ b/langpacks/german/Plugins/BuddyExpectator.txt
@@ -128,7 +128,7 @@ Kontaktname:
 

 [Contacts]

 Kontakte

-[PopUps]

+[Popups]

 Popups

 [not detected]

 nicht ermittelt

diff --git a/langpacks/german/Plugins/ChangeKeyboardLayout.txt b/langpacks/german/Plugins/ChangeKeyboardLayout.txt
index 33c4547eff..67e2194ab1 100644
--- a/langpacks/german/Plugins/ChangeKeyboardLayout.txt
+++ b/langpacks/german/Plugins/ChangeKeyboardLayout.txt
@@ -26,7 +26,7 @@ Einstellungen
 Ergebnisbehandlung

 [Copy result to clipboard]

 Ergebnis in Zwischenablage kopieren

-[Show result in PopUp]

+[Show result in Popup]

 Ergebnis als Popup zeigen

 [Strings for keyboard layouts]

 Zeichenketten für Tastaturlayout

@@ -46,7 +46,7 @@ Caps Lock Status bei Umkehrung der Groß-/Kleinschreibung ändern:
 

 [Colours]

 Farben

-[PopUp colours]

+[Popup colours]

 Popupfarben

 [Windows colours]

 Windowsfarben

@@ -58,7 +58,7 @@ Hgrd.
 Text

 [Timeout]

 Timeout

-[From PopUp plugin]

+[From Popup plugin]

 Vom Popup-Plugin

 [Permanent]

 Dauerhaft

@@ -86,5 +86,5 @@ Popup
 

 [Message Sessions]

 Nachrichtensitzungen

-[PopUps]

+[Popups]

 Popups

diff --git a/langpacks/german/Plugins/ClientChangeNotify.txt b/langpacks/german/Plugins/ClientChangeNotify.txt
index 9432db11d2..baa51925a1 100644
--- a/langpacks/german/Plugins/ClientChangeNotify.txt
+++ b/langpacks/german/Plugins/ClientChangeNotify.txt
@@ -79,7 +79,7 @@ Folgende Clients ignorieren (durch Semikolon trennen):
 C&lient Benachrichtigungen deaktivieren

 [Enable c&lient change notification]

 C&lient Benachrichtigungen aktivieren

-[PopUps]

+[Popups]

 Popups

 [ClientChangeNotify: Client changed]

 ClientChangeNotify: Client geändert

diff --git a/langpacks/german/Plugins/Facebook.txt b/langpacks/german/Plugins/Facebook.txt
index de823dc5f0..8d7c4a3aa0 100644
--- a/langpacks/german/Plugins/Facebook.txt
+++ b/langpacks/german/Plugins/Facebook.txt
@@ -169,7 +169,7 @@ Netzwerk
 Konto

 [Advanced]

 Erweitert

-[PopUps]

+[Popups]

 Popups

 [Events]

 Ereignisse

diff --git a/langpacks/german/Plugins/GTalkExt.txt b/langpacks/german/Plugins/GTalkExt.txt
index 51b911936e..f10c70cf50 100644
--- a/langpacks/german/Plugins/GTalkExt.txt
+++ b/langpacks/german/Plugins/GTalkExt.txt
@@ -47,7 +47,7 @@ Mailbox öffnen
 [You've received an e-mail\n%s unread threads]

 Sie haben eine E-Mail erhalten \n%s ungelesene Themen

 ;file \protocols\GTalkExt\src\options.cpp

-[PopUps]

+[Popups]

 Popups

 [Network]

 Netzwerk

diff --git a/langpacks/german/Plugins/ICQ.txt b/langpacks/german/Plugins/ICQ.txt
index 523d8fcc23..05c2f5dcee 100644
--- a/langpacks/german/Plugins/ICQ.txt
+++ b/langpacks/german/Plugins/ICQ.txt
@@ -1364,7 +1364,7 @@ Kontakte
 Funktionen

 [Privacy]

 Privatsphäre

-[PopUps]

+[Popups]

 Popups

 ;file \protocols\IcqOscarJ\src\icq_popups.cpp

 [Popup Title]

diff --git a/langpacks/german/Plugins/KeepStatus.txt b/langpacks/german/Plugins/KeepStatus.txt
index a504cd63ce..f0b825a927 100644
--- a/langpacks/german/Plugins/KeepStatus.txt
+++ b/langpacks/german/Plugins/KeepStatus.txt
@@ -154,7 +154,7 @@ Bei Versuch des Neuverbindens
 Wenn Wiederverbinden beendet

 [Show other messages]

 Andere Meldungen anzeigen

-[From PopUp plugin]

+[From Popup plugin]

 Vom Popup-Plugin

 [Custom]

 Benutzerdef.

@@ -317,7 +317,7 @@ Allgemein
 Erweitert

 [You broke the Internet!]

 Internetverbindung verloren

-[PopUps]

+[Popups]

 Popups

 ;file \Plugins\StatusPlugins\commonstatus.cpp

 [I've been away since %time%.]

diff --git a/langpacks/german/Plugins/MRA.txt b/langpacks/german/Plugins/MRA.txt
index bb0826d791..887588b7b1 100644
--- a/langpacks/german/Plugins/MRA.txt
+++ b/langpacks/german/Plugins/MRA.txt
@@ -124,7 +124,7 @@ Ein neues Mail.ru-Konto über die Mail.ru Website erstellen
 Vergessenes Kennwort anfordern

 [Leave empty if you dont want change password]

 

-[PopUp type]

+[Popup type]

 Popup-Typ

 [Popup settings]

 Popup-Einstellungen

@@ -289,7 +289,7 @@ Kontaktmenü
 Extra Status

 [Custom Status]

 Custom Status

-;file \protocols\MRA\src\MraPopUp.cpp

+;file \protocols\MRA\src\MraPopup.cpp

 [None]

 Keine

 [Debug]

@@ -304,7 +304,7 @@ Warnung
 Fehler

 [NewMail]

 Neue E-Mail

-[PopUps]

+[Popups]

 Popups

 ;file \protocols\MRA\src\MraProto.cpp

 [%s connection]

diff --git a/langpacks/german/Plugins/NewEventNotify.txt b/langpacks/german/Plugins/NewEventNotify.txt
index 9aee1d40f2..a15e19a5d2 100644
--- a/langpacks/german/Plugins/NewEventNotify.txt
+++ b/langpacks/german/Plugins/NewEventNotify.txt
@@ -10,7 +10,7 @@
 ;file \plugins\NewEventNotify\res\resource.rc

 [General Options]

 Allgemeine Einstellungen

-[Show entry in the PopUps menu]

+[Show entry in the Popups menu]

 Eintrag in Hauptmenü -> Popups

 [Temporarily disable Event Popups]

 Ereignismeldungen deaktivieren

@@ -82,7 +82,7 @@ Nachrichtensitzung
 [Message Received]

 Nachricht empfangen

 ;file \plugins\NewEventNotify\src\menuitem.cpp

-[PopUps]

+[Popups]

 Popups

 ;file \plugins\NewEventNotify\src\neweventnotify.h

 [Contacts]

diff --git a/langpacks/german/Plugins/NewXstatusNotify.txt b/langpacks/german/Plugins/NewXstatusNotify.txt
index 4c3ed36766..2690dc9af8 100644
--- a/langpacks/german/Plugins/NewXstatusNotify.txt
+++ b/langpacks/german/Plugins/NewXstatusNotify.txt
@@ -172,7 +172,7 @@ Identische Aufzeichnungen verhindern
 Bei Log-Öffnung:

 [General]

 Allgemein

-[Show PopUps when I connect]

+[Show Popups when I connect]

 Popups beim Verbinden

 [Ignore empty status messages]

 Leere Statusnachrichten ignorieren

@@ -330,7 +330,7 @@ Protokoll
 Filtern

 [Message log]

 Nachrichtenverlauf

-[PopUps]

+[Popups]

 Popups

 ;file \plugins\NewXstatusNotify\src\popup.h

 [Open message window]

diff --git a/langpacks/german/Plugins/PackUpdater.txt b/langpacks/german/Plugins/PackUpdater.txt
index 3cea40507f..3fec848bab 100644
--- a/langpacks/german/Plugins/PackUpdater.txt
+++ b/langpacks/german/Plugins/PackUpdater.txt
@@ -82,7 +82,7 @@ Sek.
 Gilt nicht für "Message Boxes"

 [Boxes]

 Fenster

-[PopUps]

+[Popups]

 Popups

 ;file \plugins\PackUpdater\Src\Events.cpp

 [Check for pack updates]

diff --git a/langpacks/german/Plugins/Ping.txt b/langpacks/german/Plugins/Ping.txt
index a4845099da..5f293d91db 100644
--- a/langpacks/german/Plugins/Ping.txt
+++ b/langpacks/german/Plugins/Ping.txt
@@ -22,7 +22,7 @@ In Datei speichern
 Log Dateiname:

 [Network]

 Netzwerk

-[PopUps]

+[Popups]

 Popups

 [Reply]

 Antworten

diff --git a/langpacks/german/Plugins/PluginUpdater.txt b/langpacks/german/Plugins/PluginUpdater.txt
index 6fac7afcd4..0ce80d08a5 100644
--- a/langpacks/german/Plugins/PluginUpdater.txt
+++ b/langpacks/german/Plugins/PluginUpdater.txt
@@ -88,7 +88,7 @@ Sek.
 Gilt nicht für "Message Boxes"

 [Boxes]

 Fenster

-[PopUps]

+[Popups]

 Popups

 ;file \plugins\PluginUpdater\src\Notifications.cpp

 [Skipped.]

diff --git a/langpacks/german/Plugins/PopUp.txt b/langpacks/german/Plugins/PopUp.txt
index 6259e5d62a..607cc73f04 100644
--- a/langpacks/german/Plugins/PopUp.txt
+++ b/langpacks/german/Plugins/PopUp.txt
@@ -1,7 +1,7 @@
 #muuid {26a9125d-7863-4e01-af0e-d14ef95c5054}

 ;============================================================

-;  File: PopUp.dll

-;  Plugin: PopUp plus

+;  File: Popup.dll

+;  Plugin: Popup plus

 ;  Version: 2.1.1.7

 ;  Authors: MPK, Merlin_de (Luca Santarelli, Victor Pavlychko)

 ;============================================================

@@ -311,8 +311,8 @@ Popups deaktivieren
 &Popup-Modul deaktivieren

 [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.

+[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

 [No effect]

 Kein Effekt

diff --git a/langpacks/german/Plugins/Quotes.txt b/langpacks/german/Plugins/Quotes.txt
index c23e33d83e..a480a7b619 100644
--- a/langpacks/german/Plugins/Quotes.txt
+++ b/langpacks/german/Plugins/Quotes.txt
@@ -82,7 +82,7 @@ Hintergrundfarbe
 Textfarbe

 [Delay]

 Verzögerung

-[From PopUp plugin]

+[From Popup plugin]

 Vom Popup-Plugin

 [Custom]

 Benutzerdef.

diff --git a/langpacks/german/Plugins/SMCN.txt b/langpacks/german/Plugins/SMCN.txt
index e0054e6f4f..b1df73a952 100644
--- a/langpacks/german/Plugins/SMCN.txt
+++ b/langpacks/german/Plugins/SMCN.txt
@@ -14,9 +14,9 @@ Statusnachrichtenänderungsbenachrichtigung
 

 [List Contacts with Status Message]

 Kontaktliste mit Statusnachrichten

-[Disable SMCN PopUps]

+[Disable SMCN Popups]

 

-[Enable SMCN PopUps]

+[Enable SMCN Popups]

 

 [Status Message Changed]

 

diff --git a/langpacks/german/Plugins/Scriver.txt b/langpacks/german/Plugins/Scriver.txt
index 6b8ef4c730..4ee5b78a49 100644
--- a/langpacks/german/Plugins/Scriver.txt
+++ b/langpacks/german/Plugins/Scriver.txt
@@ -896,7 +896,7 @@ Erscheinungsbild
 

 [Select Folder]

 Ordner wählen

-[PopUps]

+[Popups]

 Popups

 [Group chats]

 Gruppenchats

diff --git a/langpacks/german/Plugins/SecureIM.txt b/langpacks/german/Plugins/SecureIM.txt
index 79998ffa48..05e4d0cb33 100644
--- a/langpacks/german/Plugins/SecureIM.txt
+++ b/langpacks/german/Plugins/SecureIM.txt
@@ -100,17 +100,17 @@ Schlüsselaustausch
 Sichere Verbindung

 [Send/Receive encrypted colors]

 Sichere Nachrichten

-[SecureIM PopUp Colors]

+[SecureIM Popup Colors]

 Farben der Popups

 [Preview]

 Vorschau

 [Events]

 Ereignisse

-[PopUp Timeout]

+[Popup Timeout]

 Anzeigedauer

 [Time in Seconds]

 Zeit in Sekunden

-[0 = Default PopUp Timeout Value]

+[0 = Default Popup Timeout Value]

 0 = Standard

 [Show a popup on established connection]

 Popup beim Aufbau einer Verbindung zeigen

@@ -423,5 +423,5 @@ Schlüssel-Popup
 Sicherheits-Popup

 [Message Popup]

 Nachrichten-Popup

-[PopUps]

+[Popups]

 Popups

diff --git a/langpacks/german/Plugins/SeenPlugin.txt b/langpacks/german/Plugins/SeenPlugin.txt
index 898a9dd548..4ce4015d98 100644
--- a/langpacks/german/Plugins/SeenPlugin.txt
+++ b/langpacks/german/Plugins/SeenPlugin.txt
@@ -40,7 +40,7 @@ Popups nutzen
 Titel

 [Text]

 Text

-[PopUp Colors]

+[Popup Colors]

 Farben

 [Online]

 Online

@@ -108,7 +108,7 @@ Zuletzt gesehen
 

 [Contacts]

 Kontakte

-[PopUps]

+[Popups]

 Popups

 ;file \plugins\SeenPlugin\src\seen.h

 [%n is %s (%u)]

diff --git a/langpacks/german/Plugins/StartupStatus.txt b/langpacks/german/Plugins/StartupStatus.txt
index b73a3a5d63..8072cf4195 100644
--- a/langpacks/german/Plugins/StartupStatus.txt
+++ b/langpacks/german/Plugins/StartupStatus.txt
@@ -154,7 +154,7 @@ Bei Versuch des Neuverbindens
 Wenn Wiederverbinden beendet

 [Show other messages]

 Andere Meldungen anzeigen

-[From PopUp plugin]

+[From Popup plugin]

 Vom Popup-Plugin

 [Custom]

 Benutzerdef.

diff --git a/langpacks/german/Plugins/TabSRMM.txt b/langpacks/german/Plugins/TabSRMM.txt
index a0eb79b0a3..ab0c3ecbc6 100644
--- a/langpacks/german/Plugins/TabSRMM.txt
+++ b/langpacks/german/Plugins/TabSRMM.txt
@@ -489,7 +489,7 @@ Windows Aero Einstellungen
 Aero UI Elemente verwenden (nur wenn kein eigener Skin verwendet wird)

 [Use Windows 7 task bar enhancements (restart required)]

 Windows 7 Taskleisten-Funktionen verwenden (Neustart nötig)

-[PopUps]

+[Popups]

 Popups

 [...is &typing]

 ...&tippt gerade

@@ -507,7 +507,7 @@ Nur ein P&opup pro Kontakt
 &Eintrag im Hauptmenü anzeigen

 [...is typing]

 ...tippt gerade

-[From PopUp plugin]

+[From Popup plugin]

 Vom Popup-Plugin

 [From protocol]

 Vom Protokoll

@@ -517,8 +517,8 @@ Dauerhaft
 Benutzerdef.

 [...stopped typing]

 ...tippt nicht mehr

-[PopUps timeout]

-PopUp-Zeitüberschreitung

+[Popups timeout]

+Popup-Zeitüberschreitung

 [Templates]

 Vorlagen

 [Edit template]

diff --git a/langpacks/german/Plugins/Tlen.txt b/langpacks/german/Plugins/Tlen.txt
index 9176d340d5..29e651950b 100644
--- a/langpacks/german/Plugins/Tlen.txt
+++ b/langpacks/german/Plugins/Tlen.txt
@@ -81,7 +81,7 @@ Hintergrund
 Text

 [Delay]

 Verzögerung

-[&From PopUp plugin]

+[&From Popup plugin]

 Vom Popup-Plugin

 [&Custom]

 Benutzerdefiniert

diff --git a/langpacks/german/Plugins/TooltipNotify.txt b/langpacks/german/Plugins/TooltipNotify.txt
index 9603aa9544..c32c720ac2 100644
--- a/langpacks/german/Plugins/TooltipNotify.txt
+++ b/langpacks/german/Plugins/TooltipNotify.txt
@@ -83,7 +83,7 @@ Andere Status
 

 [Tooltip Notify: Typing]

 

-[PopUps]

+[Popups]

 Popups

 [** New contacts **]

 ** Neue Kontakte **

diff --git a/langpacks/german/Plugins/TrafficCounter.txt b/langpacks/german/Plugins/TrafficCounter.txt
index 5b993b90ab..2f11e60b81 100644
--- a/langpacks/german/Plugins/TrafficCounter.txt
+++ b/langpacks/german/Plugins/TrafficCounter.txt
@@ -32,7 +32,7 @@ Textfarbe:
 Zurücksetzen auf Standard

 [Popup timeout]

 Popup Anzeigedauer

-[From PopUp plugin]

+[From Popup plugin]

 Vom Popup-Plugin

 [Custom]

 Benutzerdef.

@@ -95,7 +95,7 @@ Einstellungen
 Traffic Counter

 [Statistics]

 Statistiken

-[PopUps]

+[Popups]

 Popups

 ;file \plugins\TrafficCounter\src\statistics.cpp

 [Bytes]

diff --git a/langpacks/german/Plugins/Twitter.txt b/langpacks/german/Plugins/Twitter.txt
index e6e9eff337..344c4526a1 100644
--- a/langpacks/german/Plugins/Twitter.txt
+++ b/langpacks/german/Plugins/Twitter.txt
@@ -88,7 +88,7 @@ Tweet senden...
 Netzwerk

 [Basic]

 Allgemein

-[PopUps]

+[Popups]

 Popups

 [%s server connection]

 %s Serververbindung

diff --git a/langpacks/german/Plugins/UInfoEx.txt b/langpacks/german/Plugins/UInfoEx.txt
index ef2c0c5908..caf8f6d4ea 100644
--- a/langpacks/german/Plugins/UInfoEx.txt
+++ b/langpacks/german/Plugins/UInfoEx.txt
@@ -140,7 +140,7 @@ Windowsfarben verwenden
 Standardfarben verwenden

 [Delay]

 Verzögerung

-[From PopUp plugin]

+[From Popup plugin]

 Vom Popup-Plugin

 [Custom]

 Benutzerdef.

@@ -699,7 +699,7 @@ Kontakte
 Erweitert

 [Details Dialog]

 Kontaktinfo-Dialog

-[PopUps]

+[Popups]

 Popups

 ;file \plugins\UserInfoEx\src\psp_profile.cpp

 [Past]

diff --git a/langpacks/german/Plugins/Weather.txt b/langpacks/german/Plugins/Weather.txt
index 6ac462359f..7349d446ad 100644
--- a/langpacks/german/Plugins/Weather.txt
+++ b/langpacks/german/Plugins/Weather.txt
@@ -124,13 +124,13 @@ Andere Einstellungen
 Zur Standard-Station machen

 [Disable automatic update for this station]

 Automatische Aktualisierung für diese Station deaktivieren

-[Disable PopUp for this station]

+[Disable Popup for this station]

 Popups für diese Station deaktivieren

 [Change]

 Ändern

 [Cancel]

 Abbrechen

-[PopUp Options]

+[Popup Options]

 Popup-Einstellungen

 [Enable popups]

 Popups aktivieren

@@ -156,7 +156,7 @@ Popup-Verzögerung
 Verzögerung

 [seconds]

 Sekunden

-[From PopUp plugin]

+[From Popup plugin]

 Vom Popup-Plugin

 [Permanent]

 Dauerhaft

@@ -236,7 +236,7 @@ INI neu laden
 Stadt:

 [Menu]

 Menü

-[Dismiss PopUp]

+[Dismiss Popup]

 Popup schließen

 [Open brief information]

 Kurzinformationen öffnen

@@ -458,7 +458,7 @@ Netzwerk
 Allgemein

 [Display]

 Anzeige

-[PopUps]

+[Popups]

 Popups

 [%c\tcurrent condition\n%d\tcurrent date\n%e\tdewpoint\n%f\tfeel-like temp\n%h\ttoday's high\n%i\twind direction\n%l\ttoday's low\n%m\thumidity\n%n\tstation name\n%p\tpressure\n%r\tsunrise time\n%s\tstation ID\n%t\ttemperature\n%u\tupdate time\n%v\tvisibility\n%w\twind speed\n%y\tsun set]

 %c\tmomentane Lage\n%d\taktuelles Datum\n%e\tTaupunkt\n%f\tgefühlte Temperatur\n%h\tHöchsttemperatur\n%i\tWindrichtung\n%l\tgeringste Temp.\n%m\tLuftfeuchtigkeit\n%n\tStations-Name\n%p\tDruck\n%r\tSonnenaufgang\n%s\tStations-ID\n%t\tTemperatur\n%u\tAktualis.-Zeit\n%v\tSicht\n%w\tWind-Geschwind.\n%y\tSonnenuntergang

diff --git a/langpacks/german/Plugins/WhoUsesMyFiles.txt b/langpacks/german/Plugins/WhoUsesMyFiles.txt
index d5fb6b73e2..5048d1f4ea 100644
--- a/langpacks/german/Plugins/WhoUsesMyFiles.txt
+++ b/langpacks/german/Plugins/WhoUsesMyFiles.txt
@@ -14,7 +14,7 @@
 OK

 [Popup delay settings]

 Popup Verzögerung

-[PopUp Delay (seconds)]

+[Popup Delay (seconds)]

 

 [Background color]

 Hintergrundfarbe

@@ -24,7 +24,7 @@ Textfarbe
 Vorschau

 [Show infinitely]

 Ewig zeigen

-[Default PopUp delay]

+[Default Popup delay]

 Standard Popup Verzögerung

 [Choose delay time]

 Verzögerung wählen

@@ -32,13 +32,13 @@ Verzögerung wählen
 Popup Farben

 [Use windows colors]

 Windowsfarben verwenden

-[Use default PopUp colors]

+[Use default Popup colors]

 Standard Popup Farben

 [Choose colors]

 Farben wählen

 [File access filter && logging settings]

 

-[Please note that this settings has effect only with PopUps Interoperability plugin version 1.0.1.9 or higher]

+[Please note that this settings has effect only with Popups Interoperability plugin version 1.0.1.9 or higher]

 

 [Log into text file]

 Textdatei speichern

@@ -76,7 +76,7 @@ Datei
 ;file \plugins\WhoUsesMyFiles\src\wumfplug.cpp

 [Error crerating menu]

 

-[PopUp plugin not found!]

+[Popup plugin not found!]

 

 [WUMF plugin]

 

@@ -96,7 +96,7 @@ WUMF Popups aktivieren
 WUMF

 [Services]

 Dienste

-[PopUps]

+[Popups]

 Popups

 [WUMF: Show connections]

 

diff --git a/langpacks/german/Plugins/YAMN.txt b/langpacks/german/Plugins/YAMN.txt
index 004d45d6b1..c25b641b27 100644
--- a/langpacks/german/Plugins/YAMN.txt
+++ b/langpacks/german/Plugins/YAMN.txt
@@ -333,7 +333,7 @@ Konten
 Allgemein

 [Plugins]

 Plugins

-[PopUps]

+[Popups]

 Popups

 [No account selected]

 Kein Konto ausgewählt

diff --git a/langpacks/german/Plugins/YAPP.txt b/langpacks/german/Plugins/YAPP.txt
index f49048cc64..2c055f29ef 100644
--- a/langpacks/german/Plugins/YAPP.txt
+++ b/langpacks/german/Plugins/YAPP.txt
@@ -114,7 +114,7 @@ Vertikale Animation
 Ein Timeout von 0 ist ungültig.\nWert wurde zurückgesetzt.

 [Error]

 Fehler

-[PopUps]

+[Popups]

 Popups

 [Settings]

 Einstellungen

diff --git a/langpacks/german/Untranslated/Plugins/SMCN.txt b/langpacks/german/Untranslated/Plugins/SMCN.txt
index 0d9a1cade2..39f5e10608 100644
--- a/langpacks/german/Untranslated/Plugins/SMCN.txt
+++ b/langpacks/german/Untranslated/Plugins/SMCN.txt
@@ -1,8 +1,8 @@
 [Enable &status message change notification]

 [Disable &status message change notification]

 [View Status Message History]

-[Disable SMCN PopUps]

-[Enable SMCN PopUps]

+[Disable SMCN Popups]

+[Enable SMCN Popups]

 [Status Message Changed]

 [changes his/her status message to:]

 [cleares his/her status message]

diff --git a/langpacks/german/Untranslated/Plugins/WhoUsesMyFiles.txt b/langpacks/german/Untranslated/Plugins/WhoUsesMyFiles.txt
index 75964b8e55..f989eb68bd 100644
--- a/langpacks/german/Untranslated/Plugins/WhoUsesMyFiles.txt
+++ b/langpacks/german/Untranslated/Plugins/WhoUsesMyFiles.txt
@@ -1,8 +1,8 @@
 [Scans for network users of your shared files and notify you with popups.]

 [WUMF: Current connections]

-[PopUp Delay (seconds)]

+[Popup Delay (seconds)]

 [File access filter && logging settings]

-[Please note that this settings has effect only with PopUps Interoperability plugin version 1.0.1.9 or higher]

+[Please note that this settings has effect only with Popups Interoperability plugin version 1.0.1.9 or higher]

 [Log files and folders in UNC format]

 [Alert files && folders in UNC format]

 [Log computer name with username]

@@ -13,7 +13,7 @@
 [Error opening file]

 [Error memory allocation]

 [Error crerating menu]

-[PopUp plugin not found!]

+[Popup plugin not found!]

 [WUMF plugin]

 [Disable WUMF popups]

 [Common Dialog Error 0x%lx]

diff --git a/langpacks/polish/=DUPES=.txt b/langpacks/polish/=DUPES=.txt
index 5173e7c3f4..1d9582b641 100644
--- a/langpacks/polish/=DUPES=.txt
+++ b/langpacks/polish/=DUPES=.txt
@@ -27,8 +27,8 @@ Niedostępny
 PodglÄ…d

 [Permanent]

 Stałe

-[From PopUp plugin]

-Z wtyczki PopUp

+[From Popup plugin]

+Z wtyczki Popup

 [seconds]

 sekund

 [Delay]

@@ -177,7 +177,7 @@ Nieznany
 Przychodzące wiadomości

 [Outgoing messages]

 Wychodzące wiadomości

-[Show PopUps when I connect]

+[Show Popups when I connect]

 Pokaż popupy podczas łączenia

 [Blink icon in the system tray]

 Migaj ikonÄ… w zasobniku systemowym

diff --git a/langpacks/polish/LinkList.txt b/langpacks/polish/LinkList.txt
index 6b3aab1aa2..d39435fb50 100644
--- a/langpacks/polish/LinkList.txt
+++ b/langpacks/polish/LinkList.txt
@@ -45,7 +45,7 @@ http://svn.miranda-ng.org/main/trunk/langpacks/polish/Plugins/PackUpdater.txt
 http://svn.miranda-ng.org/main/trunk/langpacks/polish/Plugins/PasteIt.txt

 http://svn.miranda-ng.org/main/trunk/langpacks/polish/Plugins/Ping.txt

 http://svn.miranda-ng.org/main/trunk/langpacks/polish/Plugins/PManagerEx.txt

-http://svn.miranda-ng.org/main/trunk/langpacks/polish/Plugins/PopUp.txt

+http://svn.miranda-ng.org/main/trunk/langpacks/polish/Plugins/Popup.txt

 http://svn.miranda-ng.org/main/trunk/langpacks/polish/Plugins/QuickSearch.txt

 http://svn.miranda-ng.org/main/trunk/langpacks/polish/Plugins/Scriver.txt

 http://svn.miranda-ng.org/main/trunk/langpacks/polish/Plugins/SeenPlugin.txt

diff --git a/langpacks/polish/Plugins/AvatarHist.txt b/langpacks/polish/Plugins/AvatarHist.txt
index 35389035d5..46cae4c33c 100644
--- a/langpacks/polish/Plugins/AvatarHist.txt
+++ b/langpacks/polish/Plugins/AvatarHist.txt
@@ -44,7 +44,7 @@ Pokaż popup kiedy kontakt zmieni swój awatar
 [ Delay ]

 Opóźnienie

 [From popup plugin]

-Z wtyczki PopUp

+Z wtyczki Popup

 [ Actions ]

 Akcje

 [On right click:]

diff --git a/langpacks/polish/Plugins/GTalkExt.txt b/langpacks/polish/Plugins/GTalkExt.txt
index 49dfd9ad93..bba709aaa2 100644
--- a/langpacks/polish/Plugins/GTalkExt.txt
+++ b/langpacks/polish/Plugins/GTalkExt.txt
@@ -14,7 +14,7 @@ Nieprzeczytane:
 [GMail notifications]
 Powiadomienia GMail
 [Popup notifications (needs popup plugin)]
-Powiadomienia Popup (wymagany plugin PopUp)
+Powiadomienia Popup (wymagany plugin Popup)
 [Notify in contact list]
 Informuj na liście kontaktów
 [Clear pseudocontact history before adding new events]
diff --git a/langpacks/polish/Plugins/PopUp.txt b/langpacks/polish/Plugins/PopUp.txt
index 01d73d1c55..596c23a692 100644
--- a/langpacks/polish/Plugins/PopUp.txt
+++ b/langpacks/polish/Plugins/PopUp.txt
@@ -1,6 +1,6 @@
 ;============================================================
 ;  File: popup.dll
-;  Module: Popup Interoperability, PopUp Plus
+;  Module: Popup Interoperability, Popup Plus
 ;  Versions: 2.1.1.5
 ;============================================================
 [Time]
@@ -31,7 +31,7 @@ Uproszczony zegar
 Pokaż czas
 [* Popup Classic]
 * Klasyczny popup
-[PopUp 1.0.1.x compatability]
+[Popup 1.0.1.x compatability]
 Kompatybilność z wersją 1.0.1.x
 [You need the png2dib plugin v. 0.1.3.x or later to process PNG images]
 Potrzebujesz wtyczki png2dib 0.1.3.x lub nowszej żeby wyświetlać obrazki PNG
@@ -65,7 +65,7 @@ Przełącz Popupy
 WÅ‚Ä…cz Popupy
 [Disable &popup module]
 Wyłącz Popupy
-[Error: I could not register the PopUp Window class.\nThe plugin will not operate.]
+[Error: I could not register the Popup Window class.\nThe plugin will not operate.]
 Błąd: Nie można zarejestrować klasy okien popupów.\nWtyczka nie będzie działać.
 [<empty>]
  <pusty>
diff --git a/langpacks/polish/Plugins/SMCN.txt b/langpacks/polish/Plugins/SMCN.txt
index 627a76a06a..70665a30e2 100644
--- a/langpacks/polish/Plugins/SMCN.txt
+++ b/langpacks/polish/Plugins/SMCN.txt
@@ -33,13 +33,13 @@ Dziennik
 Szablon dziennika
 [You can use %c with log filename to append nicknames]
 Możesz użyć %c z nazwą pliku dziennika aby dołączyć nazwy
-[Show PopUps]
+[Show Popups]
 Pokaz popupy
 [Keep History]
 Zapisuj historiÄ™
 [Log To File]
 Zapisuj do pliku
-[Enable PopUps]
+[Enable Popups]
 WÅ‚Ä…cz popupy
 [Only if status message has changed]
 Tylko kiedy nastÄ…pi zmiana opisu
diff --git a/langpacks/polish/Plugins/SeenPlugin.txt b/langpacks/polish/Plugins/SeenPlugin.txt
index 7d3542873a..88414b8da2 100644
--- a/langpacks/polish/Plugins/SeenPlugin.txt
+++ b/langpacks/polish/Plugins/SeenPlugin.txt
@@ -81,7 +81,7 @@ koniec linii
 Włącz wsparcie dla bezczynności
 [Use popups]
 Użyj popup
-[PopUp Colors]
+[Popup Colors]
 Kolory
 [Reset colors]
 Resetuj
diff --git a/langpacks/polish/Plugins/TabSRMM.txt b/langpacks/polish/Plugins/TabSRMM.txt
index d352bb25d5..48688e55ae 100644
--- a/langpacks/polish/Plugins/TabSRMM.txt
+++ b/langpacks/polish/Plugins/TabSRMM.txt
@@ -1053,11 +1053,11 @@ Stwórz nowy
 Tylko jeden popup dla każdego kontaktu
 [Show &entry in the main menu]
 Pokaż wpis w menu głównym
-[PopUp timeout (is typing)]
+[Popup timeout (is typing)]
 Czas wyświetlania (pisze)
 [From protocol]
 Z protokołu
-[PopUp timeout (stopped typing)]
+[Popup timeout (stopped typing)]
 Czas wyświetlania (przestał pisać)
 [Templates]
 Szablony
@@ -1963,7 +1963,7 @@ Użyj takiego samego stylu, jak w dzienniku
 Popupy dla wtyczki Chat
 [Timeout (s)]
 Opóźnienie (s)
-[(The timeout require at least PopUp plugin v 1.0.1.9. Setting it to 0 means default setting and -1 means indefinite time)]
+[(The timeout require at least Popup plugin v 1.0.1.9. Setting it to 0 means default setting and -1 means indefinite time)]
 (Opóźnienie wymaga wtyczki Popup 1.0.1.9 lub nowszej. Wartość 0 - ustawienia domyślne, -1 - nieokreślony czas)
 [List]
 Lista
diff --git a/langpacks/polish/Plugins/Weather.txt b/langpacks/polish/Plugins/Weather.txt
index 2056ad1721..507627f3c5 100644
--- a/langpacks/polish/Plugins/Weather.txt
+++ b/langpacks/polish/Plugins/Weather.txt
@@ -95,9 +95,9 @@ Inne opcje
 Ustaw jako domyślną stacje
 [Disable automatic update for this station]
 Wyłącz automatyczną aktualizację dla tej stacji
-[Disable PopUp for this station]
+[Disable Popup for this station]
 Wyłącz Popup dla tej stacji
-[PopUp Options]
+[Popup Options]
 Opcje Popup
 [Popup only when condition changes]
 Tylko przy zmianie warunków
@@ -167,7 +167,7 @@ Razem używanej pamięci
 Odśwież INI
 [Menu]
 Menu
-[Dismiss PopUp]
+[Dismiss Popup]
 Odrzuć Popup
 [Open brief information]
 Otwórz krótkie informacje
diff --git a/langpacks/russian/=CORE=.txt b/langpacks/russian/=CORE=.txt
index 07f7a035c2..1113a1788f 100644
--- a/langpacks/russian/=CORE=.txt
+++ b/langpacks/russian/=CORE=.txt
@@ -2239,8 +2239,8 @@ Miranda не может загрузить плагин Chat, потому чтÐ
 Закрыть о�тальные вкладки

 [User list members (Away)]

 Пользователи (от�ут�твуют)

-[(The timeout require at least PopUp plugin v 1.0.1.9. Setting it to 0 means default setting and -1 means indefinite time)]

-(�еобходим PopUp плагин вер�ии 1.0.1.9 и выше.\nУ�тановка в 0 = значение по умолчанию, -1 = бе�конечно)

+[(The timeout require at least Popup plugin v 1.0.1.9. Setting it to 0 means default setting and -1 means indefinite time)]

+(�еобходим Popup плагин вер�ии 1.0.1.9 и выше.\nУ�тановка в 0 = значение по умолчанию, -1 = бе�конечно)

 ;;;

 [User list members]

 Пользователи

diff --git a/langpacks/russian/=DUPES=.txt b/langpacks/russian/=DUPES=.txt
index 193e84ef66..3b314701cf 100644
--- a/langpacks/russian/=DUPES=.txt
+++ b/langpacks/russian/=DUPES=.txt
@@ -355,7 +355,7 @@ xСтату� %s
 Выключен

 [Disconnects]

 Отключени�

-[Dismiss PopUp]

+[Dismiss Popup]

 Закрыть

 [Dismiss]

 Убрать

@@ -463,7 +463,7 @@ E-Mail
 Друзь�

 [From popup plugin]

 По умолчанию

-[From PopUp plugin]

+[From Popup plugin]

 По умолчанию

 [From]

 От

@@ -847,13 +847,13 @@ E-Mail
 В�плывающее окно

 [Popup timeout:]

 Длительно�ть:

-[PopUp]

+[Popup]

 В�плывающее окно

 [Popup]

 В�плывающие окна

 [Popups]

 В�плывающие окна

-[PopUps]

+[Popups]

 В�плывающие окна

 [Port]

 Порт

@@ -1035,7 +1035,7 @@ E-Mail
 Выходы уча�тников

 [Show popup]

 Показывать в�пл. окно

-[Show PopUps when I connect]

+[Show Popups when I connect]

 Окна при подключении

 [Show popups]

 Показывать в�плывающие окна

@@ -1347,7 +1347,7 @@ Web �траница
 Кнопки мыши

 [Popup Delay]

 Задержка окна

-[PopUp Options]

+[Popup Options]

 В�плывающие окна

 [Popup Title]

 Заголовок окна

@@ -2085,7 +2085,7 @@ ID пользовател�:
 Показать приглашени� к игре

 [as events in the contact list]

 �обыти�ми в �пи�ке контактов

-[in PopUp windows]

+[in Popup windows]

 во в�плывающих окнах

 [Load &skin...]

 Загрузить &�кин...

@@ -3325,17 +3325,17 @@ Web Дизайн
 Внешн�� и�тори�

 [Internal History]

 Внутренн�� и�тори�

-[PopUp Notify]

+[Popup Notify]

 Уведомление в�пл. окнами

-[PopUp Enabled]

+[Popup Enabled]

 В�пл. окна включены

-[PopUp Disabled]

+[Popup Disabled]

 В�пл. окна отключены

 [Enable/Disable external logging for this contact]

 Включить/выключить запи�ь во внешний журнал дл� �того контакта

 [Maximum entries]

 Запи�ей

-[PopUp text]

+[Popup text]

 Тек�т окна

 [Enable/Disable internal logging for this contact]

 Включить/выключить запи�ь во внутренний журнал дл� �того контакта

@@ -3349,7 +3349,7 @@ Web Дизайн
 И�тори�

 [Log format]

 Журнал

-[PopUp display time]

+[Popup display time]

 Врем� отображени� окна

 [Temporarily disable Popups]

 Временно выключить окна

@@ -3513,7 +3513,7 @@ Web Дизайн
 Выключить уведомлени� о �мене �тату�а

 [Enable status &notification]

 Включить уведомлени� о �мене �тату�а

-[Automatically turn off PopUps and Sounds on status change]

+[Automatically turn off Popups and Sounds on status change]

 Выключить окна и звуки при изменении �тату�а

 [Configure]

 �а�троить

@@ -3529,8 +3529,8 @@ Web Дизайн
 &Показывать предыдущий �тату�

 [&Log status changes to file]

 Запи�ывать изменени� �тату�а в файл

-[&From PopUp plugin]

-У�тановки PopUp

+[&From Popup plugin]

+У�тановки Popup

 [&Custom]

 �а�троить

 [P&ermanent]

@@ -3715,11 +3715,11 @@ xСтату�ы
 Только одно в�плыв. окно на контакт

 [Show &entry in the main menu]

 Пункт в главном меню

-[PopUp timeout (is typing)]

+[Popup timeout (is typing)]

 Длительно�ть (набирает)

 [From protocol]

 Из протокола

-[PopUp timeout (stopped typing)]

+[Popup timeout (stopped typing)]

 Длительно�ть (закончил набирать)

 [...is typing a message.]

 ... набирает тек�т.

diff --git a/langpacks/russian/Deprecated/GmailM.txt b/langpacks/russian/Deprecated/GmailM.txt
index 5b713b54ba..2b83e95bb7 100644
--- a/langpacks/russian/Deprecated/GmailM.txt
+++ b/langpacks/russian/Deprecated/GmailM.txt
@@ -19,7 +19,7 @@
 Уведомл�ть:

 [System Tray]

 Трей

-[PopUp Plugin]

+[Popup Plugin]

 В�пл. окна

 [Duration:]

 Длит.:

diff --git a/langpacks/russian/Deprecated/HddInfo.txt b/langpacks/russian/Deprecated/HddInfo.txt
index 3f415caa9e..9d4b9ad512 100644
--- a/langpacks/russian/Deprecated/HddInfo.txt
+++ b/langpacks/russian/Deprecated/HddInfo.txt
@@ -70,7 +70,7 @@ HDD Температура
 [Time-out (in seconds)]

 Таймаут (в �екундах)

 [Enter 0 for default popup time-outs]

-Введите 0 дл� у�тановок PopUp

+Введите 0 дл� у�тановок Popup

 [Default text]

 Тек�т по умолч.

 [HDD Temperature Tracking]

@@ -82,7 +82,7 @@ HDD Слежение за температурой
 [Formatted popup variables]

 Стандартные переменные

 [Popup view]

-PopUp плагин

+Popup плагин

 [Restore custom]

 Сбро�ить изменени�

 [Show custom formatted popup]

diff --git a/langpacks/russian/Deprecated/NewStatusNotify.txt b/langpacks/russian/Deprecated/NewStatusNotify.txt
index c5c96d76f0..d1b00aaa4a 100644
--- a/langpacks/russian/Deprecated/NewStatusNotify.txt
+++ b/langpacks/russian/Deprecated/NewStatusNotify.txt
@@ -59,7 +59,7 @@
 NewStatusNotify - общие параметры

 [NewStatusNotify - Individual Sound Options]

 NewStatusNotify - индивидуальные звуки

-[NewStatusNotify - PopUp Options]

+[NewStatusNotify - Popup Options]

 NewStatusNotify - параметры окна

 [Notifies you when a contact changes his/hers status]

 Сообщает изменени� �тату�а контактов.

diff --git a/langpacks/russian/Deprecated/Trigger.txt b/langpacks/russian/Deprecated/Trigger.txt
index 6d35c52118..cba93b22a5 100644
--- a/langpacks/russian/Deprecated/Trigger.txt
+++ b/langpacks/russian/Deprecated/Trigger.txt
@@ -360,7 +360,7 @@ Miranda: Событие
 И�пользуйте �то дей�твие, только е�ли вы знаете, что делаете!

 [Set custom status message]

 У�тановить �тату�ное �ообщение

-[Show a PopUp]

+[Show a Popup]

 Показывать в�плывающее окно

 [Store value as]

 Сохранить значение как

diff --git a/langpacks/russian/Deprecated/WhoIsReadingMyStatusMsg.txt b/langpacks/russian/Deprecated/WhoIsReadingMyStatusMsg.txt
index 797d842131..72b4b68a4f 100644
--- a/langpacks/russian/Deprecated/WhoIsReadingMyStatusMsg.txt
+++ b/langpacks/russian/Deprecated/WhoIsReadingMyStatusMsg.txt
@@ -34,7 +34,7 @@
 Щелчок

 [&Configure]

 &�а�троить

-[PopUp click]

+[Popup click]

 Щелчок по окну

 [Open user details window]

 Инфо о контакте

diff --git a/langpacks/russian/Deprecated/mBirthday.txt b/langpacks/russian/Deprecated/mBirthday.txt
index 27f1ad7875..10408167d9 100644
--- a/langpacks/russian/Deprecated/mBirthday.txt
+++ b/langpacks/russian/Deprecated/mBirthday.txt
@@ -15,7 +15,7 @@
 Помечать знаком перед именем

 [Use MultiWindow icon]

 Значок MultiWindow

-[Use PopUp]

+[Use Popup]

 И�пользовать в�пл. окна

 [day(s) before birthday.]

 �уток до дн� рождени�.

diff --git a/langpacks/russian/LinkList.txt b/langpacks/russian/LinkList.txt
index 78436ba0d9..bd79f24507 100644
--- a/langpacks/russian/LinkList.txt
+++ b/langpacks/russian/LinkList.txt
@@ -92,7 +92,7 @@ http://svn.miranda-ng.org/main/trunk/langpacks/russian/Plugins/PackUpdater.txt
 http://svn.miranda-ng.org/main/trunk/langpacks/russian/Plugins/PasteIt.txt

 http://svn.miranda-ng.org/main/trunk/langpacks/russian/Plugins/PluginUpdater.txt

 http://svn.miranda-ng.org/main/trunk/langpacks/russian/Plugins/PManagerEx.txt

-http://svn.miranda-ng.org/main/trunk/langpacks/russian/Plugins/PopUp.txt

+http://svn.miranda-ng.org/main/trunk/langpacks/russian/Plugins/Popup.txt

 http://svn.miranda-ng.org/main/trunk/langpacks/russian/Plugins/QuickContacts.txt

 http://svn.miranda-ng.org/main/trunk/langpacks/russian/Plugins/QuickMessages.txt

 http://svn.miranda-ng.org/main/trunk/langpacks/russian/Plugins/QuickReplies.txt

diff --git a/langpacks/russian/Plugins/BuddyExpectator.txt b/langpacks/russian/Plugins/BuddyExpectator.txt
index 1dc9375e59..9088329b99 100644
--- a/langpacks/russian/Plugins/BuddyExpectator.txt
+++ b/langpacks/russian/Plugins/BuddyExpectator.txt
@@ -78,7 +78,7 @@
 [Enable "Miss you" feature]

 Включить функцию "Жду теб�"

 [Use Popups colors]

-Цвета PopUp

+Цвета Popup

 [weeks]

 недель

 [months]

diff --git a/langpacks/russian/Plugins/ChangeKeyboardLayout.txt b/langpacks/russian/Plugins/ChangeKeyboardLayout.txt
index 18b7749327..b26778a1f2 100644
--- a/langpacks/russian/Plugins/ChangeKeyboardLayout.txt
+++ b/langpacks/russian/Plugins/ChangeKeyboardLayout.txt
@@ -43,7 +43,7 @@
 Мен�ть при:

 [Log operations]

 Дей�тви� над журналом

-[Show result in PopUp]

+[Show result in Popup]

 Показать результат в окне

 [Layout of text is the current layout]

 Ра�кладка тек�та �то текуща� ра�кладка

@@ -55,7 +55,7 @@
 Инвертировать реги�тр

 [Changing Layout]

 Смена ра�кладки

-[PopUp colours]

+[Popup colours]

 Цвета в�пл.окон

 [Windows colours]

 Цвета Windows

diff --git a/langpacks/russian/Plugins/MRA.txt b/langpacks/russian/Plugins/MRA.txt
index 0e753d7695..03dfad4a0f 100644
--- a/langpacks/russian/Plugins/MRA.txt
+++ b/langpacks/russian/Plugins/MRA.txt
@@ -274,7 +274,7 @@ MraFilesQueueConnectionReceived: входÑ�щее подключение приÐ
 Размер блока при отправке:

 [512 - 65536 bytes]

 512 - 65536 байт

-[PopUp type]

+[Popup type]

 Тип окна

 [Popup settings]

 �а�тройки в�плывающего окна

diff --git a/langpacks/russian/Plugins/MsgPopup.txt b/langpacks/russian/Plugins/MsgPopup.txt
index bd03f4ef0f..2d37d1b26b 100644
--- a/langpacks/russian/Plugins/MsgPopup.txt
+++ b/langpacks/russian/Plugins/MsgPopup.txt
@@ -1,7 +1,7 @@
 #muuid CF25D645-4DAB-4B0A-B9F1-DE1E86231F9B}

 ;============================================================

 ;  File: MsgPopup.dll, messagepopup.dll

-;  Module: Message Popup. Replace a mesaage boxes to PopUps

+;  Module: Message Popup. Replace a mesaage boxes to Popups

 ;  Versions: 0.0.0.1

 ;  URL: http://miranda-im.org/download/feed.php?dlfile=1228

 ;============================================================

@@ -22,7 +22,7 @@
 [MessagePopup - demo]

 MessagePopup - Демо

 [This stuff will replace MessageBox'es [whose have only OK button] into Popups]

-Замен�ет диалоговые окна � предупреждени�ми на в�плывающие окна. Работает �овме�тно � PopUp. Перевод: Wattman.

+Замен�ет диалоговые окна � предупреждени�ми на в�плывающие окна. Работает �овме�тно � Popup. Перевод: Wattman.

 [Message with error]

 Предупреждение об ошибке

 [Message with exclamation]

diff --git a/langpacks/russian/Plugins/NewEventNotify.txt b/langpacks/russian/Plugins/NewEventNotify.txt
index 81c60a8bc3..89e5211ee5 100644
--- a/langpacks/russian/Plugins/NewEventNotify.txt
+++ b/langpacks/russian/Plugins/NewEventNotify.txt
@@ -6,8 +6,8 @@
 ;  URL: http://miranda-im.org/download/details.php?action=viewfile&id=341

 ;  URL: http://addons.miranda-im.org/details.php?action=viewfile&id=3637

 ;============================================================

-[Notifies you when you receive a message, url, file or any other event by displaying a popup. Uses the PopUp-Plugin by hrk. Original plugin was written by icebreaker, modified by Prezes and some bugfixes were made by vj, vlko, Nightwish, TheLeech and others. More fixes & updates by Joe @ Whale.]

-Уведомл�ет о получении �ообщени�, URL, файла или другого �обыти�, отобража� информацию во в�плывающих окнах. Дл� работы необходим PopUp от Luca Santarelli или аналогичный.

+[Notifies you when you receive a message, url, file or any other event by displaying a popup. Uses the Popup-Plugin by hrk. Original plugin was written by icebreaker, modified by Prezes and some bugfixes were made by vj, vlko, Nightwish, TheLeech and others. More fixes & updates by Joe @ Whale.]

+Уведомл�ет о получении �ообщени�, URL, файла или другого �обыти�, отобража� информацию во в�плывающих окнах. Дл� работы необходим Popup от Luca Santarelli или аналогичный.

 [You were added!]

 Ва� добавили

 [Requests your authorisation]

@@ -39,7 +39,7 @@
 [No popups for RSS contacts]

 Выключить дл� RSS ново�тей

 [Use OSD plugin instead of popups]

-И�пользовать плагин OSD вме�то PopUp

+И�пользовать плагин OSD вме�то Popup

 [Hide Popup when sending new message]

 Скрывать при отправке нового �ообщени�

 [Last message display first]

@@ -52,7 +52,7 @@
 Выключить дл� прочтённых

 [Number of begin shown messages]

 Количе�тво �ообщений дл� начала показа

-[Show entry in the PopUps menu]

+[Show entry in the Popups menu]

 Пункт в меню "В�пл. окна"

 [Show Headers]

 Заголовки

diff --git a/langpacks/russian/Plugins/Ping.txt b/langpacks/russian/Plugins/Ping.txt
index 2a472fa96c..94051075d1 100644
--- a/langpacks/russian/Plugins/Ping.txt
+++ b/langpacks/russian/Plugins/Ping.txt
@@ -15,7 +15,7 @@
 Им� лог файла:

 [Network]

 Сеть

-[PopUps]

+[Popups]

 В�плывающие окна

 [Reply]

 Ответ

diff --git a/langpacks/russian/Plugins/PopUp.txt b/langpacks/russian/Plugins/PopUp.txt
index f48e6fe124..f22e1bbeb3 100644
--- a/langpacks/russian/Plugins/PopUp.txt
+++ b/langpacks/russian/Plugins/PopUp.txt
@@ -1,7 +1,7 @@
 #muuid {26a9125d-7863-4e01-af0e-d14ef95c5054}

 ;============================================================

 ;  File: popup.dll

-;  Module: Popup Interoperability, PopUp Plus

+;  Module: Popup Interoperability, Popup Plus

 ;  Versions: 1.0.2.1-2.1.1.6

 ;  URL: http://addons.miranda-im.org/details.php?action=viewfile&id=3400

 ;============================================================

@@ -119,11 +119,11 @@ History++ дл� и�тории окон
 Отображать в&рем�

 [Show s&econd line]

 Показывать в&торую �троку

-[En&large PopUps by]

+[En&large Popups by]

 &Увеличивать окна на

 [&Dynamically resize the popups]

 Точно &подбирать размер окон

-[A&nimate PopUps (98/ME/2000/XP)]

+[A&nimate Popups (98/ME/2000/XP)]

 �&нимаци� окон (98/ME/2000/XP)

 [Fade &in/out (2000/XP)]

 Плавный показ (2000/XP)

@@ -159,7 +159,7 @@ History++ дл� и�тории окон
 ... пло�кий �тиль

 [Miscellanea]

 Прочее

-[PopUp Delay (seconds)]

+[Popup Delay (seconds)]

 Окно видимо (�екунд)

 [Hey, this is a status message!]

 Привет, �то �ообщение о �мене �тату�а!

@@ -203,7 +203,7 @@ History++ дл� и�тории окон
 Игнор. полно�кр.

 [Never show]

 �икогда

-[Reorder PopUps]

+[Reorder Popups]

 Перемещать окна

 [&Minimum width]

 &Минимальна� ширина

@@ -229,7 +229,7 @@ History++ дл� и�тории окон
 Выключить в�плывающие окна

 [Enable &popup module]

 Включить в�плывающие окна

-[Concurrent PopUps]

+[Concurrent Popups]

 �е�колько окон

 [Use multiple threads]

 �е�колько потоков

@@ -251,13 +251,13 @@ History++ дл� и�тории окон
 Откр. (м�)

 [Out (ms)]

 Закр. (м�)

-[A&nimate PopUps]

+[A&nimate Popups]

 �&нимаци� окон

 [Slide popups while rordering]

 Сдвигать при пере�ортировке

 [Infinite popup delay]

 �е закрывать окна

-[Disable PopUps when fullscreen]

+[Disable Popups when fullscreen]

 Выкл. в полно�кранном режиме

 [Do not close hovered popups]

 �е закрывать окна под кур�ором

@@ -289,7 +289,7 @@ History++ дл� и�тории окон
 BBCode ([b]..[/b] - жирный)

 [Truncate very long lines]

 Обрезать длинные �троки

-[PopUps drop shadow (WinXP+)]

+[Popups drop shadow (WinXP+)]

 Тень от окон (WinXP)

 [Skin preferences]

 �а�тройки �кина

@@ -522,16 +522,16 @@ BBCode ([b]..[/b] - жирный)
 [Show headerbar]

 Панель заголовка

 [...skin for old plugins]

-...�кины дл� �тарых вер�ий PopUp

-[PopUp class:]

-Кла��ы PopUp:

-[PopUp Interoperability]

+...�кины дл� �тарых вер�ий Popup

+[Popup class:]

+Кла��ы Popup:

+[Popup Interoperability]

 Совме�тимые в�плывающие окна

-[Provides a common PopUp interface for different plugins. Development of famous PopUp seems to be stopped so this is an update for  Luca Santarelli`s PopUp. Now it supports wrapping and emoticons ;). But this is just alpha-version and so contains lots of bugs :(]

-Предо�тавл�ет интерфей� в�плывающих окон дл� различных плагинов. Развитие изве�тного плагина PopUp будет о�тановлено. Это обновление от Luca Santarelli . Теперь плагин поддерживает перено� и дополнительные значки. Это альфа вер�и� и по�тому �одержит в �ебе много ошибок.

+[Provides a common Popup interface for different plugins. Development of famous Popup seems to be stopped so this is an update for  Luca Santarelli`s Popup. Now it supports wrapping and emoticons ;). But this is just alpha-version and so contains lots of bugs :(]

+Предо�тавл�ет интерфей� в�плывающих окон дл� различных плагинов. Развитие изве�тного плагина Popup будет о�тановлено. Это обновление от Luca Santarelli . Теперь плагин поддерживает перено� и дополнительные значки. Это альфа вер�и� и по�тому �одержит в �ебе много ошибок.

 [Reload skins]

 Обновить �пи�ок

-[Using SmileyAdd's settings is preferred due to bugs in internal MSL loading code. Also it allows you to select the same emoticons both for PopUp and message dialog.]

+[Using SmileyAdd's settings is preferred due to bugs in internal MSL loading code. Also it allows you to select the same emoticons both for Popup and message dialog.]

 SmileyAdd предпочтительней из-за дефектов во внутреннем MSL коде. Это позвол�ет вам выбирать те же значки дл� в�плывающих окон и диалога в �ообщени�х.

 [Show colours in text bloc]

 Показывать цвета в тек�товом блоке

diff --git a/langpacks/russian/Plugins/SMCN.txt b/langpacks/russian/Plugins/SMCN.txt
index fd667f43d2..5324bea038 100644
--- a/langpacks/russian/Plugins/SMCN.txt
+++ b/langpacks/russian/Plugins/SMCN.txt
@@ -14,9 +14,9 @@
 И�тори� �тату�ных �ообщений

 [List Contacts with Status Message]

 Стату�ные �ообщени� контактов

-[Disable SMCN PopUps]

+[Disable SMCN Popups]

 Выкл. в�пл. окна о �мене �тату�а

-[Enable SMCN PopUps]

+[Enable SMCN Popups]

 Вкл. в�пл. окна о �мене �тату�а

 [Status Message Changed]

 Стату�ное �ообщение изменило�ь

diff --git a/langpacks/russian/Plugins/SecureIM.txt b/langpacks/russian/Plugins/SecureIM.txt
index f30f833bf7..503190cabf 100644
--- a/langpacks/russian/Plugins/SecureIM.txt
+++ b/langpacks/russian/Plugins/SecureIM.txt
@@ -91,7 +91,7 @@ UIN/E-mail/JID/Компьютер
 Индикатор в имени

 [Indicator :]

 Индикатор :

-[SecureIM PopUp Colors]

+[SecureIM Popup Colors]

 Цвета в�плывающих �ообщений SecureIM

 [Key agreement colors]

 Обмен ключами

@@ -113,7 +113,7 @@ UIN/E-mail/JID/Компьютер
 В�егда пытать��

 [Key Exchange Timeout :]

 Врем� обмена ключами :

-[PopUp Timeout]

+[Popup Timeout]

 Длительно�ть

 [Time in Seconds]

 Врем� (�)

@@ -135,7 +135,7 @@ UIN/E-mail/JID/Компьютер
 Создать SecureIM �оединение

 [Enable Secure File Transfer]

 Включить шифровку файлов

-[0 = Default PopUp Timeout Value]

+[0 = Default Popup Timeout Value]

 0 = По умолчанию 

 [SecureIM 1.0.4.4]

 Шифрование �ообщений

diff --git a/langpacks/russian/Plugins/SeenPlugin.txt b/langpacks/russian/Plugins/SeenPlugin.txt
index 4fbcd9c2e3..c6e71fd626 100644
--- a/langpacks/russian/Plugins/SeenPlugin.txt
+++ b/langpacks/russian/Plugins/SeenPlugin.txt
@@ -100,7 +100,7 @@
 По�леднее по�вление

 [Reset colors]

 Сбро� цветов

-[PopUp Colors]

+[Popup Colors]

 Цвета окон

 [Use popups]

 В�пл. окна

diff --git a/langpacks/russian/Plugins/TabSRMM.txt b/langpacks/russian/Plugins/TabSRMM.txt
index 01f2f2713c..b2c131632b 100644
--- a/langpacks/russian/Plugins/TabSRMM.txt
+++ b/langpacks/russian/Plugins/TabSRMM.txt
@@ -1511,7 +1511,7 @@ ID пользовател� в панели �тату�а
 [tabSRMM Information]

 Информаци� tabSRMM

 [U&se Popup colours]

-Цвета плагина PopUp

+Цвета плагина Popup

 ;Уведомлени�

 

 [Contact not on list. You may add it...]

@@ -1611,8 +1611,8 @@ ID пользовател� в панели �тату�а
 ...набирает тек�т

 [...stopped typing]

 ...закончил набирать тек�т

-[PopUps timeout]

-Таймаут плагина PopUp

+[Popups timeout]

+Таймаут плагина Popup

 [About tabSRMM]

 о TabSRMM

 [No Message Sessions opened]

diff --git a/langpacks/russian/Plugins/WUMF.txt b/langpacks/russian/Plugins/WUMF.txt
index 2e86150d80..a73e64e66c 100644
--- a/langpacks/russian/Plugins/WUMF.txt
+++ b/langpacks/russian/Plugins/WUMF.txt
@@ -5,7 +5,7 @@
 ;  Versions: 0.1.0.2

 ;  URL: http://miranda-im.org/download/feed.php?dlfile=831

 ;============================================================

-[Scans for network users of your shared files and notify you with popups. Uses PopUps Interoperability by Luca Santarelli. PopUps plugin must be activated!]

+[Scans for network users of your shared files and notify you with popups. Uses Popups Interoperability by Luca Santarelli. Popups plugin must be activated!]

 Сканирует �еть в пои�ках пользователей, и�пользующих ваши файлы, открытые дл� до�тупа по �ети и уведомл�ет в�плывающими окнами.

 [WUMF: Who Use My Files?]

 Кто и�пользует мои файлы?

@@ -16,21 +16,21 @@ WUMF: Показать подключени�
 [Enable WUMF popups]

 Включить WUMF окна

 [Popup color settings]

-�а�тройки цвета PopUp

+�а�тройки цвета Popup

 [Choose colors]

 Выбрать цвет

-[Use default PopUp colors]

-Цвета PopUp

+[Use default Popup colors]

+Цвета Popup

 [Popup delay settings]

-�а�тройки показа PopUp

+�а�тройки показа Popup

 [Choose delay time]

 �а�троить �амому

 [Show infinitely]

 По�то�нно

-[Default PopUp delay]

-Как в PopUp

-[Please note that this settings has effect only with PopUps Interoperability plugin version 1.0.1.9 or higher]

-Примечание: на�тройки дей�твуют � PopUp вер�ии 1.0.1.9 или выше

+[Default Popup delay]

+Как в Popup

+[Please note that this settings has effect only with Popups Interoperability plugin version 1.0.1.9 or higher]

+Примечание: на�тройки дей�твуют � Popup вер�ии 1.0.1.9 или выше

 [File access filter && logging settings]

 �а�тройки фильтров журнала

 [Log into text file]

diff --git a/langpacks/russian/Plugins/Weather.txt b/langpacks/russian/Plugins/Weather.txt
index 1de3f9dc75..8a9e23d225 100644
--- a/langpacks/russian/Plugins/Weather.txt
+++ b/langpacks/russian/Plugins/Weather.txt
@@ -39,7 +39,7 @@
 Внешний файл

 [Other Options]

 Другие на�тройки

-[Disable PopUp for this station]

+[Disable Popup for this station]

 �е выводить в�плывающее окно

 [Brief Info]

 Кратко

@@ -373,7 +373,7 @@ HTTP подключение Weather
 �а�тройка ��ылок

 [Do not display weather condition as protocol status]

 �е показывать �о�то�ние погоды как �тату� протокола

-[PopUp Text]

+[Popup Text]

 В�плывающий тек�т

 [Weather Protocol Text Options]

 Шаблоны диалогов погоды 

diff --git a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_popup.inc b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_popup.inc
index 22c5c01835..4d7632f25f 100644
--- a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_popup.inc
+++ b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_popup.inc
@@ -1,12 +1,12 @@
 (*

 ===============================================================================

-                                PopUp plugin

-Plugin Name: PopUp

+                                Popup plugin

+Plugin Name: Popup

 Plugin author: hrk, Luca Santarelli, hrk@users.sourceforge.net

 This file has been created by egodust, Sam, egodust@users.sourceforge.net

 ===============================================================================

 

-The purpose of this plugin is to give developers a common "platform/interface" to show PopUps. It is born from the source code of NewStatusNotify, another plugin I've made.

+The purpose of this plugin is to give developers a common "platform/interface" to show Popups. It is born from the source code of NewStatusNotify, another plugin I've made.

 

 Remember that users *must* have this plugin enabled, or they won't get any popup. Write this in the requirements, do whatever you wish ;-)... but tell them!

 ===============================================================================

@@ -70,36 +70,36 @@ const
 

 (*

     Creates, adds and shows a popup, given a (valid) POPUPDATA structure pointer.

-    wParam = (WPARAM)(*POPUPDATA)PopUpDataAddress

+    wParam = (WPARAM)(*POPUPDATA)PopupDataAddress

     lParam = 0

-    Returns: > 0 on success, 0 if creation went bad, -1 if the PopUpData contained unacceptable values.

-    NOTE: it returns -1 if the PopUpData was not valid, if there were already too many popups, if the module was disabled.

+    Returns: > 0 on success, 0 if creation went bad, -1 if the PopupData contained unacceptable values.

+    NOTE: it returns -1 if the PopupData was not valid, if there were already too many popups, if the module was disabled.

     Otherwise, it can return anything else...

 *)

 

-    MS_POPUP_ADDPOPUP = 'PopUp/AddPopUp';

+    MS_POPUP_ADDPOPUP = 'Popup/AddPopup';

 

 (*

     The same, but with a POPUPDATAEX structure pointer.

-    wParam = (WPARAM)(*POPUPDATAEX)PopUpDataExAddress

+    wParam = (WPARAM)(*POPUPDATAEX)PopupDataExAddress

     lParam = 0

 *)

 

-    MS_POPUP_ADDPOPUP = 'PopUp/AddPopUpEx';

+    MS_POPUP_ADDPOPUP = 'Popup/AddPopupEx';

 

 (*

-    Returns the handle to the contact associated to the specified PopUpWindow.

+    Returns the handle to the contact associated to the specified PopupWindow.

     You will probably need to know this handle inside your WNDPROC. Exampole: you want to open the MessageWindow. :-)

     Call MS_POPUP_GETCONTACT on the hWnd you were given in the WNDPROC.

-    wParam = (WPARAM)(HWND)hPopUpWindow

+    wParam = (WPARAM)(HWND)hPopupWindow

     lParam = 0;

     Returns: the HANDLE of the contact. Can return NULL, meaning it's the main contact. -1 means failure.

 *)  

 

-    MS_POPUP_GETCONTACT = 'PopUp/GetContact';

+    MS_POPUP_GETCONTACT = 'Popup/GetContact';

     

 (*

-    wParam = hPopUpWindow

+    wParam = hPopupWindow

     lParam = PluginDataAddress;

     Returns: the address of the PLUGINDATA structure. Can return NULL, meaning nothing was given. -1 means failure.

     IMPORTANT NOTE: it doesn't seem to work if you do:

@@ -107,16 +107,16 @@ const
     and then use that struct.

     Do this, instead:

     aPointerToStruct = CallService(..., (LPARAM)aPointerToAStruct);

-    and it will work. Just look at the example I've written above (PopUpDlgProc).

+    and it will work. Just look at the example I've written above (PopupDlgProc).

 *)

-    MS_POPUP_GETPLUGINDATA = 'PopUp/GetPluginData';

+    MS_POPUP_GETPLUGINDATA = 'Popup/GetPluginData';

     

 (*

     wParam = 0

     lParam = 0

     Returns: 0 if the user has chosen not to have the second line, 1 if he choose to have the second line.

 *)

-    MS_POPUP_ISSECONDLINESHOWN = 'PopUp/IsSecondLineShown';

+    MS_POPUP_ISSECONDLINESHOWN = 'Popup/IsSecondLineShown';

     

 (*

     UM_FREEPLUGINDATA

@@ -132,29 +132,29 @@ const
 

 (*

     UM_INITPOPUP

-    wParam = (WPARAM)(HWND)hPopUpWindow (but this is useless, since I'll directly send it to your hPopUpWindow

+    wParam = (WPARAM)(HWND)hPopupWindow (but this is useless, since I'll directly send it to your hPopupWindow

     lParam = 0.

-    This message is sent to the PopUp when its creation has been finished, so POPUPDATA (and thus your PluginData) is reachable.

+    This message is sent to the Popup when its creation has been finished, so POPUPDATA (and thus your PluginData) is reachable.

     Catch it if you needed to catch WM_CREATE or WM_INITDIALOG, which you'll never ever get in your entire popup-life.

     Return value: if you process this message, return 0. If you don't process it, return 0. Do whatever you like ;-)

 *)

     UM_INITPOPUP            = ($400(*WM_USER*) + $202);

 

 (*

-    wParam = hPopUpWindow

+    wParam = hPopupWindow

     lParam = lpzNewText

     returns: > 0 for success, -1 for failure, 0 if the failure is due to second line not being shown. (but you could call PUIsSecondLineShown() before changing the text...)

     Changes the text displayed in the second line of the popup.

 *)

-    MS_POPUP_CHANGETEXT         = 'PopUp/Changetext';

+    MS_POPUP_CHANGETEXT         = 'Popup/Changetext';

 

 (*

     This is mainly for developers.

-    Shows a warning message in a PopUp. It's useful if you need a "MessageBox" like function, but you don't want a modal window (which will interfere with a DialogProcedure. MessageBox steals focus and control, this one not.

+    Shows a warning message in a Popup. It's useful if you need a "MessageBox" like function, but you don't want a modal window (which will interfere with a DialogProcedure. MessageBox steals focus and control, this one not.

     wParam = lpzMessage

     lParam = 0;  Returns: 0 if the popup was shown, -1 in case of failure.

 *)

-    MS_POPUP_SHOWMESSAGE        = 'PopUp/ShowMessage';

+    MS_POPUP_SHOWMESSAGE        = 'Popup/ShowMessage';

     

 

     (* helper functions, will be inlined on FPC if you have the swithces enabled *)

@@ -167,15 +167,15 @@ const
         Result := CallService(MS_POPUP_ADDPOPUP, WPARAM(ppdp), 0);

     end;

     

-    function PUGetContact(hPopUpWindow: THandle): THandle;

+    function PUGetContact(hPopupWindow: THandle): THandle;

     {$ifdef FPC}

     inline;

     {$endif}

     begin

-        Result := CallService(MS_POPUP_GETCONTACT, WPARAM(hPopUpWindow), 0);

+        Result := CallService(MS_POPUP_GETCONTACT, WPARAM(hPopupWindow), 0);

     end;

 

-    function PUGetPluginData(hPopUpWindow: THandle): Pointer;

+    function PUGetPluginData(hPopupWindow: THandle): Pointer;

     {$ifdef FPC}

     inline;

     {$endif}

@@ -183,7 +183,7 @@ const
         dummy: pointer;

     begin

         dummy := nil;

-        Int(Result) := CallService(MS_POPUP_GETPLUGINDATA, WPARAM(hPopUpWindow), LPARAM(dummy));

+        Int(Result) := CallService(MS_POPUP_GETPLUGINDATA, WPARAM(hPopupWindow), LPARAM(dummy));

     end;

 

     function PUIsSecondLineShown: BOOL;

@@ -194,20 +194,20 @@ const
         Int(Result) := CallService(MS_POPUP_ISSECONDLINESHOWN, 0, 0);

     end;

 

-    function PUDeletePopUp(hWndPopUp: THandle): int;

+    function PUDeletePopup(hWndPopup: THandle): int;

     {$ifdef FPC}

     inline;

     {$endif}

     begin

-        Result := SendMessage(hWndPopUp, UM_DESTROYPOPUP, 0, 0);

+        Result := SendMessage(hWndPopup, UM_DESTROYPOPUP, 0, 0);

     end;

     

-    function PUChangeText(hWndPopUp: THandle; lpzNewText: PChar): int;

+    function PUChangeText(hWndPopup: THandle; lpzNewText: PChar): int;

     {$ifdef FPC}

     inline;

     {$endif}

     begin

-        Result := CallService(MS_POPUP_CHANGETEXT, WPARAM(hWndPopUp), LPARAM(lpzNewText));

+        Result := CallService(MS_POPUP_CHANGETEXT, WPARAM(hWndPopup), LPARAM(lpzNewText));

     end;

     

     function PUShowMessage(lpzText: PChar; kind: Byte): int;

diff --git a/plugins/!NotAdopted/mDynDNS/resource.rc b/plugins/!NotAdopted/mDynDNS/resource.rc
index 685e8d8062..682ce500b3 100644
--- a/plugins/!NotAdopted/mDynDNS/resource.rc
+++ b/plugins/!NotAdopted/mDynDNS/resource.rc
@@ -52,7 +52,7 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,29,267,10

     GROUPBOX        "Delay",IDC_STATIC,159,47,147,69

     CONTROL         "&Custom",IDC_DELAY_CUSTOM,"Button",BS_AUTORADIOBUTTON,167,66,87,10

-    CONTROL         "&From PopUp plugin",IDC_DELAY_POPUP,"Button",BS_AUTORADIOBUTTON,167,96,131,10

+    CONTROL         "&From Popup plugin",IDC_DELAY_POPUP,"Button",BS_AUTORADIOBUTTON,167,96,131,10

     CONTROL         "P&ermanent",IDC_DELAY_PERMANENT,"Button",BS_AUTORADIOBUTTON,167,81,131,10

     EDITTEXT        IDC_DELAY,268,64,21,12,ES_AUTOHSCROLL | ES_NUMBER

     GROUPBOX        "Colours",IDC_STATIC,5,47,147,69

diff --git a/plugins/Actman/services.ini b/plugins/Actman/services.ini
index c40bbe1588..658b87ebc0 100644
--- a/plugins/Actman/services.ini
+++ b/plugins/Actman/services.ini
@@ -243,21 +243,21 @@ lparam=structure|0|native|bptr|bptr|bptr|
 return=int 0, if successful

 descr=Opens the options dialog, optionally at the specified page

 

-[Service:PopUp/EnableDisableMenuCommand]

+[Service:Popup/EnableDisableMenuCommand]

 wparam=0

 lparam=0

 plugin=Popup Plus (popup.dll)

-descr=Enables or disables PopUp windows

+descr=Enables or disables Popup windows

 

-[Service:PopUp/ShowMessage]

+[Service:Popup/ShowMessage]

 alias=MS_POPUP_SHOWMESSAGE

 wparam=Ansi Text

 lparam=1 Warning|2 Notify|3 Error

 return=int 0, if successful

-plugin=YAPP or PopUp

+plugin=YAPP or Popup

 descr=Popup window

 

-[Service:PopUp/ShowMessageW]

+[Service:Popup/ShowMessageW]

 alias=MS_POPUP_SHOWMESSAGEW

 wparam=Unicode Text

 lparam=1 Warning|2 Notify|3 Error

@@ -265,11 +265,11 @@ return=int 0, if successful
 plugin=YAPP only

 descr=Popup window

 

-[Service:PopUp/ToggleEnabled]

+[Service:Popup/ToggleEnabled]

 wparam=0

 lparam=0

 plugin=YAPP (yapp.dll)

-descr=Enables or disables PopUp windows

+descr=Enables or disables Popup windows

 

 [Service:Proto/CallContactService]

 alias=MS_PROTO_CALLCONTACTSERVICE

diff --git a/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc b/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc
index c4e830b1cf..769e3d82b6 100644
--- a/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc
+++ b/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc
@@ -138,7 +138,7 @@ BEGIN
     GROUPBOX        "Log operations",IDC_STATIC_GROUP_LOG,2,96,152,81

     CONTROL         "Copy result to clipboard",IDC_CHECK_CLIPBOARD,"Button",

                     BS_AUTOCHECKBOX | WS_TABSTOP,8,108,141,10

-    CONTROL         "Show result in PopUp",IDC_CHECK_POPUP,"Button",

+    CONTROL         "Show result in Popup",IDC_CHECK_POPUP,"Button",

                     BS_AUTOCHECKBOX | WS_TABSTOP,8,121,141,10

     GROUPBOX        "Strings for keyboard layouts",IDC_STATIC_GROUP_STRINGS,

                     2,180,308,65

@@ -182,7 +182,7 @@ STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_SYSMENU
 FONT 8, "MS Shell Dlg", 400, 0, 0x1

 BEGIN

     GROUPBOX        "Colours",IDC_GROUP_COLOURS,2,2,91,72,WS_GROUP

-    CONTROL         "PopUp colours",IDC_RADIO_COLOURS_POPUP,"Button",

+    CONTROL         "Popup colours",IDC_RADIO_COLOURS_POPUP,"Button",

                     BS_AUTORADIOBUTTON,6,12,82,10

     CONTROL         "Windows colours",IDC_RADIO_COLOURS_WINDOWS,"Button",

                     BS_AUTORADIOBUTTON,6,23,82,10

@@ -195,7 +195,7 @@ BEGIN
     CONTROL         "Custom1",IDC_CUSTOM_TEXT,"ColourPicker",WS_TABSTOP,56,

                     55,29,14

     GROUPBOX        "Timeout",IDC_GROUP_TIMEOUT,95,2,91,72,WS_GROUP

-    CONTROL         "From PopUp plugin",IDC_RADIO_TIMEOUT_POPUP,"Button",

+    CONTROL         "From Popup plugin",IDC_RADIO_TIMEOUT_POPUP,"Button",

                     BS_AUTORADIOBUTTON,99,12,82,10

     CONTROL         "Permanent",IDC_RADIO_TIMEOUT_PERMANENT,"Button",

                     BS_AUTORADIOBUTTON,99,23,82,10

diff --git a/plugins/ExternalAPI/delphi/m_weather.inc b/plugins/ExternalAPI/delphi/m_weather.inc
index 7a89288b39..d8fd41ae31 100644
--- a/plugins/ExternalAPI/delphi/m_weather.inc
+++ b/plugins/ExternalAPI/delphi/m_weather.inc
@@ -148,7 +148,7 @@ Condition_Changed is true; otherwise is false.
   ME_WEATHER_UPDATED:pAnsiChar = 'Miranda/Weather/Updated';

 

 {

-Shows a warning message for Weather PopUp.

+Shows a warning message for Weather Popup.

 wParam = (char*) lpzMessage

 lParam = Type

 Type can either be SM_WARNING, SM_NOTIFY, or SM_WEATHERALERT

diff --git a/plugins/ExternalAPI/delphi/m_yapp.inc b/plugins/ExternalAPI/delphi/m_yapp.inc
index e85d382bec..ed42f17b91 100644
--- a/plugins/ExternalAPI/delphi/m_yapp.inc
+++ b/plugins/ExternalAPI/delphi/m_yapp.inc
@@ -66,7 +66,7 @@ const
 

 // wParam = 0

 // lParam = (POPUPCLASS *)&pc

-  MS_POPUP_REGISTERCLASS = 'PopUp/RegisterClass';

+  MS_POPUP_REGISTERCLASS = 'Popup/RegisterClass';

 

 type

   TPopupClassInstance = record

@@ -81,6 +81,6 @@ type
 const

 // wParam = 0

 // lParam = (POPUPDATACLASS *)&pdc

-  MS_POPUP_ADDPOPUPCLASS = 'PopUp/AddPopupClass';

+  MS_POPUP_ADDPOPUPCLASS = 'Popup/AddPopupClass';

 

 {$ENDIF}

diff --git a/plugins/NewEventNotify/res/resource.rc b/plugins/NewEventNotify/res/resource.rc
index c3b672b955..96a29e6d30 100644
--- a/plugins/NewEventNotify/res/resource.rc
+++ b/plugins/NewEventNotify/res/resource.rc
@@ -31,7 +31,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 FONT 8, "MS Shell Dlg", 0, 0, 0x0

 BEGIN

     GROUPBOX        "General Options",IDC_STATIC,6,2,199,43

-    CONTROL         "Show entry in the PopUps menu",IDC_CHKMENUITEM,"Button",

+    CONTROL         "Show entry in the Popups menu",IDC_CHKMENUITEM,"Button",

                     BS_AUTOCHECKBOX | WS_TABSTOP,10,11,190,10

     CONTROL         "Temporarily disable Event Popups",IDC_CHKDISABLE,"Button",

                     BS_AUTOCHECKBOX | WS_TABSTOP,10,21,190,10

diff --git a/plugins/NewXstatusNotify/res/resource.rc b/plugins/NewXstatusNotify/res/resource.rc
index 360926e770..5376514e8f 100644
--- a/plugins/NewXstatusNotify/res/resource.rc
+++ b/plugins/NewXstatusNotify/res/resource.rc
@@ -335,7 +335,7 @@ STYLE DS_SETFONT | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CONTROL | DS_CENTER | WS_
 FONT 8, "MS Shell Dlg", 400, 0, 0x1

 BEGIN

     GROUPBOX        "General",IDC_STATIC,7,0,289,39

-    CONTROL         "Show PopUps when I connect",IDC_ONCONNECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,11,274,8

+    CONTROL         "Show Popups when I connect",IDC_ONCONNECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,11,274,8

     CONTROL         "Ignore empty status messages",IDC_PUIGNOREREMOVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,25,274,8

     GROUPBOX        "Protocols",IDC_STATIC,7,41,289,124

     CTEXT           "Enable/Disable protocols which you don't wish to be notified for:",IDC_STATIC,14,52,274,10

diff --git a/plugins/PackUpdater/Res/Resource.rc b/plugins/PackUpdater/Res/Resource.rc
index 1d1891055b..cefd5c20d0 100644
--- a/plugins/PackUpdater/Res/Resource.rc
+++ b/plugins/PackUpdater/Res/Resource.rc
@@ -129,7 +129,7 @@ BEGIN
     CONTROL         "",IDC_INFO_MESSAGES_MSG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,153,45,8,10

     CONTROL         "",IDC_PROGR_DLG_MSG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,153,59,8,10

     CTEXT           "Boxes",IDC_STATIC,146,8,23,8

-    CTEXT           "PopUps",IDC_STATIC,7,9,79,8

+    CTEXT           "Popups",IDC_STATIC,7,9,79,8

 END

 

 

diff --git a/plugins/Ping/res/ping.rc b/plugins/Ping/res/ping.rc
index 581595bd75..a35a795a96 100644
--- a/plugins/Ping/res/ping.rc
+++ b/plugins/Ping/res/ping.rc
@@ -79,7 +79,7 @@ BEGIN
     LTEXT           "Log Filename:",IDC_STATIC,14,198,56,8

     EDITTEXT        IDC_ED_FILENAME,74,195,158,14,ES_AUTOHSCROLL

     GROUPBOX        "Network",IDC_STATIC,4,5,205,72

-    GROUPBOX        "PopUps",IDC_STATIC,218,5,79,72

+    GROUPBOX        "Popups",IDC_STATIC,218,5,79,72

     CONTROL         "Reply",IDC_CHECKPOPUP2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,223,36,72,10

     CONTROL         "Block Repetitions",IDC_CHK_BLOCK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,223,60,72,10

     PUSHBUTTON      "View Log",IDC_BTN_VIEWLOG,238,176,54,14

diff --git a/plugins/PluginUpdater/res/Resource.rc b/plugins/PluginUpdater/res/Resource.rc
index 705565082e..b4b0271a75 100644
--- a/plugins/PluginUpdater/res/Resource.rc
+++ b/plugins/PluginUpdater/res/Resource.rc
@@ -122,7 +122,7 @@ BEGIN
     CONTROL         "",IDC_INFO_MESSAGES_MSG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,153,45,8,10

     CONTROL         "",IDC_PROGR_DLG_MSG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,153,59,8,10

     CTEXT           "Boxes",IDC_STATIC,146,8,23,8

-    CTEXT           "PopUps",IDC_STATIC,7,9,79,8

+    CTEXT           "Popups",IDC_STATIC,7,9,79,8

 END

 

 

diff --git a/plugins/Quotes/res/Forex.rc b/plugins/Quotes/res/Forex.rc
index 0ae1bff055..bbe911f4eb 100644
--- a/plugins/Quotes/res/Forex.rc
+++ b/plugins/Quotes/res/Forex.rc
@@ -203,7 +203,7 @@ BEGIN
     LTEXT           "Text colour",IDC_STATIC,70,71,66,8

     CONTROL         "",IDC_TEXTCOLOR,"ColourPicker",WS_TABSTOP,26,67,35,14

     GROUPBOX        "Delay",IDC_STATIC,162,6,149,82,WS_GROUP

-    CONTROL         "From PopUp plugin",IDC_DELAYFROMPU,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,174,20,76,10

+    CONTROL         "From Popup plugin",IDC_DELAYFROMPU,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,174,20,76,10

     CONTROL         "Custom",IDC_DELAYCUSTOM,"Button",BS_AUTORADIOBUTTON,174,35,47,10

     CONTROL         "Permanent",IDC_DELAYPERMANENT,"Button",BS_AUTORADIOBUTTON,174,50,50,10

     EDITTEXT        IDC_DELAY,252,33,35,14,ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP

diff --git a/plugins/SecureIM/res/resource.rc b/plugins/SecureIM/res/resource.rc
index b18e181cd5..fd8239eac8 100644
--- a/plugins/SecureIM/res/resource.rc
+++ b/plugins/SecureIM/res/resource.rc
@@ -153,15 +153,15 @@ BEGIN
     CONTROL         "",IDC_BACKSR,"ColourPicker",WS_TABSTOP,14,79,28,14

     CONTROL         "",IDC_TEXTSR,"ColourPicker",WS_TABSTOP,50,79,28,14

     LTEXT           "Send/Receive encrypted colors",IDC_STATIC,82,84,104,8

-    GROUPBOX        "SecureIM PopUp Colors",IDC_STATIC,7,7,181,122

+    GROUPBOX        "SecureIM Popup Colors",IDC_STATIC,7,7,181,122

     PUSHBUTTON      "Preview",IDC_PREV,15,107,57,16

     GROUPBOX        "Events",IDC_STATIC,7,132,248,88

-    GROUPBOX        "PopUp Timeout",IDC_STATIC,196,7,59,122

+    GROUPBOX        "Popup Timeout",IDC_STATIC,196,7,59,122

     EDITTEXT        IDC_TIMEKEY,210,37,31,14,ES_AUTOHSCROLL

     EDITTEXT        IDC_TIMESEC,210,59,31,14,ES_AUTOHSCROLL

     EDITTEXT        IDC_TIMESR,210,81,31,14,ES_AUTOHSCROLL

     CTEXT           "Time in Seconds",IDC_STATIC,200,23,54,8

-    CTEXT           "0 = Default PopUp Timeout Value",IDC_STATIC,200,101,49,24

+    CTEXT           "0 = Default Popup Timeout Value",IDC_STATIC,200,101,49,24

     CONTROL         "Show a popup on established connection",IDC_EC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,144,168,10

     CONTROL         "Show a popup on disabled connection",IDC_DC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,156,168,10

     CONTROL         "Show a popup on key send",IDC_KS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,168,168,10

diff --git a/plugins/SeenPlugin/res/resource.rc b/plugins/SeenPlugin/res/resource.rc
index 87f914463a..52649ca971 100644
--- a/plugins/SeenPlugin/res/resource.rc
+++ b/plugins/SeenPlugin/res/resource.rc
@@ -86,7 +86,7 @@ BEGIN
     EDITTEXT        IDC_POPUPSTAMP,49,20,224,12,ES_AUTOHSCROLL | WS_GROUP

     RTEXT           "Text",IDC_LABTTITLE,19,37,25,10

     EDITTEXT        IDC_POPUPSTAMPTEXT,49,35,224,12,ES_AUTOHSCROLL | WS_GROUP

-    GROUPBOX        "PopUp Colors",IDC_STATIC,0,70,280,136,WS_GROUP

+    GROUPBOX        "Popup Colors",IDC_STATIC,0,70,280,136,WS_GROUP

     RTEXT           "Online",IDC_STATIC,10,83,60,10

     CONTROL         "",ID_STATUS_ONLINE,"ColourPicker",WS_TABSTOP,80,80,20,14

     CONTROL         "",40092,"ColourPicker",WS_TABSTOP,105,80,20,14

diff --git a/plugins/StatusPlugins/resource.rc b/plugins/StatusPlugins/resource.rc
index 99bd303790..e6f02e5283 100644
--- a/plugins/StatusPlugins/resource.rc
+++ b/plugins/StatusPlugins/resource.rc
@@ -212,7 +212,7 @@ BEGIN
     CONTROL         "Show when reconnection has finished",IDC_PURESULT,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,177,226,10

     CONTROL         "Show other messages",IDC_PUOTHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,189,226,10

-    CONTROL         "From PopUp plugin",IDC_DELAYFROMPU,"Button",BS_AUTORADIOBUTTON | WS_GROUP,143,19,94,10

+    CONTROL         "From Popup plugin",IDC_DELAYFROMPU,"Button",BS_AUTORADIOBUTTON | WS_GROUP,143,19,94,10

     CONTROL         "Custom",IDC_DELAYCUSTOM,"Button",BS_AUTORADIOBUTTON,143,32,47,10

     CONTROL         "Permanent",IDC_DELAYPERMANENT,"Button",BS_AUTORADIOBUTTON,143,45,50,10

     CONTROL         "Show additional information in popups",IDC_PUSHOWEXTRA,

diff --git a/plugins/TabSRMM/res/resource.rc b/plugins/TabSRMM/res/resource.rc
index 813812271c..4e206d54b0 100644
--- a/plugins/TabSRMM/res/resource.rc
+++ b/plugins/TabSRMM/res/resource.rc
@@ -438,7 +438,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

-    GROUPBOX        "PopUps",IDC_STATIC,4,9,307,129

+    GROUPBOX        "Popups",IDC_STATIC,4,9,307,129

     CONTROL         "...is &typing",IDC_START,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,11,20,80,13

     CONTROL         "...stopped t&yping",IDC_STOP,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,11,46,80,13

     CTEXT           "Back",IDC_STATIC,23,61,31,8

@@ -451,18 +451,18 @@ BEGIN
     CONTROL         "Only &one popup for each contact",IDC_ONEPOPUP,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,11,109,250,13

     CONTROL         "Show &entry in the main menu",IDC_SHOWMENU,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,11,122,247,13

     GROUPBOX        "...is typing",IDC_STATIC,8,151,148,58,WS_GROUP

-    CONTROL         "From PopUp plugin",IDC_TIMEOUT_POPUP,"Button",BS_AUTORADIOBUTTON,16,161,130,10

+    CONTROL         "From Popup plugin",IDC_TIMEOUT_POPUP,"Button",BS_AUTORADIOBUTTON,16,161,130,10

     CONTROL         "From protocol",IDC_TIMEOUT_PROTO,"Button",BS_AUTORADIOBUTTON,16,172,130,10

     CONTROL         "Permanent",IDC_TIMEOUT_PERMANENT,"Button",BS_AUTORADIOBUTTON,16,183,130,10

     CONTROL         "Custom",IDC_TIMEOUT_CUSTOM,"Button",BS_AUTORADIOBUTTON,16,194,95,10

     EDITTEXT        IDC_TIMEOUT_VALUE,125,193,25,12,ES_AUTOHSCROLL | ES_NUMBER

     GROUPBOX        "...stopped typing",IDC_STATIC,158,151,148,58,WS_GROUP

-    CONTROL         "From PopUp plugin",IDC_TIMEOUT_POPUP2,"Button",BS_AUTORADIOBUTTON,166,161,130,10

+    CONTROL         "From Popup plugin",IDC_TIMEOUT_POPUP2,"Button",BS_AUTORADIOBUTTON,166,161,130,10

     CONTROL         "Permanent",IDC_TIMEOUT_PERMANENT2,"Button",BS_AUTORADIOBUTTON,166,172,130,10

     CONTROL         "Custom",IDC_TIMEOUT_CUSTOM2,"Button",BS_AUTORADIOBUTTON,166,193,95,10

     EDITTEXT        IDC_TIMEOUT_VALUE2,275,192,25,12,ES_AUTOHSCROLL | ES_NUMBER

     PUSHBUTTON      "Preview",IDC_PREVIEW,62,220,194,16

-    GROUPBOX        "PopUps timeout",IDC_STATIC,3,140,308,75

+    GROUPBOX        "Popups timeout",IDC_STATIC,3,140,308,75

     CTEXT           "Back",IDC_STATIC,22,35,33,8

     CONTROL         "",IDC_TYPEON_BG,"ColourPicker",WS_TABSTOP,58,33,24,12

     CTEXT           "Text",IDC_STATIC,89,35,29,8

diff --git a/plugins/TrafficCounter/res/resource.rc b/plugins/TrafficCounter/res/resource.rc
index 55fdeb9e68..777f03a756 100644
--- a/plugins/TrafficCounter/res/resource.rc
+++ b/plugins/TrafficCounter/res/resource.rc
@@ -68,7 +68,7 @@ BEGIN
     CONTROL         "",IDC_COLOR2,"ColourPicker",WS_TABSTOP,242,28,33,12

     PUSHBUTTON      "Reset to default",IDC_RESETCOLORS,178,44,97,14

     GROUPBOX        "Popup timeout",IDC_STATIC,10,62,110,41

-    CONTROL         "From PopUp plugin",IDC_RADIO_FROMPOPUP,"Button",BS_AUTORADIOBUTTON,14,73,101,10

+    CONTROL         "From Popup plugin",IDC_RADIO_FROMPOPUP,"Button",BS_AUTORADIOBUTTON,14,73,101,10

     CONTROL         "Custom",IDC_RADIO_CUSTOM,"Button",BS_AUTORADIOBUTTON,14,88,73,10

     EDITTEXT        IDC_POPUP_TIMEOUT,90,85,24,14,ES_AUTOHSCROLL | ES_NUMBER

     PUSHBUTTON      "Test",IDC_TEST,251,93,50,11

diff --git a/plugins/UserInfoEx/res/resource.rc b/plugins/UserInfoEx/res/resource.rc
index 6a141f92ad..bd9a8f75ff 100644
--- a/plugins/UserInfoEx/res/resource.rc
+++ b/plugins/UserInfoEx/res/resource.rc
@@ -224,7 +224,7 @@ BEGIN
     CONTROL         "Use Windows colours",CHECK_OPT_POPUP_WINCLR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,32,101,114,10

     CONTROL         "Use default colours",CHECK_OPT_POPUP_DEFCLR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,32,114,114,10

     GROUPBOX        "Delay",IDC_STATIC,176,132,108,58,WS_GROUP

-    CONTROL         "From PopUp plugin",RADIO_OPT_POPUP_DEFAULT,"Button",BS_AUTORADIOBUTTON,182,146,96,10

+    CONTROL         "From Popup plugin",RADIO_OPT_POPUP_DEFAULT,"Button",BS_AUTORADIOBUTTON,182,146,96,10

     CONTROL         "Custom",RADIO_OPT_POPUP_CUSTOM,"Button",BS_AUTORADIOBUTTON,182,160,59,10

     CONTROL         "Permanent",RADIO_OPT_POPUP_PERMANENT,"Button",BS_AUTORADIOBUTTON,182,175,96,10

     EDITTEXT        EDIT_DELAY,246,159,33,14,ES_AUTOHSCROLL

diff --git a/plugins/Watrack/popup/pop_dlg.inc b/plugins/Watrack/popup/pop_dlg.inc
index 129b538780..865cf94401 100644
--- a/plugins/Watrack/popup/pop_dlg.inc
+++ b/plugins/Watrack/popup/pop_dlg.inc
@@ -1,10 +1,10 @@
-{PopUp Option Dialog}

+{Popup Option Dialog}

 

-// PopUp options

+// Popup options

 const

   DLGPOPUP = 'POPUP';

 

-function DlgPopUpOpt(Dialog:HWnd;hMessage:Uint;wParam:WPARAM;lParam:LPARAM):LRESULT; stdcall;

+function DlgPopupOpt(Dialog:HWnd;hMessage:Uint;wParam:WPARAM;lParam:LPARAM):LRESULT; stdcall;

 const

   dlginit:boolean=false;

 var

@@ -21,29 +21,29 @@ begin
       SetDlgItemTextW(Dialog,IDC_POPUP_TITLE,PopTitle);

       SetDlgItemTextW(Dialog,IDC_POPUP_TEXT ,PopText);

       

-      CheckDlgButton(Dialog,IDC_SHOWFILE ,PopUpFile);

+      CheckDlgButton(Dialog,IDC_SHOWFILE ,PopupFile);

       CheckDlgButton(Dialog,IDC_REQUEST  ,PopRequest);

 

-      CheckDlgButton(Dialog,IDC_ACTLEFTCLOSE  ,ord(LoByte(PopUpAction)=0));

-      CheckDlgButton(Dialog,IDC_ACTLEFTINFO   ,ord(LoByte(PopUpAction)=1));

-      CheckDlgButton(Dialog,IDC_ACTLEFTPLAYER ,ord(LoByte(PopUpAction)=2));

-      CheckDlgButton(Dialog,IDC_ACTLEFTNEXT   ,ord(LoByte(PopUpAction)=3));

-      CheckDlgButton(Dialog,IDC_ACTRIGHTCLOSE ,ord(HiByte(PopUpAction)=0));

-      CheckDlgButton(Dialog,IDC_ACTRIGHTINFO  ,ord(HiByte(PopUpAction)=1));

-      CheckDlgButton(Dialog,IDC_ACTRIGHTPLAYER,ord(HiByte(PopUpAction)=2));

-      CheckDlgButton(Dialog,IDC_ACTRIGHTNEXT  ,ord(HiByte(PopUpAction)=3));

+      CheckDlgButton(Dialog,IDC_ACTLEFTCLOSE  ,ord(LoByte(PopupAction)=0));

+      CheckDlgButton(Dialog,IDC_ACTLEFTINFO   ,ord(LoByte(PopupAction)=1));

+      CheckDlgButton(Dialog,IDC_ACTLEFTPLAYER ,ord(LoByte(PopupAction)=2));

+      CheckDlgButton(Dialog,IDC_ACTLEFTNEXT   ,ord(LoByte(PopupAction)=3));

+      CheckDlgButton(Dialog,IDC_ACTRIGHTCLOSE ,ord(HiByte(PopupAction)=0));

+      CheckDlgButton(Dialog,IDC_ACTRIGHTINFO  ,ord(HiByte(PopupAction)=1));

+      CheckDlgButton(Dialog,IDC_ACTRIGHTPLAYER,ord(HiByte(PopupAction)=2));

+      CheckDlgButton(Dialog,IDC_ACTRIGHTNEXT  ,ord(HiByte(PopupAction)=3));

 

-      CheckDlgButton(Dialog,IDC_USEBUTTONS,PopUpButtons);

+      CheckDlgButton(Dialog,IDC_USEBUTTONS,PopupButtons);

 

-      SetDlgItemInt (Dialog,IDC_DELAY,PopUpPause,false);

+      SetDlgItemInt (Dialog,IDC_DELAY,PopupPause,false);

 

-      if PopUpDelay<0 then

+      if PopupDelay<0 then

         CheckDlgButton(Dialog,IDC_DELAYPERM,BST_CHECKED)

-      else if PopUpDelay=0 then

+      else if PopupDelay=0 then

         CheckDlgButton(Dialog,IDC_DELAYDEF,BST_CHECKED)

       else

         CheckDlgButton(Dialog,IDC_DELAYCUST,BST_CHECKED);

-      if PopUpDelay<=0 then

+      if PopupDelay<=0 then

         EnableWindow(GetDlgItem(Dialog,IDC_DELAY),false);

 

       SendDlgItemMessage(Dialog,IDC_MACRO_HELP,BM_SETIMAGE,IMAGE_ICON,

@@ -51,18 +51,18 @@ begin
 

       fore:=GetDlgItem(Dialog,IDC_FORE);

       back:=GetDlgItem(Dialog,IDC_BACK);

-      SendMessage(fore,CPM_SETCOLOUR,0,PopUpFore);

+      SendMessage(fore,CPM_SETCOLOUR,0,PopupFore);

       SendMessage(fore,CPM_SETDEFAULTCOLOUR,0,GetSysColor(COLOR_BTNTEXT));

-      SendMessage(back,CPM_SETCOLOUR,0,PopUpBack);

+      SendMessage(back,CPM_SETCOLOUR,0,PopupBack);

       SendMessage(back,CPM_SETDEFAULTCOLOUR,0,GetSysColor(COLOR_BTNFACE));

-      SetDlgItemInt(Dialog,IDC_FORE,PopUpFore,false);

-      SetDlgItemInt(Dialog,IDC_BACK,PopUpBack,false);

-      if PopUpColor<2 then

+      SetDlgItemInt(Dialog,IDC_FORE,PopupFore,false);

+      SetDlgItemInt(Dialog,IDC_BACK,PopupBack,false);

+      if PopupColor<2 then

       begin

         EnableWindow(fore,false);

         EnableWindow(back,false);

       end;

-      case PopUpColor of

+      case PopupColor of

         0: CheckDlgButton(Dialog,IDC_COLORDEF ,BST_CHECKED);

         1: CheckDlgButton(Dialog,IDC_COLORWIN ,BST_CHECKED);

         2: CheckDlgButton(Dialog,IDC_COLORCUST,BST_CHECKED);

@@ -130,46 +130,46 @@ begin
           PopTitle:=GetDlgText(Dialog,IDC_POPUP_TITLE);

           PopText :=GetDlgText(Dialog,IDC_POPUP_TEXT);

           

-          PopUpButtons:=IsDlgButtonChecked(Dialog,IDC_USEBUTTONS);

+          PopupButtons:=IsDlgButtonChecked(Dialog,IDC_USEBUTTONS);

 

-          PopUpFile :=IsDlgButtonChecked(Dialog,IDC_SHOWFILE);

+          PopupFile :=IsDlgButtonChecked(Dialog,IDC_SHOWFILE);

           PopRequest:=IsDlgButtonChecked(Dialog,IDC_REQUEST);

 //color

           if IsDlgButtonChecked(Dialog,IDC_COLORDEF)=BST_CHECKED then

-            PopUpColor:=0

+            PopupColor:=0

           else if IsDlgButtonChecked(Dialog,IDC_COLORWIN)=BST_CHECKED then

-            PopUpColor:=1

+            PopupColor:=1

           else

           begin

-            PopUpColor:=2;

-            PopUpFore:=SendDlgItemMessage(Dialog,IDC_FORE,CPM_GETCOLOUR,0,0);

-            PopUpBack:=SendDlgItemMessage(Dialog,IDC_BACK,CPM_GETCOLOUR,0,0);

+            PopupColor:=2;

+            PopupFore:=SendDlgItemMessage(Dialog,IDC_FORE,CPM_GETCOLOUR,0,0);

+            PopupBack:=SendDlgItemMessage(Dialog,IDC_BACK,CPM_GETCOLOUR,0,0);

           end;

 //pause

           if IsDlgButtonChecked(Dialog,IDC_DELAYDEF)=BST_CHECKED then

-            PopUpDelay:=0

+            PopupDelay:=0

           else if IsDlgButtonChecked(Dialog,IDC_DELAYPERM)=BST_CHECKED then

-            PopUpDelay:=-1

+            PopupDelay:=-1

           else

           begin

-            PopUpDelay:=1;

-            PopUpPause:=GetDlgItemInt(Dialog,IDC_DELAY,tmp,false);

+            PopupDelay:=1;

+            PopupPause:=GetDlgItemInt(Dialog,IDC_DELAY,tmp,false);

           end;

 //action

           if IsDlgButtonChecked(Dialog,IDC_ACTLEFTINFO)=BST_CHECKED then

-            PopUpAction:=1

+            PopupAction:=1

           else if IsDlgButtonChecked(Dialog,IDC_ACTLEFTPLAYER)=BST_CHECKED then

-            PopUpAction:=2

+            PopupAction:=2

           else if IsDlgButtonChecked(Dialog,IDC_ACTLEFTNEXT)=BST_CHECKED then

-            PopUpAction:=3

+            PopupAction:=3

           else

-            PopUpAction:=0;

+            PopupAction:=0;

           if IsDlgButtonChecked(Dialog,IDC_ACTRIGHTINFO)=BST_CHECKED then

-            inc(PopUpAction,$100)

+            inc(PopupAction,$100)

           else if IsDlgButtonChecked(Dialog,IDC_ACTRIGHTPLAYER)=BST_CHECKED then

-            inc(PopUpAction,$200)

+            inc(PopupAction,$200)

           else if IsDlgButtonChecked(Dialog,IDC_ACTRIGHTNEXT)=BST_CHECKED then

-            inc(PopUpAction,$300);

+            inc(PopupAction,$300);

 

           savepopup;

         end;

diff --git a/plugins/Watrack/popup/pop_opt.inc b/plugins/Watrack/popup/pop_opt.inc
index 591063923e..0c01d097eb 100644
--- a/plugins/Watrack/popup/pop_opt.inc
+++ b/plugins/Watrack/popup/pop_opt.inc
@@ -8,17 +8,17 @@ const
 const

   opt_ModStatus  :PAnsiChar = 'module/popups';

 

-  opt_PopUpFile   :PAnsiChar = 'popup/file';

-  opt_PopUpAction :PAnsiChar = 'popup/action';

-  opt_PopUpFore   :PAnsiChar = 'popup/fore';

-  opt_PopUpBack   :PAnsiChar = 'popup/back';

-  opt_PopUpPause  :PAnsiChar = 'popup/time';

-  opt_PopUpDelay  :PAnsiChar = 'popup/delay';

-  opt_PopUpColor  :PAnsiChar = 'popup/color';

+  opt_PopupFile   :PAnsiChar = 'popup/file';

+  opt_PopupAction :PAnsiChar = 'popup/action';

+  opt_PopupFore   :PAnsiChar = 'popup/fore';

+  opt_PopupBack   :PAnsiChar = 'popup/back';

+  opt_PopupPause  :PAnsiChar = 'popup/time';

+  opt_PopupDelay  :PAnsiChar = 'popup/delay';

+  opt_PopupColor  :PAnsiChar = 'popup/color';

   opt_ByRequest   :PAnsiChar = 'popup/byrequest';

   opt_PopTitle    :PAnsiChar = 'popup/poptitle';

   opt_PopText     :PAnsiChar = 'popup/poptext';

-  opt_PopUpButtons:PAnsiChar = 'popup/usebuttons';

+  opt_PopupButtons:PAnsiChar = 'popup/usebuttons';

 

   spref = 'strings/';

 

@@ -36,14 +36,14 @@ procedure loadpopup;
 var

   def1,def2:pWideChar;

 begin

-  PopUpButtons:=DBReadByte (0,PluginShort,opt_PopUpButtons,BST_CHECKED);

-  PopUpFile   :=DBReadByte (0,PluginShort,opt_PopUpFile   ,BST_CHECKED);

-  PopUpPause  :=DBReadByte (0,PluginShort,opt_PopUpPause  ,0);

-  PopUpDelay  :=DBReadByte (0,PluginShort,opt_PopUpDelay  ,0);

-  PopUpAction :=DBReadWord (0,PluginShort,opt_PopUpAction ,0);

-  PopUpColor  :=DBReadByte (0,PluginShort,opt_PopUpColor  ,0);

-  PopUpFore   :=DBReadDWord(0,PluginShort,opt_PopUpFore   ,GetSysColor(COLOR_BTNTEXT));

-  PopUpBack   :=DBReadDWord(0,PluginShort,opt_PopUpBack   ,GetSysColor(COLOR_BTNFACE));

+  PopupButtons:=DBReadByte (0,PluginShort,opt_PopupButtons,BST_CHECKED);

+  PopupFile   :=DBReadByte (0,PluginShort,opt_PopupFile   ,BST_CHECKED);

+  PopupPause  :=DBReadByte (0,PluginShort,opt_PopupPause  ,0);

+  PopupDelay  :=DBReadByte (0,PluginShort,opt_PopupDelay  ,0);

+  PopupAction :=DBReadWord (0,PluginShort,opt_PopupAction ,0);

+  PopupColor  :=DBReadByte (0,PluginShort,opt_PopupColor  ,0);

+  PopupFore   :=DBReadDWord(0,PluginShort,opt_PopupFore   ,GetSysColor(COLOR_BTNTEXT));

+  PopupBack   :=DBReadDWord(0,PluginShort,opt_PopupBack   ,GetSysColor(COLOR_BTNFACE));

   PopRequest  :=DBReadByte (0,PluginShort,opt_ByRequest   ,BST_UNCHECKED);

   if isVarsInstalled then

   begin

@@ -61,14 +61,14 @@ end;
 

 procedure savepopup;

 begin

-  DBWriteByte   (0,PluginShort,opt_PopUpButtons,PopUpButtons);

-  DBWriteByte   (0,PluginShort,opt_PopUpFile   ,PopUpFile);

-  DBWriteByte   (0,PluginShort,opt_PopUpPause  ,PopUpPause);

-  DBWriteByte   (0,PluginShort,opt_PopUpDelay  ,PopUpDelay);

-  DBWriteWord   (0,PluginShort,opt_PopUpAction ,PopUpAction);

-  DBWriteByte   (0,PluginShort,opt_PopUpColor  ,PopUpColor);

-  DBWriteDWord  (0,PluginShort,opt_PopUpFore   ,PopUpFore);

-  DBWriteDWord  (0,PluginShort,opt_PopUpBack   ,PopUpBack);

+  DBWriteByte   (0,PluginShort,opt_PopupButtons,PopupButtons);

+  DBWriteByte   (0,PluginShort,opt_PopupFile   ,PopupFile);

+  DBWriteByte   (0,PluginShort,opt_PopupPause  ,PopupPause);

+  DBWriteByte   (0,PluginShort,opt_PopupDelay  ,PopupDelay);

+  DBWriteWord   (0,PluginShort,opt_PopupAction ,PopupAction);

+  DBWriteByte   (0,PluginShort,opt_PopupColor  ,PopupColor);

+  DBWriteDWord  (0,PluginShort,opt_PopupFore   ,PopupFore);

+  DBWriteDWord  (0,PluginShort,opt_PopupBack   ,PopupBack);

   DBWriteByte   (0,PluginShort,opt_ByRequest   ,PopRequest);

   DBWriteUnicode(0,PluginShort,opt_PopTitle,PopTitle);

   DBWriteUnicode(0,PluginShort,opt_PopText ,PopText);

diff --git a/plugins/Watrack/popup/pop_vars.inc b/plugins/Watrack/popup/pop_vars.inc
index 0be12fd5e8..63048e7555 100644
--- a/plugins/Watrack/popup/pop_vars.inc
+++ b/plugins/Watrack/popup/pop_vars.inc
@@ -5,14 +5,14 @@ var
   PopTitle,

   PopText:pWideChar;

   PopRequest,

-  PopUpFile:dword;

-  PopUpColor:dword;

-  PopUpFore,

-  PopUpBack:cardinal;

-  PopUpPause:cardinal;

-  PopUpDelay:integer;

-  PopUpAction:cardinal;

-  PopUpButtons:cardinal;

+  PopupFile:dword;

+  PopupColor:dword;

+  PopupFore,

+  PopupBack:cardinal;

+  PopupPause:cardinal;

+  PopupDelay:integer;

+  PopupAction:cardinal;

+  PopupButtons:cardinal;

 

   DisablePlugin:integer;

   IsPopup2Present:boolean;

diff --git a/plugins/Watrack/popup/popups.pas b/plugins/Watrack/popup/popups.pas
index 2d4ba8d08c..0fe52a5301 100644
--- a/plugins/Watrack/popup/popups.pas
+++ b/plugins/Watrack/popup/popups.pas
@@ -1,4 +1,4 @@
-{PopUp support}

+{Popup support}

 unit Popups;

 {$include compilers.inc}

 interface

@@ -59,7 +59,7 @@ begin
     lvars[13]:=uint_ptr(txtver);

   end;

   StrCopyW(Tmpl,TranslateW(MainTmpl));

-  if PopUpFile=BST_CHECKED then

+  if PopupFile=BST_CHECKED then

   begin

     lvars[14]:=uint_ptr(si^.mfile);

     lvars[15]:=si^.fsize;

@@ -79,9 +79,9 @@ begin
   case msg of

     WM_COMMAND,WM_CONTEXTMENU: begin

       if msg=WM_CONTEXTMENU then

-        wParam:=HiByte(PopUpAction)

+        wParam:=HiByte(PopupAction)

       else

-        wParam:=LoByte(PopUpAction);

+        wParam:=LoByte(PopupAction);

       si:=pointer(CallService(MS_WAT_RETURNGLOBAL,0,0));

       case wParam of

         1: ShowMusicInfo(si);

@@ -124,7 +124,7 @@ type
 var

   actions:^anacts;

 begin

-  if PopUpButtons<>BST_UNCHECKED then

+  if PopupButtons<>BST_UNCHECKED then

   begin

     mGetMem(actions,SizeOf(anacts));

     result:=PPOPUPACTION(actions);

@@ -167,13 +167,13 @@ begin
       Icon:=si^.icon

     else

       Icon:=LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);

-    if PopUpDelay<0 then

+    if PopupDelay<0 then

       sec:=-1

-    else if PopUpDelay>0 then

-      sec:=PopUpPause

+    else if PopupDelay>0 then

+      sec:=PopupPause

     else

       sec:=0;

-    case PopUpColor of

+    case PopupColor of

       0: begin

         cb:=0;

         ct:=0;

@@ -183,8 +183,8 @@ begin
         ct:=GetSysColor(COLOR_BTNTEXT);

       end;

       2: begin

-        cb:=PopUpBack;

-        ct:=PopUpFore;

+        cb:=PopupBack;

+        ct:=PopupFore;

       end;

     else

       cb:=0;

@@ -287,14 +287,14 @@ begin
   end;

 end;

 

-procedure ShowPopUp(si:pSongInfo);

+procedure ShowPopup(si:pSongInfo);

 begin

   mir_forkthread(@ThShowPopup,si);

 end;

 

 // --------------- Services and Hooks ----------------

 

-function OpenPopUp(wParam:WPARAM;lParam:LPARAM):int;cdecl;

+function OpenPopup(wParam:WPARAM;lParam:LPARAM):int;cdecl;

 var

   si:pSongInfo;

 begin

@@ -304,7 +304,7 @@ begin
   if CallService(MS_WAT_GETMUSICINFO,0,tlparam(@si))=WAT_PLS_NORMAL then

   begin

     if PopupPresent then

-      ShowPopUp(si)

+      ShowPopup(si)

     else

       ShowMusicInfo(si);

   end;

@@ -340,7 +340,7 @@ begin
   case wParam of

     WAT_EVENT_NEWTRACK: begin

       if PopupPresent and (PopRequest=BST_UNCHECKED) then

-        ShowPopUp(pSongInfo(lParam));

+        ShowPopup(pSongInfo(lParam));

     end;

     WAT_EVENT_PLUGINSTATUS: begin

       DisablePlugin:=lParam;

@@ -391,9 +391,9 @@ begin
   odp.hInstance  :=hInstance;

   odp.szTitle.a  :=PluginName;

 

-  odp.szGroup.a  :='PopUps';

+  odp.szGroup.a  :='Popups';

   odp.pszTemplate:=DLGPOPUP;

-  odp.pfnDlgProc :=@DlgPopUpOpt;

+  odp.pfnDlgProc :=@DlgPopupOpt;

   CallService(MS_OPT_ADDPAGE,wParam,tlparam(@odp));

   result:=0;

 end;

@@ -433,7 +433,7 @@ begin
     SetModStatus(1);

   result:=1;

 

-  CreateServiceFunction(MS_WAT_SHOWMUSICINFO,@OpenPopUp);

+  CreateServiceFunction(MS_WAT_SHOWMUSICINFO,@OpenPopup);

 

   FillChar(sid,SizeOf(TSKINICONDESC),0);

   sid.cbSize:=SizeOf(TSKINICONDESC);

@@ -515,7 +515,7 @@ begin
   Popup.Init      :=@InitProc;

   Popup.DeInit    :=@DeInitProc;

   Popup.AddOption :=nil;

-  Popup.ModuleName:='PopUps';

+  Popup.ModuleName:='Popups';

   ModuleLink      :=@Popup;

 end;

 

diff --git a/plugins/Weather/res/resource.rc b/plugins/Weather/res/resource.rc
index 34690d8d71..29140efb2d 100644
--- a/plugins/Weather/res/resource.rc
+++ b/plugins/Weather/res/resource.rc
@@ -123,7 +123,7 @@ BEGIN
     CONTROL         "Set as default station",IDC_DEFA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,168,218,8

     CONTROL         "Disable automatic update for this station",IDC_DAutoUpdate,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,179,218,8

-    CONTROL         "Disable PopUp for this station",IDC_DPop,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,190,218,8

+    CONTROL         "Disable Popup for this station",IDC_DPop,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,190,218,8

     PUSHBUTTON      "Change",IDC_CHANGE,57,207,46,14

     DEFPUSHBUTTON   "Cancel",IDCANCEL,136,207,46,14

     CONTROL         "",IDC_SVCINFO,"MButtonClass",WS_TABSTOP,217,35,13,12,WS_EX_NOACTIVATE | 0x10000000L

@@ -135,7 +135,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

-    GROUPBOX        "PopUp Options",IDC_STATIC,4,5,158,54

+    GROUPBOX        "Popup Options",IDC_STATIC,4,5,158,54

     CONTROL         "Enable popups",IDC_E,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,15,15,143,9

     CONTROL         "Popup only when condition changes",IDC_CH,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,15,44,140,10

     GROUPBOX        "Colours",IDC_STATIC,168,5,139,54

@@ -153,7 +153,7 @@ BEGIN
     CONTROL         "Delay",IDC_PD3,"Button",BS_AUTORADIOBUTTON,177,74,53,8

     EDITTEXT        IDC_DELAY,233,73,36,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER | NOT WS_BORDER,WS_EX_STATICEDGE

     LTEXT           "seconds",IDC_STATIC,272,73,34,10

-    CONTROL         "From PopUp plugin",IDC_PD1,"Button",BS_AUTORADIOBUTTON,177,85,110,8

+    CONTROL         "From Popup plugin",IDC_PD1,"Button",BS_AUTORADIOBUTTON,177,85,110,8

     CONTROL         "Permanent",IDC_PD2,"Button",BS_AUTORADIOBUTTON,177,96,110,8

     GROUPBOX        "Popup Text",IDC_STATIC,3,112,305,121

     LTEXT           "Popup Title",IDC_STATIC,15,124,56,9

@@ -336,7 +336,7 @@ IDR_PMENU MENU
 BEGIN

     POPUP "Menu"

     BEGIN

-        MENUITEM "Dismiss PopUp",               IDM_M1

+        MENUITEM "Dismiss Popup",               IDM_M1

         MENUITEM "Open brief information",      IDM_M2

         MENUITEM "Open complete forecast",      IDM_M3

         MENUITEM "Open weather map",            IDM_M4

diff --git a/plugins/WhoUsesMyFiles/res/resource.rc b/plugins/WhoUsesMyFiles/res/resource.rc
index c244c87231..fe24192ffe 100644
--- a/plugins/WhoUsesMyFiles/res/resource.rc
+++ b/plugins/WhoUsesMyFiles/res/resource.rc
@@ -46,7 +46,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

     GROUPBOX        "Popup delay settings",IDC_STATIC,9,9,153,93,WS_GROUP

     EDITTEXT        IDC_DELAY_SEC,17,23,20,12,ES_AUTOHSCROLL | ES_NUMBER

-    LTEXT           "PopUp Delay (seconds)",IDC_TX_DELAY_SEC,39,25,94,8

+    LTEXT           "Popup Delay (seconds)",IDC_TX_DELAY_SEC,39,25,94,8

     CONTROL         "",IDC_COLOR_BACK,"ColourPicker",WS_TABSTOP,187,24,39,12

     LTEXT           "Background color",IDC_STATIC,231,26,76,8,SS_CENTERIMAGE | 

                     NOT WS_GROUP

@@ -56,20 +56,20 @@ BEGIN
     PUSHBUTTON      "Previe&w",IDC_PREVIEW,270,231,50,15

     CONTROL         "Show infinitely",IDC_DELAY_INF,"Button",

                     BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,17,50,61,10

-    CONTROL         "Default PopUp delay",IDC_DELAY_DEF,"Button",

+    CONTROL         "Default Popup delay",IDC_DELAY_DEF,"Button",

                     BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,17,61,81,10

     CONTROL         "Choose delay time",IDC_DELAY_SET,"Button",

                     BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,17,39,73,10

     GROUPBOX        "Popup color settings",IDC_STATIC,167,9,153,93,WS_GROUP

     CONTROL         "Use windows colors",IDC_COLOR_WIN,"Button",

                     BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,187,63,79,10

-    CONTROL         "Use default PopUp colors",IDC_COLOR_DEF,"Button",

+    CONTROL         "Use default Popup colors",IDC_COLOR_DEF,"Button",

                     BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,187,74,97,10

     CONTROL         "Choose colors",IDC_COLOR_SET,"Button",

                     BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,187,52,61,10

     GROUPBOX        "File access filter && logging settings",IDC_STATIC,9,

                     106,311,101

-    CTEXT           "Please note that this settings has effect only with PopUps Interoperability plugin version 1.0.1.9 or higher",

+    CTEXT           "Please note that this settings has effect only with Popups Interoperability plugin version 1.0.1.9 or higher",

                     IDC_DELAY_NOTE,14,73,143,26,SS_SUNKEN | WS_DISABLED | 

                     NOT WS_GROUP

     EDITTEXT        IDC_FILE,83,123,210,12,ES_AUTOHSCROLL,WS_EX_ACCEPTFILES

diff --git a/protocols/MRA/res/resource.rc b/protocols/MRA/res/resource.rc
index 3caad3cee9..b3480ff90e 100644
--- a/protocols/MRA/res/resource.rc
+++ b/protocols/MRA/res/resource.rc
@@ -214,7 +214,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

-    RTEXT           "PopUp type",IDC_STATIC,9,11,52,8

+    RTEXT           "Popup type",IDC_STATIC,9,11,52,8

     COMBOBOX        IDC_COMBO_POPUP_TYPE,65,9,220,97,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

     GROUPBOX        "Popup settings",IDC_GROUPMAIN,9,25,276,90,WS_GROUP

     CONTROL         "Enable",IDC_CHK_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,38,260,10

diff --git a/protocols/Tlen/res/tlen.rc b/protocols/Tlen/res/tlen.rc
index 60dd22fa58..c105940f6a 100644
--- a/protocols/Tlen/res/tlen.rc
+++ b/protocols/Tlen/res/tlen.rc
@@ -185,7 +185,7 @@ BEGIN
     CONTROL         "",IDC_COLORBKG,"ColourPicker",WS_TABSTOP,17,41,24,12

     CONTROL         "",IDC_COLORTXT,"ColourPicker",WS_TABSTOP,17,59,24,12

     GROUPBOX        "Delay",IDC_STATIC,157,26,140,55

-    CONTROL         "&From PopUp plugin",IDC_DELAY_POPUP,"Button",

+    CONTROL         "&From Popup plugin",IDC_DELAY_POPUP,"Button",

                     BS_AUTORADIOBUTTON,164,40,125,10

     CONTROL         "&Custom",IDC_DELAY_CUSTOM,"Button",BS_AUTORADIOBUTTON,

                     164,53,98,10

diff --git a/src/core/stdchat/res/chat.rc b/src/core/stdchat/res/chat.rc
index fc81743d84..5469807430 100644
--- a/src/core/stdchat/res/chat.rc
+++ b/src/core/stdchat/res/chat.rc
@@ -219,7 +219,7 @@ BEGIN
     LTEXT           "Timeout (s)",IDC_STATIC,33,138,92,8

     LTEXT           "Text",IDC_STATIC,141,83,49,8

     LTEXT           "Background",IDC_STATIC,201,83,67,8

-    LTEXT           "(The timeout require at least PopUp plugin v 1.0.1.9. Setting it to 0 means default setting and -1 means indefinite time)",

+    LTEXT           "(The timeout require at least Popup plugin v 1.0.1.9. Setting it to 0 means default setting and -1 means indefinite time)",

 					IDC_STATIC,33,151,207,17

 END