diff options
Diffstat (limited to 'tools')
13 files changed, 12 insertions, 57 deletions
diff --git a/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt b/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt index 74e3b67c2f..dc17baaa7f 100644 --- a/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt +++ b/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt @@ -89,7 +89,6 @@ Plugins\mobilestate.dll Plugins\mradio.dll Plugins\msg_export.dll Plugins\msgpopup.dll -Plugins\msn.dll Plugins\mydetails.dll Plugins\new_gpg.dll Plugins\newawaysys.dll @@ -221,7 +220,6 @@ Icons\proto_metacontacts.dll Icons\proto_minecraftdynmap.dll Icons\proto_mra.dll Icons\proto_mradio.dll -Icons\proto_msn.dll Icons\proto_newsaggregator.dll Icons\proto_omegle.dll Icons\proto_sametime.dll diff --git a/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt b/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt index ad5c832047..c71cdab0d6 100644 --- a/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt +++ b/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt @@ -88,7 +88,6 @@ Plugins\mobilestate.dll Plugins\mradio.dll Plugins\msg_export.dll Plugins\msgpopup.dll -Plugins\msn.dll Plugins\mydetails.dll Plugins\new_gpg.dll Plugins\newawaysys.dll @@ -220,7 +219,6 @@ Icons\proto_metacontacts.dll Icons\proto_minecraftdynmap.dll Icons\proto_mra.dll Icons\proto_mradio.dll -Icons\proto_msn.dll Icons\proto_newsaggregator.dll Icons\proto_omegle.dll Icons\proto_sametime.dll diff --git a/tools/build_scripts/bin15/z3_PackArchives.txt b/tools/build_scripts/bin15/z3_PackArchives.txt index 6557460174..1bb9dd3496 100644 --- a/tools/build_scripts/bin15/z3_PackArchives.txt +++ b/tools/build_scripts/bin15/z3_PackArchives.txt @@ -79,7 +79,6 @@ Icons\Proto_IRC.dll Icons\Proto_Jabber.dll Icons\Proto_MetaContacts.dll Icons\Proto_MRA.dll -Icons\Proto_MSN.dll Icons\TabSRMM_icons.dll Icons\Toolbar_icons.dll Icons\xStatus_Jabber.dll @@ -95,7 +94,6 @@ Plugins\ICQ.dll Plugins\Import.dll Plugins\IRC.dll Plugins\Jabber.dll -Plugins\MSN.dll Plugins\PluginUpdater.dll Plugins\TabSRMM.dll Plugins\TopToolBar.dll diff --git a/tools/build_scripts/z2_PackPluginUpdater.bat b/tools/build_scripts/z2_PackPluginUpdater.bat index 69ef395d7f..46ef0be9a3 100644 --- a/tools/build_scripts/z2_PackPluginUpdater.bat +++ b/tools/build_scripts/z2_PackPluginUpdater.bat @@ -63,7 +63,6 @@ for /f %%a in ('dir plugins\*.dll /B /L') do ( if /I "%%a"=="MinecraftDynmap.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_MinecraftDynmap.dll") if /I "%%a"=="MirLua.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Scripts\*.dll" "Libs\lua*.dll") if /I "%%a"=="mRadio.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_mRadio.dll" "Plugins\BASS\*.dll") - if /I "%%a"=="MSN.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_MSN.dll") if /I "%%a"=="NewsAggregator.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_NewsAggregator.dll") if /I "%%a"=="NotifyAnything.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "SendLog*.exe") if /I "%%a"=="Nudge.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Sounds\nudge.wav") diff --git a/tools/installer_ng/Common/Files/Settings/autoexec_sounds.ini b/tools/installer_ng/Common/Files/Settings/autoexec_sounds.ini index 2068f76f99..739d75cfac 100644 --- a/tools/installer_ng/Common/Files/Settings/autoexec_sounds.ini +++ b/tools/installer_ng/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/Common/Files/Settings/mirandaboot_default.ini b/tools/installer_ng/Common/Files/Settings/mirandaboot_default.ini index f882174693..5949e904e6 100644 --- a/tools/installer_ng/Common/Files/Settings/mirandaboot_default.ini +++ b/tools/installer_ng/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/Common/Files/Settings/mirandaboot_portable.ini b/tools/installer_ng/Common/Files/Settings/mirandaboot_portable.ini index 783deba013..8f3fd4474e 100644 --- a/tools/installer_ng/Common/Files/Settings/mirandaboot_portable.ini +++ b/tools/installer_ng/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/MirandaNG.iss b/tools/installer_ng/MirandaNG.iss index 71c02a7812..4b3919eeeb 100644 --- a/tools/installer_ng/MirandaNG.iss +++ b/tools/installer_ng/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()
@@ -150,7 +148,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
@@ -219,7 +216,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
@@ -247,7 +243,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.
@@ -293,7 +288,6 @@ ru.GG=Протокол GG ru.Icq=Протокол ICQ
ru.Irc=Протокол IRC
ru.Jabber=Протокол Jabber
-ru.Msn=Протокол MSN
ru.Clists=Списки контактов
ru.StdClist=Список контактов StdClist
ru.BlindClist=Список контактов для слабовидящих
@@ -321,7 +315,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=Список контактов для слабовидящих. Вспомогательные программы для людей с проблемами зрения могут легко "считать" информацию пользователю.
@@ -367,7 +360,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é)
@@ -395,7 +387,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.
@@ -441,7 +432,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
@@ -469,7 +459,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.
@@ -515,7 +504,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)
@@ -543,7 +531,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.
@@ -612,7 +599,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;
@@ -825,7 +812,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');
@@ -913,7 +899,6 @@ begin ExpandConstant('{cm:ProtocolsICQDescription}') + ';' +
ExpandConstant('{cm:ProtocolsIRCDescription}') + ';' +
ExpandConstant('{cm:ProtocolsJabberDescription}') + ';' +
- ExpandConstant('{cm:ProtocolsMSNDescription}') + ';' +
ExpandConstant('{cm:ClistsDescription}') + ';' +
ExpandConstant('{cm:StdClistDescription}') + ';' +
ExpandConstant('{cm:BlindClistDescription}') + ';' +
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}') + ';' +
diff --git a/tools/lpgen/lpgen.js b/tools/lpgen/lpgen.js index 2d997c5d47..87a017ed20 100644 --- a/tools/lpgen/lpgen.js +++ b/tools/lpgen/lpgen.js @@ -493,7 +493,7 @@ function ParseRCFile(FileTextVar, array) { //now make a job, till end of matching regexp
while ((string = find.exec(FileTextVar)) !== null) {
// check for some garbage like "List1","Tab1" etc. in *.rc files, we do not need this.
- onestring = string[2].replace(/^(((List|Tab|Tree|Spin|Custom|Slider|DateTimePicker|Radio|Check|HotKey|Progress)\d)|(whiterect|IndSndList|&?[Oo][Kk]|APOP|BBS|Bing|CTCP|DCC|Foodnetwork|Google|Google Talk|GPG|Hotmail|ICQ|ICQ Corp|ID|IP|ISDN|iTunes|Jabber|JID|Miranda|Miranda NG|mRadio|MSN|NickServ|OSD|OTR|PCS|PGP|S.ms|SASL|SMS|SSL|Steam|Steam Guard|Tox|Twitter|Yahoo|Winamp \(\*\)|Windows|X400|&\w)|(%.(.*%)?))$/g, "");
+ onestring = string[2].replace(/^(((List|Tab|Tree|Spin|Custom|Slider|DateTimePicker|Radio|Check|HotKey|Progress)\d)|(whiterect|IndSndList|&?[Oo][Kk]|APOP|BBS|Bing|CTCP|DCC|Foodnetwork|Google|Google Talk|GPG|Hotmail|ICQ|ICQ Corp|ID|IP|ISDN|iTunes|Jabber|JID|Miranda|Miranda NG|mRadio|NickServ|OSD|OTR|PCS|PGP|S.ms|SASL|SMS|SSL|Steam|Steam Guard|Tox|Twitter|Yahoo|Winamp \(\*\)|Windows|X400|&\w)|(%.(.*%)?))$/g, "");
// ignore some popup menu craps
if (string[1] == "POPUP" && onestring.match(/^([a-zA-Z ]*(menu|context|popup(?!s)))|([A-Z][a-z]+([A-Z][a-z]*)+)|(new item)$/g)) {
continue;
@@ -552,7 +552,7 @@ function ParseSourceFile(FileTextVar, array) { //filter _T() function results
function filter_T(string) {
//filter for exact matched strings
- var filter1 = /^(&?[Oo][Kk]|APOP|BBS|Bing|CTCP|DCC|Foodnetwork|Google|GPG|Hotmail|ICQ|ICQ Corp|ID|IP|ISDN|iTunes|Jabber|JID|Miranda|MirandaG15|Miranda NG|mRadio|MSN|NickServ|OSD|OTR|PCS|PGP|SASL|SMS|SSL|SteamID|Steam Guard|Tox|Twitter|Yahoo|Winamp \(\*\)|Windows|X400)$/g;
+ var filter1 = /^(&?[Oo][Kk]|APOP|BBS|Bing|CTCP|DCC|Foodnetwork|Google|GPG|Hotmail|ICQ|ICQ Corp|ID|IP|ISDN|iTunes|Jabber|JID|Miranda|MirandaG15|Miranda NG|mRadio|NickServ|OSD|OTR|PCS|PGP|SASL|SMS|SSL|SteamID|Steam Guard|Tox|Twitter|Yahoo|Winamp \(\*\)|Windows|X400)$/g;
//filter string starting from following words
var filter2 = /^(SOFTWARE\\|SYSTEM\\|http|ftp|UTF-|utf-|TEXT|EXE|exe|txt|css|html|dat[^a]|txt|MS\x20|CLVM|TM_|CLCB|CLSID|CLUI|HKEY_|MButton|BUTTON|WindowClass|MHeader|RichEdit|RICHEDIT|STATIC|EDIT|CList|listbox|LISTBOX|combobox|COMBOBOX|TitleB|std\w|iso-|windows-|<div|<html|<img|<span|<hr|<a\x20|<table|<td|miranda_|kernel32|user32|muc|pubsub|shlwapi|Tahoma|NBRichEdit|CreatePopup|&?[Oo][Kk]|<\/|<\w>|\w\\\w|urn\:|<\?xml|<\!|h\d|\.!\.).*$/g;
//filter string ending with following words
|