From 24c0dd3e35ae97183a994cc6f25fc78d08da1311 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sun, 2 Nov 2014 12:12:42 +0000 Subject: reverted MSN removal (too early) git-svn-id: http://svn.miranda-ng.org/main/trunk@10901 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- tools/installer_ng/MirandaNG.iss | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) (limited to 'tools/installer_ng') diff --git a/tools/installer_ng/MirandaNG.iss b/tools/installer_ng/MirandaNG.iss index 810d79bba8..c3a8464fa1 100644 --- a/tools/installer_ng/MirandaNG.iss +++ b/tools/installer_ng/MirandaNG.iss @@ -64,6 +64,7 @@ Source: "Files\Icons\Proto_ICQ.dll"; DestDir: "{app}\Icons"; Components: protoco Source: "Files\Icons\Proto_IRC.dll"; DestDir: "{app}\Icons"; Components: protocols\irc; Flags: ignoreversion; AfterInstall: ShowPercent() 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_MSN.dll"; DestDir: "{app}\Icons"; Components: protocols\msn; Flags: ignoreversion; AfterInstall: ShowPercent() Source: "Files\Icons\Proto_Yahoo.dll"; DestDir: "{app}\Icons"; Components: protocols\yahoo; Flags: ignoreversion; AfterInstall: ShowPercent() Source: "Files\Icons\xStatus_ICQ.dll"; DestDir: "{app}\Icons"; Components: protocols\icq; Flags: ignoreversion; AfterInstall: ShowPercent() Source: "Files\Icons\xStatus_Jabber.dll"; DestDir: "{app}\Icons"; Components: protocols\jabber; Flags: ignoreversion; AfterInstall: ShowPercent() @@ -115,6 +116,7 @@ Source: "Files\Plugins\GG.dll"; DestDir: "{app}\Plugins"; Components: protocols\ Source: "Files\Plugins\ICQ.dll"; DestDir: "{app}\Plugins"; Components: protocols\icq; Flags: ignoreversion; AfterInstall: ShowPercent() 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\Plugins\MSN.dll"; DestDir: "{app}\Plugins"; Components: protocols\msn; Flags: ignoreversion; AfterInstall: ShowPercent() Source: "Files\Plugins\Yahoo.dll"; DestDir: "{app}\Plugins"; Components: protocols\yahoo; Flags: ignoreversion; AfterInstall: ShowPercent() ; Clists @@ -135,7 +137,7 @@ Source: "Files\Plugins\Dbx_mmap.dll"; DestDir: "{app}\Plugins"; Components: dbx_ Source: "Files\Settings\mirandaboot_default.ini"; DestDir: "{app}"; Components: program; DestName: "mirandaboot.ini"; Check: IsDefault(); Flags: ignoreversion onlyifdoesntexist; AfterInstall: ShowPercent() Source: "Files\Settings\mirandaboot_portable.ini"; DestDir: "{app}"; Components: program; DestName: "mirandaboot.ini"; Check: IsPortable(); Flags: ignoreversion onlyifdoesntexist; AfterInstall: ShowPercent() Source: "Files\Settings\autoexec_sounds.ini"; DestDir: "{app}"; Components: sounds; Flags: ignoreversion; AfterInstall: ShowPercent() - + ; Installer add-ons Source: "Installer\ISWin7.dll"; Flags: dontcopy Source: "Installer\descctrl.dll"; Flags: dontcopy @@ -151,6 +153,7 @@ 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: "protocols\yahoo"; Description: "{cm:Yahoo}"; 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 @@ -223,6 +226,7 @@ en.GG=GG protocol en.Icq=ICQ protocol en.Irc=IRC protocol en.Jabber=Jabber protocol +en.Msn=MSN protocol en.Yahoo=Yahoo protocol en.Clists=Contact lists en.StdClist=StdClist contact list @@ -252,6 +256,7 @@ 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.ProtocolsYahooDescription=Yahoo protocol support for Miranda NG. en.ClistsDescription=Contact list plugins. en.StdClistDescription=Basic contact list core module. @@ -299,6 +304,7 @@ ru.GG=Протокол GG ru.Icq=Протокол ICQ ru.Irc=Протокол IRC ru.Jabber=Протокол Jabber +ru.Msn=Протокол MSN ru.Yahoo=Протокол Yahoo ru.Clists=Списки контактов ru.StdClist=Список контактов StdClist @@ -328,6 +334,7 @@ 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.ProtocolsYahooDescription=Поддержка протокола Yahoo в Miranda NG. ru.ClistsDescription=Плагины списков контактов. ru.StdClistDescription=Список контактов, являющийся модулем ядра, обеспечивает базовый функционал. @@ -375,6 +382,7 @@ cz.GG=GG protokol cz.Icq=ICQ protokol cz.Irc=IRC protokol cz.Jabber=Jabber protokol +cz.Msn=MSN protokol cz.Yahoo=Yahoo protokol cz.Clists=Seznamy kontaktů cz.StdClist=StdClist @@ -404,6 +412,7 @@ 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.protocolsYahooDescription=Yahoo protokol pro Mirandu NG. cz.ClistsDescription=Doplňky pro seznamy kontaktů. cz.StdClistDescription=Základní integrovaný modul pro seznam kontaktů. @@ -451,6 +460,7 @@ de.GG=GG-Protokoll de.Icq=ICQ-Protokoll de.Irc=IRC-Protokoll de.Jabber=Jabber-Protokoll +de.Msn=MSN-Protokoll de.Yahoo=Yahoo-Protokoll de.Clists=Kontaktlisten de.StdClist=Klassische Kontaktliste @@ -480,6 +490,7 @@ 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.ProtocolsYahooDescription=Yahoo-Protokollunterstützung für Miranda NG. de.ClistsDescription=Kontaktlistenplugins. de.StdClistDescription=Grundlegendes Kontaktlisten-Kernmodul. @@ -527,6 +538,7 @@ pl.GG=GG pl.Icq=ICQ pl.Irc=IRC pl.Jabber=Jabber +pl.Msn=MSN pl.Yahoo=Yahoo pl.Clists=Lista kontaktów pl.StdClist=Lista klasyczna (StdClist) @@ -556,6 +568,7 @@ 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.ProtocolsYahooDescription=Zapewnia obsługę protokołu Yahoo. pl.ClistsDescription=Wtyczki listy kontaktów. pl.StdClistDescription=Podstawowy moduł listy kontaktów zawarty w rdzeniu. @@ -842,6 +855,7 @@ begin ComponentList.Add('protocols\icq'); ComponentList.Add('protocols\irc'); ComponentList.Add('protocols\jabber'); + ComponentList.Add('protocols\msn'); ComponentList.Add('protocols\yahoo'); ComponentList.Add('clists'); ComponentList.Add('clists\stdclist'); @@ -900,15 +914,15 @@ begin if CurPageID = wpSelectComponents then begin if ActiveLanguage = 'en' then - WizardForm.ComponentsList.Checked[25]:= True + WizardForm.ComponentsList.Checked[26]:= True else if ActiveLanguage = 'ru' then - WizardForm.ComponentsList.Checked[21]:= True - else if ActiveLanguage = 'cz' then WizardForm.ComponentsList.Checked[22]:= True - else if ActiveLanguage = 'pl' then + else if ActiveLanguage = 'cz' then WizardForm.ComponentsList.Checked[23]:= True + else if ActiveLanguage = 'pl' then + WizardForm.ComponentsList.Checked[24]:= True else if ActiveLanguage = 'de' then - WizardForm.ComponentsList.Checked[24]:= True; + WizardForm.ComponentsList.Checked[25]:= True; end; end; @@ -931,6 +945,7 @@ begin ExpandConstant('{cm:ProtocolsICQDescription}') + ';' + ExpandConstant('{cm:ProtocolsIRCDescription}') + ';' + ExpandConstant('{cm:ProtocolsJabberDescription}') + ';' + + ExpandConstant('{cm:ProtocolsMSNDescription}') + ';' + ExpandConstant('{cm:ProtocolsYahooDescription}') + ';' + ExpandConstant('{cm:ClistsDescription}') + ';' + ExpandConstant('{cm:StdClistDescription}') + ';' + -- cgit v1.2.3