From 71cfe74d3618c15feab24032c7d4cd71d77129af Mon Sep 17 00:00:00 2001 From: dartraiden Date: Tue, 7 Apr 2020 22:57:27 +0300 Subject: MSN: moved to deprecated, banned, removed support from plugins, etc --- .../Common/Files/Settings/autoexec_sounds.ini | 4 ---- .../Common/Files/Settings/mirandaboot_default.ini | 4 ++-- .../Common/Files/Settings/mirandaboot_portable.ini | 4 ++-- tools/installer_ng_stable/MirandaNG.iss | 17 +---------------- 4 files changed, 5 insertions(+), 24 deletions(-) (limited to 'tools/installer_ng_stable') diff --git a/tools/installer_ng_stable/Common/Files/Settings/autoexec_sounds.ini b/tools/installer_ng_stable/Common/Files/Settings/autoexec_sounds.ini index 2068f76f99..739d75cfac 100644 --- a/tools/installer_ng_stable/Common/Files/Settings/autoexec_sounds.ini +++ b/tools/installer_ng_stable/Common/Files/Settings/autoexec_sounds.ini @@ -36,10 +36,6 @@ NewsFeed=uSkins\Sounds\news_feed.wav Notification=uSkins\Sounds\notification.wav OtherEvent=uSkins\Sounds\other_event.wav ChatJoin=uSkins\Sounds\user_connect.wav -MSN:Alerts=uSkins\Sounds\live_alert.wav -MSN:Hotmail=uSkins\Sounds\live_mail.wav -MSN_1:Alerts=uSkins\Sounds\live_alert.wav -MSN_1:Hotmail=uSkins\Sounds\live_mail.wav UserOnline=uSkins\Sounds\online.wav UserFromOffline=uSkins\Sounds\online.wav WWIBirthdayNear=uSkins\Sounds\birthdaycoming.wav diff --git a/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_default.ini b/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_default.ini index f882174693..5949e904e6 100644 --- a/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_default.ini +++ b/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_default.ini @@ -74,8 +74,8 @@ Safe=CLC Icons CLUI CList Skin SkinSounds TopToolBar ;Unsafe ;A space-separated list of database module names that could be alter to ;malicious purposes (e.g., by faking a login server to steal passwords). -;Default: Facebook GG ICQ IRC JABBER MSN SKYPE TWITTER VKontakte -Unsafe=Facebook GG ICQ IRC JABBER MSN SKYPE TWITTER VKontakte +;Default: Facebook GG ICQ IRC JABBER SKYPE TWITTER VKontakte +Unsafe=Facebook GG ICQ IRC JABBER SKYPE TWITTER VKontakte ;OverrideSecurityFilename ;System admins may find it desirable to install settings without prompting diff --git a/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_portable.ini b/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_portable.ini index 783deba013..8f3fd4474e 100644 --- a/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_portable.ini +++ b/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_portable.ini @@ -74,8 +74,8 @@ Safe=CLC Icons CLUI CList Skin SkinSounds TopToolBar ;Unsafe ;A space-separated list of database module names that could be alter to ;malicious purposes (e.g., by faking a login server to steal passwords). -;Default: Facebook GG ICQ IRC JABBER MSN SKYPE TWITTER VKontakte -Unsafe=Facebook GG ICQ IRC JABBER MSN SKYPE TWITTER VKontakte +;Default: Facebook GG ICQ IRC JABBER SKYPE TWITTER VKontakte +Unsafe=Facebook GG ICQ IRC JABBER SKYPE TWITTER VKontakte ;OverrideSecurityFilename ;System admins may find it desirable to install settings without prompting diff --git a/tools/installer_ng_stable/MirandaNG.iss b/tools/installer_ng_stable/MirandaNG.iss index c1edfff42f..04cd4d75a3 100644 --- a/tools/installer_ng_stable/MirandaNG.iss +++ b/tools/installer_ng_stable/MirandaNG.iss @@ -59,7 +59,6 @@ Source: "Files\Icons\Proto_IRC.dll"; DestDir: "{app}\Icons"; Components: protoco Source: "Files\Icons\Proto_Jabber.dll"; DestDir: "{app}\Icons"; Components: protocols\jabber; Flags: ignoreversion; AfterInstall: ShowPercent() Source: "Files\Icons\Proto_MetaContacts.dll"; DestDir: "{app}\Icons"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent() Source: "Files\Icons\Proto_MRA.dll"; DestDir: "{app}\Icons"; Components: protocols\icq; Flags: ignoreversion; AfterInstall: ShowPercent() -Source: "Files\Icons\Proto_MSN.dll"; DestDir: "{app}\Icons"; Components: protocols\msn; Flags: ignoreversion; AfterInstall: ShowPercent() Source: "Files\Icons\xStatus_Jabber.dll"; DestDir: "{app}\Icons"; Components: protocols\jabber; Flags: ignoreversion; AfterInstall: ShowPercent() Source: "Files\Icons\TabSRMM_icons.dll"; DestDir: "{app}\Icons"; Components: messagewin\tabsrmm; Flags: ignoreversion; AfterInstall: ShowPercent() Source: "Files\Icons\Toolbar_icons.dll"; DestDir: "{app}\Icons"; Components: clicts\modern; Flags: ignoreversion; AfterInstall: ShowPercent() @@ -112,7 +111,6 @@ Source: "Files\Plugins\ICQ.dll"; DestDir: "{app}\Plugins"; Components: protocols Source: "Files\Plugins\IRC.dll"; DestDir: "{app}\Plugins"; Components: protocols\irc; Flags: ignoreversion; AfterInstall: ShowPercent() Source: "Files\Plugins\Jabber.dll"; DestDir: "{app}\Plugins"; Components: protocols\jabber; Flags: ignoreversion; AfterInstall: ShowPercent() Source: "Files\Libs\libsignal.mir"; DestDir: "{app}\Libs"; Components: protocols\jabber; Flags: ignoreversion; AfterInstall: ShowPercent() -Source: "Files\Plugins\MSN.dll"; DestDir: "{app}\Plugins"; Components: protocols\msn; Flags: ignoreversion; AfterInstall: ShowPercent() ; Clists Source: "Files\Plugins\Clist_blind.dll"; DestDir: "{app}\Plugins"; Components: clicts\blind; Flags: ignoreversion; AfterInstall: ShowPercent() @@ -149,7 +147,6 @@ Name: "protocols\gg"; Description: "{cm:Gg}"; Types: extended regular minimal Name: "protocols\icq"; Description: "{cm:Icq}"; Types: extended regular minimal Name: "protocols\irc"; Description: "{cm:Irc}"; Types: extended regular minimal Name: "protocols\jabber"; Description: "{cm:Jabber}"; Types: extended regular minimal -Name: "protocols\msn"; Description: "{cm:Msn}"; Types: extended regular minimal Name: "clists"; Description: "{cm:Clists}"; Types: extended regular minimal custom; Flags: fixed Name: "clicts\stdclist"; Description: "{cm:StdClist}"; Types: minimal; Flags: exclusive Name: "clicts\blind"; Description: "{cm:BlindClist}"; Types: custom; Flags: exclusive @@ -218,7 +215,6 @@ en.GG=GG protocol en.Icq=ICQ protocol en.Irc=IRC protocol en.Jabber=Jabber protocol -en.Msn=MSN protocol en.Clists=Contact lists en.StdClist=StdClist contact list en.BlindClist=Contact list for blind folks @@ -246,7 +242,6 @@ en.ProtocolsGGDescription=Gadu-Gadu protocol support for Miranda NG. en.ProtocolsICQDescription=ICQ (OSCAR) protocol support for Miranda NG. en.ProtocolsIRCDescription=Internet Relay Chat (IRC) protocol support for Miranda NG. en.ProtocolsJabberDescription=Open-standard communications protocol (XMPP) for message-oriented middleware based on XML. -en.ProtocolsMSNDescription=Microsoft Network (MSN) protocol support for Miranda NG. en.ClistsDescription=Contact list plugins. en.StdClistDescription=Basic contact list core module. en.BlindClistDescription=This is a contact list for blind folks. It uses a list control to show all contacts, so screen readers can "read" the clist to the user. @@ -292,7 +287,6 @@ ru.GG=Протокол GG ru.Icq=Протокол ICQ ru.Irc=Протокол IRC ru.Jabber=Протокол Jabber -ru.Msn=Протокол MSN ru.Clists=Списки контактов ru.StdClist=Список контактов StdClist ru.BlindClist=Список контактов для слабовидящих @@ -320,7 +314,6 @@ ru.ProtocolsGGDescription=Поддержка протокола Gadu-Gadu в Mir ru.ProtocolsICQDescription=Поддержка протокола ICQ в Miranda NG. ru.ProtocolsIRCDescription=Поддержка протокола Internet Relay Chat (IRC) в Miranda NG. ru.ProtocolsJabberDescription=Поддержка протокола Jabber (XMPP) в Miranda NG. Протокол основан на открытых стандартах, базирующихся на XML. -ru.ProtocolsMSNDescription=Поддержка протокола Microsoft Network (MSN) в Miranda NG. ru.ClistsDescription=Плагины списков контактов. ru.StdClistDescription=Список контактов, являющийся модулем ядра, обеспечивает базовый функционал. ru.BlindClistDescription=Список контактов для слабовидящих. Вспомогательные программы для людей с проблемами зрения могут легко "считать" информацию пользователю. @@ -366,7 +359,6 @@ cz.GG=GG protokol cz.Icq=ICQ protokol cz.Irc=IRC protokol cz.Jabber=Jabber protokol -cz.Msn=MSN protokol cz.Clists=Seznamy kontaktů cz.StdClist=StdClist cz.BlindClist=Clist_blind (pro nevidomé) @@ -394,7 +386,6 @@ cz.protocolsGGDescription=Gadu-Gadu protokol pro Mirandu NG. cz.protocolsICQDescription=ICQ (OSCAR) protokol pro Mirandu NG. cz.protocolsIRCDescription=Internet Relay Chat (IRC) protokol pro Mirandu NG. cz.protocolsJabberDescription=Otevřený komunikační protokol Jabber (XMPP) pro Mirandu NG. -cz.protocolsMSNDescription=Microsoft Network (MSN) protokol pro Mirandu NG. cz.ClistsDescription=Doplňky pro seznamy kontaktů. cz.StdClistDescription=Základní integrovaný modul pro seznam kontaktů. cz.BlindClistDescription=Seznam kontaktů pro nevidomé uživatele. Pro zobrazení kontaktů využívá jednoduchý seznam, který může být jednoduše přečten. @@ -440,7 +431,6 @@ de.GG=GG-Protokoll de.Icq=ICQ-Protokoll de.Irc=IRC-Protokoll de.Jabber=Jabber-Protokoll -de.Msn=MSN-Protokoll de.Clists=Kontaktlisten de.StdClist=Klassische Kontaktliste de.BlindClist=Kontaktliste für Blinde @@ -468,7 +458,6 @@ de.ProtocolsGGDescription=Gadu-Gadu-Protokollunterstützung für Miranda NG. de.ProtocolsICQDescription=ICQ- (OSCAR-)Protokollunterstützung für Miranda NG. de.ProtocolsIRCDescription=Internet-Relay-Chat- (IRC-)Protokollunterstützung für Miranda NG. de.ProtocolsJabberDescription=Unterstützung des Extensible Messaging and Presence Protocols (XMPP) für Miranda NG. -de.ProtocolsMSNDescription=Microsoft-Network- (MSN)-Protokollunterstützung für Miranda NG. de.ClistsDescription=Kontaktlistenplugins. de.StdClistDescription=Grundlegendes Kontaktlisten-Kernmodul. de.BlindClistDescription=Dies ist eine Kontaktliste für Blinde. Sie benutzt eine Liste, um alle Kontakte anzuzeigen, so dass Bildschirmleser die Kontaktliste dem Benutzer "vorlesen" können. @@ -514,7 +503,6 @@ pl.GG=GG pl.Icq=ICQ pl.Irc=IRC pl.Jabber=Jabber -pl.Msn=MSN pl.Clists=Lista kontaktów pl.StdClist=Lista klasyczna (StdClist) pl.BlindClist=Dla niewidomych (Blind) @@ -542,7 +530,6 @@ pl.ProtocolsGGDescription=Zapewnia obsługę protokołu Gadu-Gadu. pl.ProtocolsICQDescription=Zapewnia obsługę protokołu ICQ (OSCAR). pl.ProtocolsIRCDescription=Zapewnia obsługę protokołu Internet Relay Chat (IRC). pl.ProtocolsJabberDescription=Zapewnia obsługę protokołu Jabber/XMPP. -pl.ProtocolsMSNDescription=Zapewnia obsługę protokołu Microsoft Network (MSN). pl.ClistsDescription=Wtyczki listy kontaktów. pl.StdClistDescription=Podstawowy moduł listy kontaktów zawarty w rdzeniu. pl.BlindClistDescription=Jest to lista kontaktów dla ludzi niewidomych. Używa kontrolki listy, aby pokazać wszystkie kontakty, dzięki temu czytnik ekranu może "czytać" listę użtkownikowi. @@ -611,7 +598,7 @@ const DRIVE_RAMDISK = 6; // The drive is a RAM disk. // don't forget to increment it after adding new components! - COMPONENTS_COUNT = 20; // Index of the first language + COMPONENTS_COUNT = 19; // Index of the first language // Default installation check function IsDefault: Boolean; @@ -824,7 +811,6 @@ begin ComponentList.Add('protocols\icq'); ComponentList.Add('protocols\irc'); ComponentList.Add('protocols\jabber'); - ComponentList.Add('protocols\msn'); ComponentList.Add('clists'); ComponentList.Add('clists\stdclist'); ComponentList.Add('clists\blind'); @@ -912,7 +898,6 @@ begin ExpandConstant('{cm:ProtocolsICQDescription}') + ';' + ExpandConstant('{cm:ProtocolsIRCDescription}') + ';' + ExpandConstant('{cm:ProtocolsJabberDescription}') + ';' + - ExpandConstant('{cm:ProtocolsMSNDescription}') + ';' + ExpandConstant('{cm:ClistsDescription}') + ';' + ExpandConstant('{cm:StdClistDescription}') + ';' + ExpandConstant('{cm:BlindClistDescription}') + ';' + -- cgit v1.2.3