From 67f282f8f50bcb1528f4c9c75803c0f8c4f0b7dd Mon Sep 17 00:00:00 2001
From: Vadim Dashevskiy <watcherhd@gmail.com>
Date: Thu, 22 Aug 2013 12:40:36 +0000
Subject: - PopUp => Popup

git-svn-id: http://svn.miranda-ng.org/main/trunk@5782 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 langpacks/english/Plugins/ConnectionNotify.txt |   4 +-
 langpacks/english/Plugins/PopUp.txt            | 222 -------------------------
 langpacks/english/Plugins/Popup.txt            | 222 +++++++++++++++++++++++++
 langpacks/english/Plugins/Quotes.txt           |  13 +-
 4 files changed, 231 insertions(+), 230 deletions(-)
 delete mode 100644 langpacks/english/Plugins/PopUp.txt
 create mode 100644 langpacks/english/Plugins/Popup.txt

(limited to 'langpacks/english/Plugins')

diff --git a/langpacks/english/Plugins/ConnectionNotify.txt b/langpacks/english/Plugins/ConnectionNotify.txt
index f258507bcb..92f1a6003b 100644
--- a/langpacks/english/Plugins/ConnectionNotify.txt
+++ b/langpacks/english/Plugins/ConnectionNotify.txt
@@ -32,6 +32,8 @@
 [* and ? wildcard characters also available (for port enter number or *)]
 [Remote IP:Port]
 ;file \plugins\ConnectionNotify\src\ConnectionNotify.cpp
+[Show]
+[Hide]
 [Always show popup]
 [Never show popup]
 [Status]
@@ -40,6 +42,6 @@
 [External socket]
 [Action]
 [Plugins]
-[ConnectionNotify: New Connection Notification]
+[New Connection Notification]
 ;file \plugins\ConnectionNotify\src\filter.cpp
 [First close options window]
diff --git a/langpacks/english/Plugins/PopUp.txt b/langpacks/english/Plugins/PopUp.txt
deleted file mode 100644
index 8d30c538a1..0000000000
--- a/langpacks/english/Plugins/PopUp.txt
+++ /dev/null
@@ -1,222 +0,0 @@
-#muuid {26a9125d-7863-4e01-af0e-d14ef95c5054}
-;============================================================
-;  File: Popup.dll
-;  Plugin: Popup plus
-;  Version: 2.1.1.7
-;  Authors: MPK, Merlin_de (Luca Santarelli, Victor Pavlychko)
-;============================================================
-[Provides popup notification services for different plugins.]
-;file \plugins\Popup\res\resource.rc
-[Content && Style]
-[Go to Customize > Fonts && Colors for fonts and colors options]
-[Miscellaneous]
-[Effects]
-[Live Preview]
-[Size && Position]
-[History]
-[Enable popup history]
-[Store last]
-[events]
-[Use History++ to render log]
-[Avatars]
-[Draw avatar borders]
-[Draw borders for semitransparent avatars too]
-[Round corners by]
-[pixels]
-[Avatar size:]
-[Enable avatar updates]
-[Multimonitor]
-[Start the popups in the monitor with]
-[Miranda's window]
-[the active window]
-[Transparency]
-[Enable Win 9x/Me transparency]
-[Use transparency]
-[opacity:]
-[Opaque popups under cursor]
-[Slide Popup]
-[Effect:]
-[Time (in):]
-[ms]
-[Time (out):]
-[Limit window amount to:]
-[Skins]
-[* - built-in skins]
-[Skin options]
-[Preview]
-[Download more skins]
-[Popup History]
-[Desktop]
-[Popup Area]
-[pixel(s)]
-[Distance between popups]
-[Configure popup area]
-[Close]
-[General]
-[Enable popup actions]
-[Popup Actions are those tiny buttons below notification text.]
-[Common Actions]
-[Please choose in what cases default actions should be added:]
-[Add info && menu for IM contacts only]
-[Add default actions for contacts only]
-[Don't close popups on default actions]
-[Use large icons]
-[Popup actions will be displayed as:]
-[Icons and labels below text]
-[Icons on the left]
-[Icons aligned to the right]
-[Show Actions: (requires apply)]
-[Mouse Actions Overwrite]
-[LeftButton]
-[MiddleButton]
-[RightButton]
-[Notifications]
-[General options]
-[Enable this notification]
-[Popup timeout:]
-[Left click action:]
-[Right click action:]
-[Disable when global status is...]
-[Disable when relevant protocol's status is...]
-[Colors can be configured in\r\nCustomize > Fonts && Colors]
-[More...]
-[Disable if message window is open]
-[Sec]
-[0 = Default]
-[-1 = Infinite]
-[Per-contact settings]
-[Show always]
-[Ignore fullscreen]
-[Never show]
-[Show default]
-[Default Timeout]
-[Infinite popup delay]
-[Popup delay:]
-[seconds]
-[Do not close hovered popups]
-[Dynamically resize the popups]
-[Minimum width]
-[Maximum width]
-[Position:]
-[Layout:]
-[Reorder Popups]
-[Disable when:]
-[Always (has priority)]
-[Fullscreen mode]
-[Debug]
-;file \plugins\Popup\src\actions.cpp
-[no overwrite]
-[Send message]
-[Quick reply]
-[User details]
-[Contact menu]
-[Dismiss popup]
-[Pin popup]
-[Copy to clipboard]
-[Action]
-;file \plugins\Popup\src\config.cpp
-[The Jabberwocky]
-[`Twas brillig, and the slithy toves\r\nDid gyre and gimble in the wabe:\r\nAll mimsy were the borogoves,\r\nAnd the mome raths outgrabe.\r\n\t[b][i]Lewis Carroll, 1855[/i][/b]]
-[Test preview for the popup plugin settings. This is supposed to be long enough not to fit in one line...]
-[This is a special test preview for the popup plugin settings. The text and title are quite long so you can tweak your skin and plugin settings to best fit your needs :)]
-[This is a notification message]
-[This is a warning message]
-[This is an error message]
-;file \plugins\Popup\src\effects.cpp
-[Square fading]
-;file \plugins\Popup\src\font.cpp
-[Hovered Action]
-[Clock]
-;file \plugins\Popup\src\history.cpp
-[Popup History is disabled]
-[Popup History message]
-;file \plugins\Popup\src\icons.cpp
-[Popups are enabled]
-[Popups are disabled]
-[With "favourite" overlay]
-[With "fullscreen" overlay]
-[Refresh skin list]
-[Popup Placement]
-[OK]
-[Cancel]
-[Popup Group]
-[Favorite Contact]
-[Show in Fullscreen]
-[Blocked Contact]
-[Quick Reply]
-[Pin Popup]
-[Pinned Popup]
-[Send Message]
-[User Details]
-[Contact Menu]
-[Add Contact Permanently]
-[Dismiss Popup]
-;file \plugins\Popup\src\main.cpp
-[Classes]
-[Actions]
-[Contacts]
-[Advanced]
-[Toggle Popups]
-[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
-[No effect]
-[Fade in/out]
-;file \plugins\Popup\src\opt_class.cpp
-[CLASS Plugins]
-[Ph'nglui mglw'nafh Cthulhu R'lyeh wgah'nagl fhtagn!]
-;file \plugins\Popup\src\opt_gen.cpp
-[Offline]
-[Online]
-[Invisible]
-[Away]
-[NA]
-[Occupied]
-[DND]
-[Free for chat]
-[Out to lunch]
-[On the phone]
-[Width]
-[upper left corner]
-[lower left corner]
-[lower right corner]
-[upper right corner]
-[horizontal]
-[vertical]
-[Global Status]
-[Protocol Status]
-[You cannot specify a value lower than %d and higher than %d.]
-['Reorder Popups' option is currently diabled.\r\nThis may cause misaligned popups when used with\r\navatars and text replacement (mainly NewStatusNotify).\r\n\r\nDo you want to enable popup reordering now?\r\n]
-[Popup Plus Warning]
-;file \plugins\Popup\src\opt_skins.cpp
-[Failed to register %s class.]
-[Skin preview]
-[Just take a look at this skin... ;)]
-[Show clock]
-[Drop shadow effect]
-[non rectangular]
-[Enable Aero Glass (Vista+)]
-[Use Windows colours]
-[Use advanced text render]
-[Global settings]
-[Refresh List]
-;file \plugins\Popup\src\popup_thread.cpp
-;file \plugins\Popup\src\popup_wnd2.cpp
-[Failed to GetClassInfoExW from EDIT class.]
-[Failed to register custom edit box window class.\r\n\r\ncbSize: %i\r\nstyle: %p\r\nlpfnWndProc: %i\r\ncbClsExtra: %i\r\ncbWndExtra: %i\r\nhInstance: %i\r\nhIcon: %i\r\nhCursor: %i\r\nhbrBackground: %i\r\nlpszMenuName: %s\r\nlpszClassName: %s\r\nhIconSm: %i\r\n]
-;file \plugins\Popup\src\services.cpp
-[Error]
-[Warning]
-[Notify]
-;file \plugins\Popup\src\skin.cpp
-[The skin you are trying to load is designed\r\nfor newer version of Popup Plus. And will not\r\ndisplay properly.\r\n\r\nPlease choose another skin.]
-;file \plugins\Popup\src\srmm_menu.cpp
-[Popup Mode: Auto]
-[Popup Mode: Favourite]
-[Popup Mode: Ignore fullscreen]
-[Popup Mode: Block contact]
-[Auto]
-[Favourite]
-[Block]
diff --git a/langpacks/english/Plugins/Popup.txt b/langpacks/english/Plugins/Popup.txt
new file mode 100644
index 0000000000..8d30c538a1
--- /dev/null
+++ b/langpacks/english/Plugins/Popup.txt
@@ -0,0 +1,222 @@
+#muuid {26a9125d-7863-4e01-af0e-d14ef95c5054}
+;============================================================
+;  File: Popup.dll
+;  Plugin: Popup plus
+;  Version: 2.1.1.7
+;  Authors: MPK, Merlin_de (Luca Santarelli, Victor Pavlychko)
+;============================================================
+[Provides popup notification services for different plugins.]
+;file \plugins\Popup\res\resource.rc
+[Content && Style]
+[Go to Customize > Fonts && Colors for fonts and colors options]
+[Miscellaneous]
+[Effects]
+[Live Preview]
+[Size && Position]
+[History]
+[Enable popup history]
+[Store last]
+[events]
+[Use History++ to render log]
+[Avatars]
+[Draw avatar borders]
+[Draw borders for semitransparent avatars too]
+[Round corners by]
+[pixels]
+[Avatar size:]
+[Enable avatar updates]
+[Multimonitor]
+[Start the popups in the monitor with]
+[Miranda's window]
+[the active window]
+[Transparency]
+[Enable Win 9x/Me transparency]
+[Use transparency]
+[opacity:]
+[Opaque popups under cursor]
+[Slide Popup]
+[Effect:]
+[Time (in):]
+[ms]
+[Time (out):]
+[Limit window amount to:]
+[Skins]
+[* - built-in skins]
+[Skin options]
+[Preview]
+[Download more skins]
+[Popup History]
+[Desktop]
+[Popup Area]
+[pixel(s)]
+[Distance between popups]
+[Configure popup area]
+[Close]
+[General]
+[Enable popup actions]
+[Popup Actions are those tiny buttons below notification text.]
+[Common Actions]
+[Please choose in what cases default actions should be added:]
+[Add info && menu for IM contacts only]
+[Add default actions for contacts only]
+[Don't close popups on default actions]
+[Use large icons]
+[Popup actions will be displayed as:]
+[Icons and labels below text]
+[Icons on the left]
+[Icons aligned to the right]
+[Show Actions: (requires apply)]
+[Mouse Actions Overwrite]
+[LeftButton]
+[MiddleButton]
+[RightButton]
+[Notifications]
+[General options]
+[Enable this notification]
+[Popup timeout:]
+[Left click action:]
+[Right click action:]
+[Disable when global status is...]
+[Disable when relevant protocol's status is...]
+[Colors can be configured in\r\nCustomize > Fonts && Colors]
+[More...]
+[Disable if message window is open]
+[Sec]
+[0 = Default]
+[-1 = Infinite]
+[Per-contact settings]
+[Show always]
+[Ignore fullscreen]
+[Never show]
+[Show default]
+[Default Timeout]
+[Infinite popup delay]
+[Popup delay:]
+[seconds]
+[Do not close hovered popups]
+[Dynamically resize the popups]
+[Minimum width]
+[Maximum width]
+[Position:]
+[Layout:]
+[Reorder Popups]
+[Disable when:]
+[Always (has priority)]
+[Fullscreen mode]
+[Debug]
+;file \plugins\Popup\src\actions.cpp
+[no overwrite]
+[Send message]
+[Quick reply]
+[User details]
+[Contact menu]
+[Dismiss popup]
+[Pin popup]
+[Copy to clipboard]
+[Action]
+;file \plugins\Popup\src\config.cpp
+[The Jabberwocky]
+[`Twas brillig, and the slithy toves\r\nDid gyre and gimble in the wabe:\r\nAll mimsy were the borogoves,\r\nAnd the mome raths outgrabe.\r\n\t[b][i]Lewis Carroll, 1855[/i][/b]]
+[Test preview for the popup plugin settings. This is supposed to be long enough not to fit in one line...]
+[This is a special test preview for the popup plugin settings. The text and title are quite long so you can tweak your skin and plugin settings to best fit your needs :)]
+[This is a notification message]
+[This is a warning message]
+[This is an error message]
+;file \plugins\Popup\src\effects.cpp
+[Square fading]
+;file \plugins\Popup\src\font.cpp
+[Hovered Action]
+[Clock]
+;file \plugins\Popup\src\history.cpp
+[Popup History is disabled]
+[Popup History message]
+;file \plugins\Popup\src\icons.cpp
+[Popups are enabled]
+[Popups are disabled]
+[With "favourite" overlay]
+[With "fullscreen" overlay]
+[Refresh skin list]
+[Popup Placement]
+[OK]
+[Cancel]
+[Popup Group]
+[Favorite Contact]
+[Show in Fullscreen]
+[Blocked Contact]
+[Quick Reply]
+[Pin Popup]
+[Pinned Popup]
+[Send Message]
+[User Details]
+[Contact Menu]
+[Add Contact Permanently]
+[Dismiss Popup]
+;file \plugins\Popup\src\main.cpp
+[Classes]
+[Actions]
+[Contacts]
+[Advanced]
+[Toggle Popups]
+[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
+[No effect]
+[Fade in/out]
+;file \plugins\Popup\src\opt_class.cpp
+[CLASS Plugins]
+[Ph'nglui mglw'nafh Cthulhu R'lyeh wgah'nagl fhtagn!]
+;file \plugins\Popup\src\opt_gen.cpp
+[Offline]
+[Online]
+[Invisible]
+[Away]
+[NA]
+[Occupied]
+[DND]
+[Free for chat]
+[Out to lunch]
+[On the phone]
+[Width]
+[upper left corner]
+[lower left corner]
+[lower right corner]
+[upper right corner]
+[horizontal]
+[vertical]
+[Global Status]
+[Protocol Status]
+[You cannot specify a value lower than %d and higher than %d.]
+['Reorder Popups' option is currently diabled.\r\nThis may cause misaligned popups when used with\r\navatars and text replacement (mainly NewStatusNotify).\r\n\r\nDo you want to enable popup reordering now?\r\n]
+[Popup Plus Warning]
+;file \plugins\Popup\src\opt_skins.cpp
+[Failed to register %s class.]
+[Skin preview]
+[Just take a look at this skin... ;)]
+[Show clock]
+[Drop shadow effect]
+[non rectangular]
+[Enable Aero Glass (Vista+)]
+[Use Windows colours]
+[Use advanced text render]
+[Global settings]
+[Refresh List]
+;file \plugins\Popup\src\popup_thread.cpp
+;file \plugins\Popup\src\popup_wnd2.cpp
+[Failed to GetClassInfoExW from EDIT class.]
+[Failed to register custom edit box window class.\r\n\r\ncbSize: %i\r\nstyle: %p\r\nlpfnWndProc: %i\r\ncbClsExtra: %i\r\ncbWndExtra: %i\r\nhInstance: %i\r\nhIcon: %i\r\nhCursor: %i\r\nhbrBackground: %i\r\nlpszMenuName: %s\r\nlpszClassName: %s\r\nhIconSm: %i\r\n]
+;file \plugins\Popup\src\services.cpp
+[Error]
+[Warning]
+[Notify]
+;file \plugins\Popup\src\skin.cpp
+[The skin you are trying to load is designed\r\nfor newer version of Popup Plus. And will not\r\ndisplay properly.\r\n\r\nPlease choose another skin.]
+;file \plugins\Popup\src\srmm_menu.cpp
+[Popup Mode: Auto]
+[Popup Mode: Favourite]
+[Popup Mode: Ignore fullscreen]
+[Popup Mode: Block contact]
+[Auto]
+[Favourite]
+[Block]
diff --git a/langpacks/english/Plugins/Quotes.txt b/langpacks/english/Plugins/Quotes.txt
index 6478a658c8..24a01bfb44 100644
--- a/langpacks/english/Plugins/Quotes.txt
+++ b/langpacks/english/Plugins/Quotes.txt
@@ -120,13 +120,6 @@
 [Last Year]
 [User-Defined]
 ;file \plugins\Quotes\src\QuoteInfoDlg.cpp
-;file \plugins\Quotes\src\QuotesProviderBase.cpp
-[Log Files (*.txt,*.log)]
-[Enter integer value]
-[Enter log file name.]
-[Enter log file format.]
-[Enter history format.]
-[Enter popup window format.]
 ;file \plugins\Quotes\src\QuotesProviderDukasCopy.cpp
 ;file \plugins\Quotes\src\QuotesProviderGoogle.cpp
 [Error occurred during html parsing.]
@@ -156,3 +149,9 @@
 [Previous Close]
 [Change]
 ;file \plugins\Quotes\src\SettingsDlg.cpp
+[Log Files (*.txt,*.log)]
+[Enter integer value]
+[Enter log file name.]
+[Enter log file format.]
+[Enter history format.]
+[Enter popup window format.]
-- 
cgit v1.2.3