NewAwaySysMod is back

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

10 files changed, 257 insertions, 4 deletions

diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln
index 7e75bdb572..bdb701bc17 100644
--- a/bin10/mir_full.sln
+++ b/bin10/mir_full.sln
@@ -406,6 +406,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirandaG15", "..\plugins\Mi
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RemovePersonalSettings", "..\plugins\RemovePersonalSettings\rps_10.vcxproj", "{0D3EF7C4-B99C-E87E-D0D8-C6E003B7EB65}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewAwaySys", "..\plugins\NewAwaySysMod\NewAwaySys_10.vcxproj", "{6A516E27-AC50-5374-756B-A1558DB2EFA9}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -1806,6 +1808,14 @@ Global
 		{0D3EF7C4-B99C-E87E-D0D8-C6E003B7EB65}.Release|Win32.Build.0 = Release|Win32

 		{0D3EF7C4-B99C-E87E-D0D8-C6E003B7EB65}.Release|x64.ActiveCfg = Release|x64

 		{0D3EF7C4-B99C-E87E-D0D8-C6E003B7EB65}.Release|x64.Build.0 = Release|x64

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Debug|Win32.ActiveCfg = Debug|Win32

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Debug|Win32.Build.0 = Debug|Win32

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Debug|x64.ActiveCfg = Debug|x64

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Debug|x64.Build.0 = Debug|x64

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Release|Win32.ActiveCfg = Release|Win32

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Release|Win32.Build.0 = Release|Win32

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Release|x64.ActiveCfg = Release|x64

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln
index 6fc17af7c3..ebdd9f9bc4 100644
--- a/bin10/mir_full_pro.sln
+++ b/bin10/mir_full_pro.sln
@@ -440,6 +440,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirandaG15", "..\plugins\Mi
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RemovePersonalSettings", "..\plugins\RemovePersonalSettings\rps_10.vcxproj", "{0D3EF7C4-B99C-E87E-D0D8-C6E003B7EB65}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewAwaySys", "..\plugins\NewAwaySysMod\NewAwaySys_10.vcxproj", "{6A516E27-AC50-5374-756B-A1558DB2EFA9}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -1840,6 +1842,14 @@ Global
 		{0D3EF7C4-B99C-E87E-D0D8-C6E003B7EB65}.Release|Win32.Build.0 = Release|Win32

 		{0D3EF7C4-B99C-E87E-D0D8-C6E003B7EB65}.Release|x64.ActiveCfg = Release|x64

 		{0D3EF7C4-B99C-E87E-D0D8-C6E003B7EB65}.Release|x64.Build.0 = Release|x64

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Debug|Win32.ActiveCfg = Debug|Win32

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Debug|Win32.Build.0 = Debug|Win32

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Debug|x64.ActiveCfg = Debug|x64

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Debug|x64.Build.0 = Debug|x64

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Release|Win32.ActiveCfg = Release|Win32

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Release|Win32.Build.0 = Release|Win32

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Release|x64.ActiveCfg = Release|x64

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

@@ -2004,6 +2014,7 @@ Global
 		{2AD2FF74-06E1-4BD8-984A-526F3C6315B3} = {74981ED5-7A15-4C46-AECF-DA229AF9CC9D}

 		{D09881C7-E189-49AD-919E-F64355F8EFD0} = {74981ED5-7A15-4C46-AECF-DA229AF9CC9D}

 		{10F78F26-2B20-4158-869F-CB29533B4C2C} = {74981ED5-7A15-4C46-AECF-DA229AF9CC9D}

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9} = {74981ED5-7A15-4C46-AECF-DA229AF9CC9D}

 		{9DE1F0B0-B9D1-4681-82E7-13CC3E047445} = {8BAD5E57-11F5-4C44-8FFA-D589B658421B}

 		{07137F45-8B5F-4561-BEC8-B883E9123785} = {8BAD5E57-11F5-4C44-8FFA-D589B658421B}

 		{850EC838-0EAD-45EB-6F1B-16DC90DCE18D} = {8BAD5E57-11F5-4C44-8FFA-D589B658421B}

diff --git a/bin11/mir_full.sln b/bin11/mir_full.sln
index 6522cc2e3d..af0cb9b4c2 100644
--- a/bin11/mir_full.sln
+++ b/bin11/mir_full.sln
@@ -406,6 +406,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirandaG15", "..\plugins\Mi
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RemovePersonalSettings", "..\plugins\RemovePersonalSettings\rps_11.vcxproj", "{0D3EF7C4-B99C-E87E-D0D8-C6E003B7EB65}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewAwaySys", "..\plugins\NewAwaySysMod\NewAwaySys_11.vcxproj", "{6A516E27-AC50-5374-756B-A1558DB2EFA9}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -1806,6 +1808,14 @@ Global
 		{0D3EF7C4-B99C-E87E-D0D8-C6E003B7EB65}.Release|Win32.Build.0 = Release|Win32

 		{0D3EF7C4-B99C-E87E-D0D8-C6E003B7EB65}.Release|x64.ActiveCfg = Release|x64

 		{0D3EF7C4-B99C-E87E-D0D8-C6E003B7EB65}.Release|x64.Build.0 = Release|x64

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Debug|Win32.ActiveCfg = Debug|Win32

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Debug|Win32.Build.0 = Debug|Win32

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Debug|x64.ActiveCfg = Debug|x64

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Debug|x64.Build.0 = Debug|x64

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Release|Win32.ActiveCfg = Release|Win32

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Release|Win32.Build.0 = Release|Win32

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Release|x64.ActiveCfg = Release|x64

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/bin12/mir_full.sln b/bin12/mir_full.sln
index da2b501910..915ed1ce97 100644
--- a/bin12/mir_full.sln
+++ b/bin12/mir_full.sln
@@ -408,6 +408,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirandaG15", "..\plugins\Mi
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RemovePersonalSettings", "..\plugins\RemovePersonalSettings\rps_12.vcxproj", "{0D3EF7C4-B99C-E87E-D0D8-C6E003B7EB65}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewAwaySys", "..\plugins\NewAwaySysMod\NewAwaySys_12.vcxproj", "{6A516E27-AC50-5374-756B-A1558DB2EFA9}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -1808,6 +1810,14 @@ Global
 		{0D3EF7C4-B99C-E87E-D0D8-C6E003B7EB65}.Release|Win32.Build.0 = Release|Win32

 		{0D3EF7C4-B99C-E87E-D0D8-C6E003B7EB65}.Release|x64.ActiveCfg = Release|x64

 		{0D3EF7C4-B99C-E87E-D0D8-C6E003B7EB65}.Release|x64.Build.0 = Release|x64

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Debug|Win32.ActiveCfg = Debug|Win32

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Debug|Win32.Build.0 = Debug|Win32

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Debug|x64.ActiveCfg = Debug|x64

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Debug|x64.Build.0 = Debug|x64

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Release|Win32.ActiveCfg = Release|Win32

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Release|Win32.Build.0 = Release|Win32

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Release|x64.ActiveCfg = Release|x64

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/langpacks/english/Plugins/AdvancedAutoAway.txt b/langpacks/english/Plugins/AdvancedAutoAway.txt
index 089288b414..18e0939d52 100644
--- a/langpacks/english/Plugins/AdvancedAutoAway.txt
+++ b/langpacks/english/Plugins/AdvancedAutoAway.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: AdvancedAutoAway.dll

 ;  Plugin: Advanced Auto Away

-;  Version: 0.8.1.0

+;  Version: 0.8.1.1

 ;  Authors: P Boon

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

 [An Auto Away module with some more options than the original.]

diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 7b90b148a8..0762ab76c8 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -104,7 +104,7 @@
 [photos]

 [a photo]

 [User sent you %s:]

-[User sent you an unsupported attachment. Open your browser to actually see it.]

+[User sent you an unsupported attachment. Open your browser to see it.]

 [Message read: %s by %s]

 [Message read: %s]

 [This message is no longer available, because it was marked as abusive or spam.]

diff --git a/langpacks/english/Plugins/KeepStatus.txt b/langpacks/english/Plugins/KeepStatus.txt
index fc25f740d5..7eb036a26a 100644
--- a/langpacks/english/Plugins/KeepStatus.txt
+++ b/langpacks/english/Plugins/KeepStatus.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: KeepStatus.dll

 ;  Plugin: Keep status

-;  Version: 0.9.0.1

+;  Version: 0.9.0.2

 ;  Authors: P Boon

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

 [KeepStatus, A connection checker, for use with (or without) StartupStatus and/or AdvancedAutoAway.]

diff --git a/langpacks/english/Plugins/NewAwaySys.txt b/langpacks/english/Plugins/NewAwaySys.txt
new file mode 100644
index 0000000000..69606f3d7b
--- /dev/null
+++ b/langpacks/english/Plugins/NewAwaySys.txt
@@ -0,0 +1,212 @@
+#muuid {b2dd9270-ce5e-11df-bd3d-0800200c9a66}

+;============================================================

+;  File: NewAwaySys.dll

+;  Plugin: New Away System Mod

+;  Version: 0.4.0.1

+;  Authors: NightFox; Deathdemon; XF007; Goblineye Entertainment

+;============================================================

+[New Away System Mod plugin for Miranda IM.]

+;file \plugins\NewAwaySysMod\res\NewAwaySys.rc

+[Popup notification]

+[Popup text format]

+[Preview]

+[V]

+[%extratext% is your status message]

+[Click action]

+[On left click]

+[On right click]

+[Delay]

+[Sec]

+[0 = Default]

+[-1 = Infinite]

+[Colours]

+[Background]

+[Use default]

+[Text]

+[Only notify when:]

+[On&line]

+[&Away]

+[&NA]

+[Occ&upied]

+[&DND]

+[&Free for chat]

+[&Other]

+[Log to a file only when popup notification for a contact is enabled]

+[Enable autoreply]

+[On event...]

+[Don't reply to ICQ contacts]

+[Don't reply when i'm invisible to the contact]

+[Save autoreply to the history]

+[Reply only when Idle]

+[Reply only when contact's message window is closed]

+[Send maximum]

+[times (-1=infinite)]

+[Reset this counter also when i just change my status text\n(when status icon remains the same)]

+[Disable autoreply when...]

+[&Invisible]

+[On the &Phone]

+[Out to &Lunch]

+[Autoreply format:]

+[OK]

+[&Variables]

+[Se&ttings]

+[Ignore requests]

+[Send an autoreply]

+[&Delete]

+[New &Category]

+[Save As &New]

+[&Save]

+[Title:]

+[Use this message as default for]

+[New message]

+[New category]

+[Delete]

+[Statuses messages:]

+[Configure autoaway]

+[Wait]

+[seconds before closing the status message dialog (-1=don't close)]

+[Store]

+[most recent messages (0=disable)]

+[Store for each status separately]

+[Use default...]

+[Use the most recent message]

+[Use the default message]

+[Reset per-protocol messages when changing global status]

+[Store protocol messages for each status separately]

+[Store protocol autoreply settings for each status separately]

+[Remember last message used for a contact...]

+[Store contact autoreply/ignore settings for each status separately]

+[Enable contact menu items]

+[Use protocol specific nick for %nas_mynick%]

+[Update status messages for non-ICQ protocols every]

+[seconds]

+[Don't show the message dialog for]

+[%s Message for %s]

+[Retrieving %s message...]

+[&Cancel]

+[Notify of requests]

+[Don't notify of requests]

+[Autoreply on]

+[Autoreply off]

+[Don't send status message]

+[Note: these settings are applied to all status modes at once.]

+[Means the setting is different for different status modes / contacts]

+[Set away message window options]

+[Show predefined &messages]

+[Show &contacts]

+[Save default window settings &automatically]

+[&Save current window settings as default]

+[Disable parsing of status messages by Variables plugin]

+[Create new &message]

+[Create new &category]

+[&Rename]

+[Set as &default for]

+;file \plugins\NewAwaySysMod\src\AwayOpt.cpp

+[Create new message]

+[Create new category]

+[Open Variables help dialog]

+[Your most recent status messages are placed in this category. It's not recommended to put your messages manually here, as they'll be replaced by your recent messages.]

+[You can put your frequently used and favorite messages in this category.]

+[Windows]

+[Miranda]

+[When this checkbox is ticked, NewAwaySys counts "send times" starting from the last status message change, even if status mode didn't change.\nWhen the checkbox isn't ticked, "send times" are counted from last status mode change (i.e. disabled state is more restrictive).]

+[Message]

+[URL]

+[File]

+[** All contacts **]

+[** Not-on-list contacts **]

+[Statuses messages]

+[Main options]

+[Autoreply]

+[Contacts]

+[Predefined messages]

+[Recent messages]

+[Gone fragging]

+[Creepy]

+[Your master, %nas_mynick%, has been %nas_statdesc% since the day that is only known as ?nas_awaysince_date(dddd)... When he gets back, i'll tell him you dropped by...]

+[Default messages]

+[Online]

+[Yep, i'm here.]

+[Away]

+[Been gone since %nas_awaysince_time%, will be back later.]

+[NA]

+[Give it up, i'm not in!]

+[Occupied]

+[Not right now.]

+[DND]

+[Give a guy some peace, would ya?]

+[Free for chat]

+[i'm a chatbot!]

+[Invisible]

+[i'm hiding from the mafia.]

+[On the phone]

+[i've been on the phone since %nas_awaysince_time%, give me a sec!]

+[Out to lunch]

+[Been having ?ifgreater(?ctime(H),2,?ifgreater(?ctime(H),10,?ifgreater(?ctime(H),16,supper,dinner),breakfast),supper) since %nas_awaysince_time%.]

+;file \plugins\NewAwaySysMod\src\AwaySys.cpp

+[Toggle On]

+[Toggle Off]

+[) read your ]

+[ message:\r\n]

+[Set %s message for the contact]

+[Re&ad %s Message]

+[Toggle autoreply on/off]

+[Toggle autoreply off]

+[Toggle autoreply on]

+[New Away System]

+[Enable autoreply when you are %s]

+["Store contact autoreply/ignore settings for each status separately" is enabled, so this setting is per-contact AND per-status.]

+[Don't send status message when you are %s]

+[Ignore status message requests from this contact and don't send an autoreply.\r\n"Store contact autoreply/ignore settings for each status separately" is enabled, so this setting is per-contact AND per-status.]

+[Ignore status message requests from this contact and don't send an autoreply]

+[Stranger]

+[%d hours]

+[%d minutes]

+[%d seconds]

+[New Away System\t(x)\tAway since time in default format; ?nas_awaysince_time(x) in format x]

+[New Away System\t(x)\tAway since date in default format; ?nas_awaysince_date(x) in format x]

+[New Away System\tStatus description]

+[New Away System\tYour nick for current protocol]

+[New Away System\tNumber of status message requests from the contact]

+[New Away System\tNumber of messages from the contact]

+[New Away System\tTime passed until request]

+[New Away System\t(x)\tReturns one of your predefined messages by its title: ?nas_predefinedmessage(creepy)]

+[New Away System\tCurrent protocol name]

+[Read status message]

+[Set status message]

+[On]

+[Off]

+[Use the default setting]

+[NewAwaySys: Incoming status message request]

+;file \plugins\NewAwaySysMod\src\Common.h

+[Miranda IM autoreply >\r\n%extratext%]

+[extended status]

+[Away System]

+[Status]

+[Popups]

+[Variables plugin is not installed]

+;file \plugins\NewAwaySysMod\src\MsgTree.cpp

+[You've made changes to multiple Message trees at a time.\r\nDo you want to leave changes in "]

+[" dialog?\r\nPress Yes to leave changes in this dialog, or No to discard its changes and save changes of the other Message tree instead.]

+[Do you really want to delete this category with its messages?]

+[Do you really want to delete this message?]

+;file \plugins\NewAwaySysMod\src\Notification.cpp

+[Error #%d]

+[Can't open log file ]

+;file \plugins\NewAwaySysMod\src\ReadAwayMsg.cpp

+[&Close]

+;file \plugins\NewAwaySysMod\src\SetAwayMsg.cpp

+[Save, replacing the selected message]

+[Save as a new message]

+[Show settings menu]

+[Don't send the status message to selected contact(s)]

+[Send an autoreply to selected contact(s)]

+[Apply]

+[Do you want to apply the message?]

+[Set message for]

+[Statuses]

+[message for]

+[for]

+[available autoreply only]

+[all accounts]

+[Closing in %d]

diff --git a/langpacks/english/Plugins/StartupStatus.txt b/langpacks/english/Plugins/StartupStatus.txt
index cf3c0127d5..1498f5baf7 100644
--- a/langpacks/english/Plugins/StartupStatus.txt
+++ b/langpacks/english/Plugins/StartupStatus.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: StartupStatus.dll

 ;  Plugin: StartupStatus

-;  Version: 0.8.0.45

+;  Version: 0.8.0.46

 ;  Authors: P Boon

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

 [StartupStatus, allows you to define the status Miranda should set on startup, configurable per protocol.]

diff --git a/langpacks/russian/Deprecated/NewAwaySys.txt b/langpacks/russian/Plugins/NewAwaySys.txt
index 8ad6cf8d8c..8ad6cf8d8c 100644
--- a/langpacks/russian/Deprecated/NewAwaySys.txt
+++ b/langpacks/russian/Plugins/NewAwaySys.txt