From 18b9a2dbffe096b379dc0a67c05bd42fe3c77900 Mon Sep 17 00:00:00 2001 From: watcher Date: Tue, 11 Oct 2016 18:37:28 +0300 Subject: add revision for GIT --- build/make_ver.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/build/make_ver.bat b/build/make_ver.bat index 8f72cf52ee..6c3aa09b41 100644 --- a/build/make_ver.bat +++ b/build/make_ver.bat @@ -2,6 +2,7 @@ cd /d %~dp0 for /F "tokens=2,3" %%i in (..\include\m_version.h) do if "%%i"=="MIRANDA_VERSION_FILEVERSION" (set OldVer=%%j) +for /F %%i in ('git rev-list --count HEAD') do set Revision=%%i for /F %%i in ('svnversion build.no') do set Revision=%%i REM Fix building not-svn repository (e.g., Git mirror) -- cgit v1.2.3 From 33be1a8ba3af0792efc55c63174fa18121854680 Mon Sep 17 00:00:00 2001 From: watcher Date: Tue, 11 Oct 2016 16:27:04 +0000 Subject: temporary removal of svn version gen --- build/make_ver.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/make_ver.bat b/build/make_ver.bat index 6c3aa09b41..40a391351e 100644 --- a/build/make_ver.bat +++ b/build/make_ver.bat @@ -3,7 +3,7 @@ cd /d %~dp0 for /F "tokens=2,3" %%i in (..\include\m_version.h) do if "%%i"=="MIRANDA_VERSION_FILEVERSION" (set OldVer=%%j) for /F %%i in ('git rev-list --count HEAD') do set Revision=%%i -for /F %%i in ('svnversion build.no') do set Revision=%%i +rem for /F %%i in ('svnversion build.no') do set Revision=%%i REM Fix building not-svn repository (e.g., Git mirror) if "%Revision:~0,11%" == "Unversioned" (set Revision=0) -- cgit v1.2.3 From 3578a31c501bd727be01498cde1c8a5263544bdf Mon Sep 17 00:00:00 2001 From: watcher Date: Tue, 11 Oct 2016 20:51:51 +0300 Subject: Readme update --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 892acf04a8..9f2a275fbb 100644 --- a/README.md +++ b/README.md @@ -42,8 +42,7 @@ Miranda NG is published under the [GNU GPL license][2]. - [Official web site](http://miranda-ng.org/) - [Forums](http://forum.miranda-ng.org/) - [Community Wiki](http://wiki.miranda-ng.org/) -- [Main SVN repository](http://svn.miranda-ng.org/) -- [Read-only Git mirror](https://github.com/miranda-ng/miranda-ng) +- [Main Git repository](https://github.com/miranda-ng/miranda-ng) ## Miranda NG Communities ## -- cgit v1.2.3 From 25daf758e8402a822ad2871e72bf1843443ce7f1 Mon Sep 17 00:00:00 2001 From: watcher Date: Tue, 11 Oct 2016 21:53:20 +0300 Subject: Yahoo leftovers removed --- bin10/mir_icons.sln | 12 +----------- bin12/mir_icons.sln | 12 +----------- bin14/mir_icons.sln | 16 +++------------- tools/installer_ng/MirandaNG.iss | 25 +++++-------------------- tools/installer_ng_stable/MirandaNG.iss | 25 +++++-------------------- 5 files changed, 15 insertions(+), 75 deletions(-) diff --git a/bin10/mir_icons.sln b/bin10/mir_icons.sln index bf3110efec..90e356f409 100644 --- a/bin10/mir_icons.sln +++ b/bin10/mir_icons.sln @@ -40,8 +40,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_Jabber", "..\protoc EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_MRA", "..\protocols\MRA\xstatus_mra\xStatus_MRA.vcxproj", "{5B84781D-F1C3-4535-99B7-B84B6C9BCF15}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Yahoo", "..\protocols\Yahoo\proto_yahoo\Proto_Yahoo.vcxproj", "{BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HistoryPP_icons", "..\plugins\HistoryPlusPlus\historypp_icons\HistoryPP_icons.vcxproj", "{B2E0D5C5-D418-4962-812A-FBC5C7FFC4B6}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Omegle", "..\protocols\Omegle\proto_omegle\omegle_icons.vcxproj", "{C5AB34D2-15F5-4CBA-8F42-DB48A4E52910}" @@ -62,7 +60,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Weather", "..\plugins EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_YAMN", "..\plugins\YAMN\proto_yamn\proto_YAMN.vcxproj", "{C1CDB82C-6BBF-496E-88F4-CC57E60B0CA9}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Fingerprint Icons", "..\plugins\FingerprintNG\iconpacks\fp_icons.vcxproj", "{7F854B13-37EA-4956-BAEE-9715AE9F4579}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Fp_icons", "..\plugins\FingerprintNG\iconpacks\fp_icons.vcxproj", "{7F854B13-37EA-4956-BAEE-9715AE9F4579}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_VKontakte", "..\protocols\VKontakte\proto_vkontakte\Proto_VKontakte.vcxproj", "{5F8495EF-0765-4E03-905D-639BDBF05B4F}" EndProject @@ -252,14 +250,6 @@ Global {5B84781D-F1C3-4535-99B7-B84B6C9BCF15}.Release|Win32.Build.0 = Release|Win32 {5B84781D-F1C3-4535-99B7-B84B6C9BCF15}.Release|x64.ActiveCfg = Release|x64 {5B84781D-F1C3-4535-99B7-B84B6C9BCF15}.Release|x64.Build.0 = Release|x64 - {BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Debug|Win32.ActiveCfg = Debug|Win32 - {BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Debug|Win32.Build.0 = Debug|Win32 - {BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Debug|x64.ActiveCfg = Debug|x64 - {BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Debug|x64.Build.0 = Debug|x64 - {BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Release|Win32.ActiveCfg = Release|Win32 - {BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Release|Win32.Build.0 = Release|Win32 - {BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Release|x64.ActiveCfg = Release|x64 - {BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Release|x64.Build.0 = Release|x64 {B2E0D5C5-D418-4962-812A-FBC5C7FFC4B6}.Debug|Win32.ActiveCfg = Debug|Win32 {B2E0D5C5-D418-4962-812A-FBC5C7FFC4B6}.Debug|Win32.Build.0 = Debug|Win32 {B2E0D5C5-D418-4962-812A-FBC5C7FFC4B6}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/bin12/mir_icons.sln b/bin12/mir_icons.sln index aca834d9e7..8ec2ccad09 100644 --- a/bin12/mir_icons.sln +++ b/bin12/mir_icons.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Express 2013 for Windows Desktop -VisualStudioVersion = 12.0.31101.0 +VisualStudioVersion = 12.0.40629.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Toolbar_icons", "..\plugins\Clist_modern\icons_pack\Toolbar_icons.vcxproj", "{796B43EF-DACE-4145-8571-31886F45A2C0}" EndProject @@ -40,8 +40,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_ICQ", "..\protocols EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_Jabber", "..\protocols\JabberG\jabber_xstatus\xStatus_Jabber.vcxproj", "{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Yahoo", "..\protocols\Yahoo\proto_yahoo\Proto_Yahoo.vcxproj", "{BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HistoryPP_icons", "..\plugins\HistoryPlusPlus\historypp_icons\HistoryPP_icons.vcxproj", "{B2E0D5C5-D418-4962-812A-FBC5C7FFC4B6}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Omegle", "..\protocols\Omegle\proto_omegle\omegle_icons.vcxproj", "{C5AB34D2-15F5-4CBA-8F42-DB48A4E52910}" @@ -246,14 +244,6 @@ Global {6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Release|Win32.Build.0 = Release|Win32 {6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Release|x64.ActiveCfg = Release|x64 {6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Release|x64.Build.0 = Release|x64 - {BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Debug|Win32.ActiveCfg = Debug|Win32 - {BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Debug|Win32.Build.0 = Debug|Win32 - {BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Debug|x64.ActiveCfg = Debug|x64 - {BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Debug|x64.Build.0 = Debug|x64 - {BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Release|Win32.ActiveCfg = Release|Win32 - {BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Release|Win32.Build.0 = Release|Win32 - {BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Release|x64.ActiveCfg = Release|x64 - {BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Release|x64.Build.0 = Release|x64 {B2E0D5C5-D418-4962-812A-FBC5C7FFC4B6}.Debug|Win32.ActiveCfg = Debug|Win32 {B2E0D5C5-D418-4962-812A-FBC5C7FFC4B6}.Debug|Win32.Build.0 = Debug|Win32 {B2E0D5C5-D418-4962-812A-FBC5C7FFC4B6}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/bin14/mir_icons.sln b/bin14/mir_icons.sln index 7aa73dce37..ed8df17f19 100644 --- a/bin14/mir_icons.sln +++ b/bin14/mir_icons.sln @@ -1,6 +1,6 @@ -Microsoft Visual Studio Solution File, Format Version 14.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Express 14 for Windows Desktop +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Toolbar_icons", "..\plugins\Clist_modern\icons_pack\Toolbar_icons.vcxproj", "{796B43EF-DACE-4145-8571-31886F45A2C0}" EndProject @@ -40,8 +40,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_ICQ", "..\protocols EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_Jabber", "..\protocols\JabberG\jabber_xstatus\xStatus_Jabber.vcxproj", "{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Yahoo", "..\protocols\Yahoo\proto_yahoo\Proto_Yahoo.vcxproj", "{BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HistoryPP_icons", "..\plugins\HistoryPlusPlus\historypp_icons\HistoryPP_icons.vcxproj", "{B2E0D5C5-D418-4962-812A-FBC5C7FFC4B6}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Omegle", "..\protocols\Omegle\proto_omegle\omegle_icons.vcxproj", "{C5AB34D2-15F5-4CBA-8F42-DB48A4E52910}" @@ -246,14 +244,6 @@ Global {6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Release|Win32.Build.0 = Release|Win32 {6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Release|x64.ActiveCfg = Release|x64 {6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Release|x64.Build.0 = Release|x64 - {BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Debug|Win32.ActiveCfg = Debug|Win32 - {BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Debug|Win32.Build.0 = Debug|Win32 - {BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Debug|x64.ActiveCfg = Debug|x64 - {BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Debug|x64.Build.0 = Debug|x64 - {BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Release|Win32.ActiveCfg = Release|Win32 - {BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Release|Win32.Build.0 = Release|Win32 - {BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Release|x64.ActiveCfg = Release|x64 - {BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Release|x64.Build.0 = Release|x64 {B2E0D5C5-D418-4962-812A-FBC5C7FFC4B6}.Debug|Win32.ActiveCfg = Debug|Win32 {B2E0D5C5-D418-4962-812A-FBC5C7FFC4B6}.Debug|Win32.Build.0 = Debug|Win32 {B2E0D5C5-D418-4962-812A-FBC5C7FFC4B6}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/tools/installer_ng/MirandaNG.iss b/tools/installer_ng/MirandaNG.iss index d0b4e51eac..8508a3cb96 100644 --- a/tools/installer_ng/MirandaNG.iss +++ b/tools/installer_ng/MirandaNG.iss @@ -65,7 +65,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_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() Source: "Files\Icons\TabSRMM_icons.dll"; DestDir: "{app}\Icons"; Components: messagewin\tabsrmm; Flags: ignoreversion; AfterInstall: ShowPercent() @@ -120,7 +119,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\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 Source: "Files\Plugins\Clist_blind.dll"; DestDir: "{app}\Plugins"; Components: clicts\blind; Flags: ignoreversion; AfterInstall: ShowPercent() @@ -157,7 +155,6 @@ 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 Name: "clicts\blind"; Description: "{cm:BlindClist}"; Types: custom; Flags: exclusive @@ -230,7 +227,6 @@ 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 en.BlindClist=Contact list for blind folks @@ -260,7 +256,6 @@ 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. 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. @@ -308,7 +303,6 @@ ru.Icq=Протокол ICQ ru.Irc=Протокол IRC ru.Jabber=Протокол Jabber ru.Msn=Протокол MSN -ru.Yahoo=Протокол Yahoo ru.Clists=Списки контактов ru.StdClist=Список контактов StdClist ru.BlindClist=Список контактов для слабовидящих @@ -338,7 +332,6 @@ ru.ProtocolsICQDescription=Поддержка протокола ICQ в Miranda 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=Список контактов, являющийся модулем ядра, обеспечивает базовый функционал. ru.BlindClistDescription=Список контактов для слабовидящих. Вспомогательные программы для людей с проблемами зрения могут легко "считать" информацию пользователю. @@ -386,7 +379,6 @@ 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 cz.BlindClist=Clist_blind (pro nevidomé) @@ -416,7 +408,6 @@ 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ů. 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. @@ -464,7 +455,6 @@ 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 de.BlindClist=Kontaktliste für Blinde @@ -494,7 +484,6 @@ 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. 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. @@ -542,7 +531,6 @@ 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) pl.BlindClist=Dla niewidomych (Blind) @@ -572,7 +560,6 @@ 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. 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. @@ -859,7 +846,6 @@ begin ComponentList.Add('protocols\irc'); ComponentList.Add('protocols\jabber'); ComponentList.Add('protocols\msn'); - ComponentList.Add('protocols\yahoo'); ComponentList.Add('clists'); ComponentList.Add('clists\stdclist'); ComponentList.Add('clists\blind'); @@ -917,15 +903,15 @@ begin if CurPageID = wpSelectComponents then begin if ActiveLanguage = 'en' then - WizardForm.ComponentsList.Checked[26]:= True + WizardForm.ComponentsList.Checked[25]:= True else if ActiveLanguage = 'ru' then - WizardForm.ComponentsList.Checked[22]:= True + WizardForm.ComponentsList.Checked[21]:= True else if ActiveLanguage = 'cz' then - WizardForm.ComponentsList.Checked[23]:= True + WizardForm.ComponentsList.Checked[22]:= True else if ActiveLanguage = 'pl' then - WizardForm.ComponentsList.Checked[24]:= True + WizardForm.ComponentsList.Checked[23]:= True else if ActiveLanguage = 'de' then - WizardForm.ComponentsList.Checked[25]:= True; + WizardForm.ComponentsList.Checked[24]:= True; end; end; @@ -949,7 +935,6 @@ begin ExpandConstant('{cm:ProtocolsIRCDescription}') + ';' + ExpandConstant('{cm:ProtocolsJabberDescription}') + ';' + ExpandConstant('{cm:ProtocolsMSNDescription}') + ';' + - ExpandConstant('{cm:ProtocolsYahooDescription}') + ';' + ExpandConstant('{cm:ClistsDescription}') + ';' + ExpandConstant('{cm:StdClistDescription}') + ';' + ExpandConstant('{cm:BlindClistDescription}') + ';' + diff --git a/tools/installer_ng_stable/MirandaNG.iss b/tools/installer_ng_stable/MirandaNG.iss index 9bff839404..2008cc707d 100644 --- a/tools/installer_ng_stable/MirandaNG.iss +++ b/tools/installer_ng_stable/MirandaNG.iss @@ -65,7 +65,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_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() Source: "Files\Icons\TabSRMM_icons.dll"; DestDir: "{app}\Icons"; Components: messagewin\tabsrmm; Flags: ignoreversion; AfterInstall: ShowPercent() @@ -120,7 +119,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\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 Source: "Files\Plugins\Clist_blind.dll"; DestDir: "{app}\Plugins"; Components: clicts\blind; Flags: ignoreversion; AfterInstall: ShowPercent() @@ -157,7 +155,6 @@ 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 Name: "clicts\blind"; Description: "{cm:BlindClist}"; Types: custom; Flags: exclusive @@ -230,7 +227,6 @@ 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 en.BlindClist=Contact list for blind folks @@ -260,7 +256,6 @@ 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. 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. @@ -308,7 +303,6 @@ ru.Icq=Протокол ICQ ru.Irc=Протокол IRC ru.Jabber=Протокол Jabber ru.Msn=Протокол MSN -ru.Yahoo=Протокол Yahoo ru.Clists=Списки контактов ru.StdClist=Список контактов StdClist ru.BlindClist=Список контактов для слабовидящих @@ -338,7 +332,6 @@ ru.ProtocolsICQDescription=Поддержка протокола ICQ в Miranda 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=Список контактов, являющийся модулем ядра, обеспечивает базовый функционал. ru.BlindClistDescription=Список контактов для слабовидящих. Вспомогательные программы для людей с проблемами зрения могут легко "считать" информацию пользователю. @@ -386,7 +379,6 @@ 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 cz.BlindClist=Clist_blind (pro nevidomé) @@ -416,7 +408,6 @@ 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ů. 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. @@ -464,7 +455,6 @@ 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 de.BlindClist=Kontaktliste für Blinde @@ -494,7 +484,6 @@ 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. 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. @@ -542,7 +531,6 @@ 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) pl.BlindClist=Dla niewidomych (Blind) @@ -572,7 +560,6 @@ 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. 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. @@ -859,7 +846,6 @@ begin ComponentList.Add('protocols\irc'); ComponentList.Add('protocols\jabber'); ComponentList.Add('protocols\msn'); - ComponentList.Add('protocols\yahoo'); ComponentList.Add('clists'); ComponentList.Add('clists\stdclist'); ComponentList.Add('clists\blind'); @@ -917,15 +903,15 @@ begin if CurPageID = wpSelectComponents then begin if ActiveLanguage = 'en' then - WizardForm.ComponentsList.Checked[26]:= True + WizardForm.ComponentsList.Checked[25]:= True else if ActiveLanguage = 'ru' then - WizardForm.ComponentsList.Checked[22]:= True + WizardForm.ComponentsList.Checked[21]:= True else if ActiveLanguage = 'cz' then - WizardForm.ComponentsList.Checked[23]:= True + WizardForm.ComponentsList.Checked[22]:= True else if ActiveLanguage = 'pl' then - WizardForm.ComponentsList.Checked[24]:= True + WizardForm.ComponentsList.Checked[23]:= True else if ActiveLanguage = 'de' then - WizardForm.ComponentsList.Checked[25]:= True; + WizardForm.ComponentsList.Checked[24]:= True; end; end; @@ -949,7 +935,6 @@ begin ExpandConstant('{cm:ProtocolsIRCDescription}') + ';' + ExpandConstant('{cm:ProtocolsJabberDescription}') + ';' + ExpandConstant('{cm:ProtocolsMSNDescription}') + ';' + - ExpandConstant('{cm:ProtocolsYahooDescription}') + ';' + ExpandConstant('{cm:ClistsDescription}') + ';' + ExpandConstant('{cm:StdClistDescription}') + ';' + ExpandConstant('{cm:BlindClistDescription}') + ';' + -- cgit v1.2.3 From d800d9de29478f2d480677e5471b9baaf12f8945 Mon Sep 17 00:00:00 2001 From: aunsane Date: Tue, 11 Oct 2016 21:36:50 +0300 Subject: Extended gitignore --- .gitignore | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 079db6728d..126fa1ce39 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,11 @@ -Debug -Debug64 -Release -Release64 +Debug/ +Debug64/ +Release/ +Release64/ +ipch/ +.vs/ *.sdf *.suo *.user +*.aps +*.pdb -- cgit v1.2.3 From a816f15382dc428956d91c00f0f3a66fe044ba9d Mon Sep 17 00:00:00 2001 From: aunsane Date: Tue, 11 Oct 2016 22:06:57 +0300 Subject: Extended gitignore --- .gitignore | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 126fa1ce39..fbcab4e86b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,16 @@ +#Visual Studio files Debug/ Debug64/ Release/ Release64/ ipch/ .vs/ +*.VC.db +*.VC.VC.opendb *.sdf *.suo *.user *.aps -*.pdb + +#Miranda files +include/m_version.h -- cgit v1.2.3 From fa73e4ca6182469b4c5d4e34a667ab515585d27d Mon Sep 17 00:00:00 2001 From: dartraiden Date: Tue, 11 Oct 2016 22:13:34 +0300 Subject: delete Yahoo from readme --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 9f2a275fbb..23099eb083 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,6 @@ fast. - Twitter - VKontakte - WhatsApp -- Yahoo ## Supported Operating Systems ## -- cgit v1.2.3 From 28b6cba46073b4f8fc1b5d6787349d9dca331308 Mon Sep 17 00:00:00 2001 From: dartraiden Date: Tue, 11 Oct 2016 22:13:57 +0300 Subject: no more SVN --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 23099eb083..b82ee76fbb 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ Miranda NG is published under the [GNU GPL license][2]. - [Miranda NG on Google Plus](https://plus.google.com/u/0/112395897441053008352/) - [Miranda NG Community on Google Plus](https://plus.google.com/u/0/communities/108135091636191321308) - [Miranda NG on Twitter](https://twitter.com/MirandaNewgen) -- [Miranda NG SVN Commits on Twitter](https://twitter.com/MirandaNGcommit) +- [Miranda NG Commits on Twitter](https://twitter.com/MirandaNGcommit) [1]: http://www.miranda-im.org/ [2]: http://www.gnu.org/licenses/gpl-2.0.html -- cgit v1.2.3