langpacks/english: updated

git-svn-id: http://svn.miranda-ng.org/main/trunk@4735 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

8 files changed, 72 insertions, 74 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 53dc3bdfc4..0087d00793 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -763,19 +763,19 @@
 [Show icon in tray for name changes]

 [Show icon in tray for information messages]

 [Show icon in tray for status changes]

-[Show pop-ups only when the chat room is not active]

-[Show pop-up for topic changes]

-[Show pop-up for users joining]

-[Show pop-up for users disconnecting]

-[Show pop-up for messages]

-[Show pop-up for actions]

-[Show pop-up for highlights]

-[Show pop-up for users leaving]

-[Show pop-up for users kicking other user]

-[Show pop-up for notices ]

-[Show pop-up for name changes]

-[Show pop-up for information messages]

-[Show pop-up for status changes]

+[Show popups only when the chat room is not active]

+[Show popup for topic changes]

+[Show popup for users joining]

+[Show popup for users disconnecting]

+[Show popup for messages]

+[Show popup for actions]

+[Show popup for highlights]

+[Show popup for users leaving]

+[Show popup for users kicking other user]

+[Show popup for notices ]

+[Show popup for name changes]

+[Show popup for information messages]

+[Show popup for status changes]

 [Chat Module]

 [Message Background]

 [Userlist Background]

@@ -822,7 +822,7 @@
 [Default events to show in new chat rooms if the 'event filter' is enabled]

 [Icons to display in the message log]

 [Icons to display in the tray]

-[Pop-ups to display]

+[Popups to display]

 [Select Folder]

 [Message Sessions]

 [Group chats]

diff --git a/langpacks/english/Langpack_english.txt b/langpacks/english/Langpack_english.txt
index 238911da82..03dd4f767b 100644
--- a/langpacks/english/Langpack_english.txt
+++ b/langpacks/english/Langpack_english.txt
@@ -763,19 +763,19 @@
 [Show icon in tray for name changes]

 [Show icon in tray for information messages]

 [Show icon in tray for status changes]

-[Show pop-ups only when the chat room is not active]

-[Show pop-up for topic changes]

-[Show pop-up for users joining]

-[Show pop-up for users disconnecting]

-[Show pop-up for messages]

-[Show pop-up for actions]

-[Show pop-up for highlights]

-[Show pop-up for users leaving]

-[Show pop-up for users kicking other user]

-[Show pop-up for notices ]

-[Show pop-up for name changes]

-[Show pop-up for information messages]

-[Show pop-up for status changes]

+[Show popups only when the chat room is not active]

+[Show popup for topic changes]

+[Show popup for users joining]

+[Show popup for users disconnecting]

+[Show popup for messages]

+[Show popup for actions]

+[Show popup for highlights]

+[Show popup for users leaving]

+[Show popup for users kicking other user]

+[Show popup for notices ]

+[Show popup for name changes]

+[Show popup for information messages]

+[Show popup for status changes]

 [Chat Module]

 [Message Background]

 [Userlist Background]

@@ -822,7 +822,7 @@
 [Default events to show in new chat rooms if the 'event filter' is enabled]

 [Icons to display in the message log]

 [Icons to display in the tray]

-[Pop-ups to display]

+[Popups to display]

 [Select Folder]

 [Message Sessions]

 [Group chats]

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

 [Extra status]

 [Custom Status]

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

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

 [None]

 [Debug]

 [Information]

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

 [Filtering]

 [Message log]

-[Popups]

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

 [Open message window]

 [Close popup]

@@ -13238,10 +13237,8 @@
 [Contacts]

 [Advanced]

 [Toggle Popups]

-[Enable popups]

-[Disable popups]

-[Enable &popup module]

-[Disable &popup module]

+[Enable Popups]

+[Disable Popups]

 [Popup Plus]

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

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

@@ -14156,19 +14153,19 @@
 [Show icon in tray for name changes]

 [Show icon in tray for information messages]

 [Show icon in tray for status changes]

-[Show pop-ups only when the chat room is not active]

-[Show pop-up for topic changes]

-[Show pop-up for users joining]

-[Show pop-up for users disconnecting]

-[Show pop-up for messages]

-[Show pop-up for actions]

-[Show pop-up for highlights]

-[Show pop-up for users leaving]

-[Show pop-up for users kicking other user]

-[Show pop-up for notices ]

-[Show pop-up for name changes]

-[Show pop-up for information messages]

-[Show pop-up for status changes]

+[Show popups only when the chat room is not active]

+[Show popup for topic changes]

+[Show popup for users joining]

+[Show popup for users disconnecting]

+[Show popup for messages]

+[Show popup for actions]

+[Show popup for highlights]

+[Show popup for users leaving]

+[Show popup for users kicking other user]

+[Show popup for notices ]

+[Show popup for name changes]

+[Show popup for information messages]

+[Show popup for status changes]

 [Appearance and functionality of chat windows]

 [Icons to display in the tray]

 [nick of current contact (if defined)]

@@ -14465,7 +14462,6 @@
 [Key Popup]

 [Secure Popup]

 [Message Popup]

-[Popups]

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

 [SecureIM [Native]]

 [SecureIM [PGP]]

@@ -20264,7 +20260,7 @@
 ;============================================================

 ;  File: YAPP.dll

 ;  Plugin: YAPP

-;  Version: 0.5.0.10

+;  Version: 0.5.0.11

 ;  Authors: Scott Ellis

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

 [Yet Another Popup Plugin - Provides popup notification window services to other plugins.]

@@ -20295,6 +20291,10 @@
 [Background colour:]

 [Set timeout]

 [Timeout value (0 = default):]

+;file \plugins\YAPP\src\icons.cpp

+[Popups are enabled]

+[Popups are disabled]

+[Popup History]

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

 [YAPP Popups]

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

@@ -20329,9 +20329,8 @@
 ;file \plugins\YAPP\src\services.cpp

 [Disable Popups]

 [Enable Popups]

-[Popup History]

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

-[Popups]

+[Toggle Popups]

 [First line]

 [Second line]

 [Time]

diff --git a/langpacks/english/Plugins/MRA.txt b/langpacks/english/Plugins/MRA.txt
index b8284b1e14..f4b1d7109d 100644
--- a/langpacks/english/Plugins/MRA.txt
+++ b/langpacks/english/Plugins/MRA.txt
@@ -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]

diff --git a/langpacks/english/Plugins/NewXstatusNotify.txt b/langpacks/english/Plugins/NewXstatusNotify.txt
index 1607866fcc..0028efcc2d 100644
--- a/langpacks/english/Plugins/NewXstatusNotify.txt
+++ b/langpacks/english/Plugins/NewXstatusNotify.txt
@@ -170,7 +170,6 @@
 [Protocol]

 [Filtering]

 [Message log]

-[Popups]

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

 [Open message window]

 [Close popup]

diff --git a/langpacks/english/Plugins/PopUp.txt b/langpacks/english/Plugins/PopUp.txt
index e9322e0b6d..769c9c71a0 100644
--- a/langpacks/english/Plugins/PopUp.txt
+++ b/langpacks/english/Plugins/PopUp.txt
@@ -157,10 +157,8 @@
 [Contacts]

 [Advanced]

 [Toggle Popups]

-[Enable popups]

-[Disable popups]

-[Enable &popup module]

-[Disable &popup module]

+[Enable Popups]

+[Disable Popups]

 [Popup Plus]

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

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

diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index 40620809b1..7efbad8245 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -417,19 +417,19 @@
 [Show icon in tray for name changes]

 [Show icon in tray for information messages]

 [Show icon in tray for status changes]

-[Show pop-ups only when the chat room is not active]

-[Show pop-up for topic changes]

-[Show pop-up for users joining]

-[Show pop-up for users disconnecting]

-[Show pop-up for messages]

-[Show pop-up for actions]

-[Show pop-up for highlights]

-[Show pop-up for users leaving]

-[Show pop-up for users kicking other user]

-[Show pop-up for notices ]

-[Show pop-up for name changes]

-[Show pop-up for information messages]

-[Show pop-up for status changes]

+[Show popups only when the chat room is not active]

+[Show popup for topic changes]

+[Show popup for users joining]

+[Show popup for users disconnecting]

+[Show popup for messages]

+[Show popup for actions]

+[Show popup for highlights]

+[Show popup for users leaving]

+[Show popup for users kicking other user]

+[Show popup for notices ]

+[Show popup for name changes]

+[Show popup for information messages]

+[Show popup for status changes]

 [Appearance and functionality of chat windows]

 [Icons to display in the tray]

 [nick of current contact (if defined)]

diff --git a/langpacks/english/Plugins/SecureIM.txt b/langpacks/english/Plugins/SecureIM.txt
index c199db7684..b12970efe0 100644
--- a/langpacks/english/Plugins/SecureIM.txt
+++ b/langpacks/english/Plugins/SecureIM.txt
@@ -213,7 +213,6 @@
 [Key Popup]

 [Secure Popup]

 [Message Popup]

-[Popups]

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

 [SecureIM [Native]]

 [SecureIM [PGP]]

diff --git a/langpacks/english/Plugins/YAPP.txt b/langpacks/english/Plugins/YAPP.txt
index 3767e8387f..8c03d3036c 100644
--- a/langpacks/english/Plugins/YAPP.txt
+++ b/langpacks/english/Plugins/YAPP.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: YAPP.dll

 ;  Plugin: YAPP

-;  Version: 0.5.0.10

+;  Version: 0.5.0.11

 ;  Authors: Scott Ellis

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

 [Yet Another Popup Plugin - Provides popup notification window services to other plugins.]

@@ -33,6 +33,10 @@
 [Background colour:]

 [Set timeout]

 [Timeout value (0 = default):]

+;file \plugins\YAPP\src\icons.cpp

+[Popups are enabled]

+[Popups are disabled]

+[Popup History]

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

 [YAPP Popups]

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

@@ -67,9 +71,8 @@
 ;file \plugins\YAPP\src\services.cpp

 [Disable Popups]

 [Enable Popups]

-[Popup History]

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

-[Popups]

+[Toggle Popups]

 [First line]

 [Second line]

 [Time]