merge of lanpack changes

25 files changed, 51 insertions, 48 deletions

diff --git a/langpacks/english/Plugins/AutoShutdown.txt b/langpacks/english/Plugins/AutoShutdown.txt
index 1769d073a7..2ada857004 100644
--- a/langpacks/english/Plugins/AutoShutdown.txt
+++ b/langpacks/english/Plugins/AutoShutdown.txt
@@ -41,7 +41,6 @@
 [&Unpause countdown]

 [&Pause countdown]

 [&Cancel countdown]

-[AutoShutdown]

 [Countdown on frame]

 [Background]

 [Progress bar]

@@ -98,6 +97,8 @@
 [Sets all protocols to offline and closes all RAS connections.]

 [Alerts]

 [Automatic shutdown countdown]

+;file \plugins\AutoShutdown\src\stdafx.h

+[AutoShutdown]

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

 [Toggle automatic shutdown]

 [Main]

diff --git a/langpacks/english/Plugins/AvatarHistory.txt b/langpacks/english/Plugins/AvatarHistory.txt
index 1fa3a93304..4b938c43e1 100644
--- a/langpacks/english/Plugins/AvatarHistory.txt
+++ b/langpacks/english/Plugins/AvatarHistory.txt
@@ -69,7 +69,6 @@
 [Contact changed avatar]

 [Contact removed avatar]

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

-[History]

 [Avatar overlay]

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

 [Do nothing]

@@ -78,6 +77,7 @@
 [Show contact history]

 [Test contact]

 [Test description]

+[History]

 [Avatar]

 [Popups]

 [Avatar change]

diff --git a/langpacks/english/Plugins/ConnectionNotify.txt b/langpacks/english/Plugins/ConnectionNotify.txt
index bb16b1448f..4d9b86a3e3 100644
--- a/langpacks/english/Plugins/ConnectionNotify.txt
+++ b/langpacks/english/Plugins/ConnectionNotify.txt
@@ -1,7 +1,7 @@
 #muuid {4bb5b4aa-c364-4f23-9746-d5b708a286a5}

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

 ;  File: ConnectionNotify.dll

-;  Plugin: ConnectionNotify

+;  Plugin: Connection Notify

 ;  Version: 0.1.0.5

 ;  Authors: MaKaR

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

diff --git a/langpacks/english/Plugins/CrashDumper.txt b/langpacks/english/Plugins/CrashDumper.txt
index 7d1b686a0b..08591855ba 100644
--- a/langpacks/english/Plugins/CrashDumper.txt
+++ b/langpacks/english/Plugins/CrashDumper.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: CrashDumper.dll

 ;  Plugin: Crash dumper

-;  Version: 0.1.0.1

+;  Version: 0.1.0.2

 ;  Authors: borkra

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

 [Crash Dumper and Version Information for Miranda NG.]

diff --git a/langpacks/english/Plugins/Exchange.txt b/langpacks/english/Plugins/Exchange.txt
index 62e87319a4..b0ec6b2fde 100644
--- a/langpacks/english/Plugins/Exchange.txt
+++ b/langpacks/english/Plugins/Exchange.txt
@@ -1,7 +1,7 @@
 #muuid {2fd0df15-7098-41ce-aa92-ff621806e38b}

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

 ;  File: Exchange.dll

-;  Plugin: Exchange

+;  Plugin: Exchange notifier plugin

 ;  Version: 0.1.3.4

 ;  Authors: Cristian Libotean, Attila Vajda, MaKaR (NG)

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

diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 137a4f51b2..86c84f58f1 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Facebook.dll

 ;  Plugin: Facebook

-;  Version: 0.4.1.2

+;  Version: 0.4.1.3

 ;  Authors: Michal Zelinka, Robert Pösel

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

 [Facebook protocol support for Miranda NG.]

diff --git a/langpacks/english/Plugins/HwHotKeys.txt b/langpacks/english/Plugins/HwHotKeys.txt
index ddd02f04ec..cee8c0f42b 100644
--- a/langpacks/english/Plugins/HwHotKeys.txt
+++ b/langpacks/english/Plugins/HwHotKeys.txt
@@ -5,8 +5,8 @@
 ;  Version: 1.0.0.6

 ;  Authors: Eugene f2065

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

-;file \plugins\HwHotKeys\res\HwHotKeys.rc

 [Allows you to assign expanded multimedia keys (only for PS/2 keyboards).]

+;file \plugins\HwHotKeys\res\HwHotKeys.rc

 [Close Miranda]

 [Assign]

 [Clear]

diff --git a/langpacks/english/Plugins/IEHistory.txt b/langpacks/english/Plugins/IEHistory.txt
index 691cf2ecaa..27a79a3285 100644
--- a/langpacks/english/Plugins/IEHistory.txt
+++ b/langpacks/english/Plugins/IEHistory.txt
@@ -1,7 +1,7 @@
 #muuid {2f093b88-f389-44f1-9e2a-37c29194203a}

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

 ;  File: IEHistory.dll

-;  Plugin: IEHistory

+;  Plugin: IE History

 ;  Version: 0.0.1.7

 ;  Authors: Cristian Libotean, Miranda NG team

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

diff --git a/langpacks/english/Plugins/IRC.txt b/langpacks/english/Plugins/IRC.txt
index 656cd14a96..16151d3696 100644
--- a/langpacks/english/Plugins/IRC.txt
+++ b/langpacks/english/Plugins/IRC.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: IRC.dll

 ;  Plugin: IRC protocol

-;  Version: 0.95.7.2

+;  Version: 0.95.8.1

 ;  Authors: Miranda team

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

 [Internet Relay Chat (IRC) protocol support for Miranda NG.]

diff --git a/langpacks/english/Plugins/Import.txt b/langpacks/english/Plugins/Import.txt
index fd62e6b724..8f8c3aed4f 100644
--- a/langpacks/english/Plugins/Import.txt
+++ b/langpacks/english/Plugins/Import.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Import.dll

 ;  Plugin: Import contacts and messages

-;  Version: 0.95.8.6

+;  Version: 0.95.9.1

 ;  Authors: Miranda team

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

 [Imports contacts and messages from another Miranda profile or from an external program.]

diff --git a/langpacks/english/Plugins/LinkList.txt b/langpacks/english/Plugins/LinkList.txt
index 22ea9aa280..b504d8ca42 100644
--- a/langpacks/english/Plugins/LinkList.txt
+++ b/langpacks/english/Plugins/LinkList.txt
@@ -68,11 +68,11 @@
 [Search filter]

 [no settings]

 ;file \plugins\HistoryLinkListPlus\src\linklist.cpp

-[&Create Linklist]

 [History]

 [Processing history...]

 [Could not create window!]

 [Could not allocate memory!]

+[&Create Linklist]

 ;file \plugins\HistoryLinkListPlus\src\linklist_dlg.cpp

 [Linklist plugin]

 ;file \plugins\HistoryLinkListPlus\src\linklist_fct.cpp

diff --git a/langpacks/english/Plugins/MirLua.txt b/langpacks/english/Plugins/MirLua.txt
index 884f0d5017..dcab09a783 100644
--- a/langpacks/english/Plugins/MirLua.txt
+++ b/langpacks/english/Plugins/MirLua.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: MirLua.dll

 ;  Plugin: MirLua

-;  Version: 0.11.8.8

+;  Version: 0.11.8.9

 ;  Authors: Miranda NG team

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

 [Extends Miranda NG functionality with Lua scripts.]

@@ -12,15 +12,15 @@
 [Popup on script error]

 [General]

 [Popup on obsolete methods]

-;file \plugins\MirLua\src\main.cpp

-[Services]

-[C libs folder]

-[Scripts folder]

-;file \plugins\MirLua\src\mlua_icons.cpp

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

 [Script]

 [Loaded]

 [Failed]

 [Open]

 [Reload]

-;file \plugins\MirLua\src\mlua_options.cpp

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

 [Common scripts]

+[Services]

+;file \plugins\MirLua\src\plugin.cpp

+[C libs folder]

+[Scripts folder]

diff --git a/langpacks/english/Plugins/MyDetails.txt b/langpacks/english/Plugins/MyDetails.txt
index 78c7c78b5d..609390543d 100644
--- a/langpacks/english/Plugins/MyDetails.txt
+++ b/langpacks/english/Plugins/MyDetails.txt
@@ -79,8 +79,8 @@
 ;file \plugins\MyDetails\src\mydetails.cpp

 [Previous account]

 [Next account]

-[Contact list]

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

+[Contact list]

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

 [Set my nickname for %s]

 [Set my status message for %s]

diff --git a/langpacks/english/Plugins/NewXstatusNotify.txt b/langpacks/english/Plugins/NewXstatusNotify.txt
index 379d16f554..9324d73241 100644
--- a/langpacks/english/Plugins/NewXstatusNotify.txt
+++ b/langpacks/english/Plugins/NewXstatusNotify.txt
@@ -121,6 +121,8 @@
 ;file \plugins\NewXstatusNotify\src\indsnd.h

 [(default sound)]

 ;file \plugins\NewXstatusNotify\src\main.cpp

+[Notification enabled]

+[Notification disabled]

 [<no status message>]

 [Contact]

 [<unknown>]

@@ -179,10 +181,8 @@
 [Extra status message removed]

 [Enable status notification]

 [Disable status notification]

-[Notification enabled]

-[Notification disabled]

-[New Status Notify]

 [Toggle status notification]

+[New Status Notify]

 [Status change]

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

 [All Files]

diff --git a/langpacks/english/Plugins/Nudge.txt b/langpacks/english/Plugins/Nudge.txt
index cf683d7e14..3361d056ab 100644
--- a/langpacks/english/Plugins/Nudge.txt
+++ b/langpacks/english/Plugins/Nudge.txt
@@ -43,14 +43,14 @@
 [Static]

 [Shaking Message Window Options]

 ;file \plugins\Nudge\src\main.cpp

+[Nudge as Default]

 [You are not allowed to send too much nudge (only 1 each %d sec, %d sec left)]

+[Show Nudge]

+[Nudge for %s]

 [Nudge]

 [Default Nudge]

-[Nudge as Default]

 [Send nudge]

 [Send &nudge]

-[Show Nudge]

-[Nudge for %s]

 ;file \plugins\Nudge\src\nudge.cpp

 [You received a nudge]

 [You sent a nudge]

diff --git a/langpacks/english/Plugins/PluginUpdater.txt b/langpacks/english/Plugins/PluginUpdater.txt
index 77995d64ba..3be9e42987 100644
--- a/langpacks/english/Plugins/PluginUpdater.txt
+++ b/langpacks/english/Plugins/PluginUpdater.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: PluginUpdater.dll

 ;  Plugin: Plugin updater

-;  Version: 0.1.2.5

+;  Version: 0.2.0.1

 ;  Authors: Mataes, George Hazan

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

 [Installs and updates plugins and other Miranda NG components.]

diff --git a/langpacks/english/Plugins/Popup.txt b/langpacks/english/Plugins/Popup.txt
index 2bf2646251..3e9165a6ac 100644
--- a/langpacks/english/Plugins/Popup.txt
+++ b/langpacks/english/Plugins/Popup.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Popup.dll

 ;  Plugin: Popup plus

-;  Version: 2.1.1.12

+;  Version: 2.1.1.14

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

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

 [Provides popup notification services for different plugins.]

@@ -213,8 +213,6 @@
 [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

 [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

 [Auto]

 [Favorite]

diff --git a/langpacks/english/Plugins/QuickContacts.txt b/langpacks/english/Plugins/QuickContacts.txt
index da2086cbc0..cd4a3c9f92 100644
--- a/langpacks/english/Plugins/QuickContacts.txt
+++ b/langpacks/english/Plugins/QuickContacts.txt
@@ -21,15 +21,16 @@
 [But keep subcontacts of protocols in above list if meta is hidden]

 [Enter username:]

 [Show all contacts (Ctrl+A)]

-;file \plugins\QuickContacts\src\options.cpp

-[Quick Contacts]

-;file \plugins\QuickContacts\src\quickcontacts.cpp

-[Open dialog]

+;file \plugins\QuickContacts\src\dialog.cpp

+[Show all contacts]

+[Send message]

 [Send file]

 [Send URL]

 [Open user info]

 [Open history]

 [Open contact menu]

-[Show all contacts]

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

+[Quick Contacts]

+;file \plugins\QuickContacts\src\quickcontacts.cpp

+[Open dialog]

 [Quick Contacts...]

-[Send message]

diff --git a/langpacks/english/Plugins/RemovePersonalSettings.txt b/langpacks/english/Plugins/RemovePersonalSettings.txt
index 0c3b22e4d5..eb131ce3b7 100644
--- a/langpacks/english/Plugins/RemovePersonalSettings.txt
+++ b/langpacks/english/Plugins/RemovePersonalSettings.txt
@@ -7,9 +7,9 @@
 ;============================================================

 [Remove personal settings to allow you to send a profile to other user(s) without sending personal data.]

 ;file \plugins\RemovePersonalSettings\src\rps.cpp

-[Remove Personal Settings...]

 [Configuration file could not be found!]

 [Settings are deleted now.]

+[Remove Personal Settings...]

 ;file \plugins\RemovePersonalSettings\src\stdafx.h

 [All your personal settings will be erased!\nMake sure you are running this from a copy of your profile (and not over the original one).\nRunning this will erase files/folders under Miranda main folder.\n\nAre you sure you want to remove all your personal settings?\n\n(You cannot say that I don't told you about the risks :P)]

 [Remove Personal Settings]

diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index f638f96664..c01ea961b9 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -14,12 +14,13 @@
 [Save size and location for each contact]

 [Minimize on send]

 [Hide windows on close]

-[Send message on 'Enter']

-[Send message on double 'Enter']

 [Remember unsent messages]

 [Delete temporary contacts on closing]

 [Show warning when message has not been received after]

 [seconds]

+[Send message on 'Enter']

+[Send message on double 'Enter']

+[Send message on 'Ctrl+Enter']

 [Tabs]

 [Enable tabs]

 [Always show tab bar]

@@ -43,6 +44,7 @@
 [inactive]

 [Min input area size]

 [lines]

+[You can use embedded variables here: %name% for contact's name, %status% for its status, %statusmsg% for its status message and %account% for its account's name]

 [Message window event log]

 [Enable IEView]

 [Show icons]

diff --git a/langpacks/english/Plugins/SimpleStatusMsg.txt b/langpacks/english/Plugins/SimpleStatusMsg.txt
index bae2f4f1d6..d0c6490fa1 100644
--- a/langpacks/english/Plugins/SimpleStatusMsg.txt
+++ b/langpacks/english/Plugins/SimpleStatusMsg.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: SimpleStatusMsg.dll

 ;  Plugin: Simple status message

-;  Version: 1.9.0.6

+;  Version: 1.9.0.7

 ;  Authors: Bartosz 'Dezeath' Białek, Harven

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

 [Provides a simple way to set status and away messages.]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index dd4fa35fc5..b281fa0d08 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -907,7 +907,6 @@
 [Advanced with avatars, vertical orientation]

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

 [This version of TabSRMM requires Windows 2000 or later.]

-[TabSRMM message (%s)]

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

 [Previews not available when using History++ plugin for message log display.]

 [%d unread]

@@ -1029,6 +1028,7 @@
 [Force IEView]

 [Set messaging options for %s]

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

+[TabSRMM message (%s)]

 [Important release notes|A test warning message]

 [Icon pack version check|The installed icon pack is outdated and might be incompatible with TabSRMM version 3.\n\n\\b1Missing or misplaced icons are possible issues with the currently installed icon pack.\\b0]

 [Edit user notes|You are editing the user notes. Click the button again or use the hotkey (default: Alt-N) to save the notes and return to normal messaging mode]

diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index ddb671699b..e5c7382987 100644
--- a/langpacks/english/Plugins/VKontakte.txt
+++ b/langpacks/english/Plugins/VKontakte.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: VKontakte.dll

 ;  Plugin: VKontakte protocol

-;  Version: 0.1.4.5

+;  Version: 0.1.5.2

 ;  Authors: Miranda NG team

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

 [VKontakte protocol support for Miranda NG.]

diff --git a/langpacks/english/Plugins/WhoUsesMyFiles.txt b/langpacks/english/Plugins/WhoUsesMyFiles.txt
index 60306dba79..1d3c874f4c 100644
--- a/langpacks/english/Plugins/WhoUsesMyFiles.txt
+++ b/langpacks/english/Plugins/WhoUsesMyFiles.txt
@@ -30,6 +30,13 @@
 [Alert computer name with username]

 [Disabled options will be available in the next version]

 [Show current connections]

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

+[Popup plugin not found!]

+[Error]

+[Common Dialog Error 0x%lx]

+[Not implemented yet...]

+[Who uses my files]

+[Services]

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

 [User]

 [File]

@@ -39,14 +46,8 @@
 [Error memory allocation]

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

 [Error creating menu]

-[Popup plugin not found!]

-[Error]

 [Enable WUMF popups]

 [Disable WUMF popups]

-[Common Dialog Error 0x%lx]

-[Not implemented yet...]

 [Show connections list]

-[Who uses my files]

-[Services]

 [Popups]

 [WUMF: Show connections]

diff --git a/langpacks/english/Plugins/ZeroNotify.txt b/langpacks/english/Plugins/ZeroNotify.txt
index ef877647b8..74f6b9932b 100644
--- a/langpacks/english/Plugins/ZeroNotify.txt
+++ b/langpacks/english/Plugins/ZeroNotify.txt
@@ -11,7 +11,7 @@
 [No CList blink when:]

 [No SysTray blink when:]

 [Hide the "toggle sound" menu item (requires restart of Miranda)]

-;file \plugins\ZeroNotification\src\main.cpp

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

 [Zero Notifications]

 [Plugins]

 ;file \plugins\ZeroNotification\src\stdafx.h