diff --git a/Build/Changes.txt b/Build/Changes.txt index 19035dc3f..0d3c4248b 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -2,7 +2,7 @@ = = = Notepad3 - light-weight Scintilla-based text editor for Windows = = = -= (c) Rizonesoft 2008-2019 = += (c) Rizonesoft 2008-2020 = = https://www.rizonesoft.com = = = ================================================================================ @@ -31,7 +31,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library ==================================================== -Current BETA Version 5.19.1215.(#build) (2019-12-15) +Current BETA Version 5.20.0103.(#build) (2020-01-03) ==================================================== ---------------------------------------------------- diff --git a/Build/License.txt b/Build/License.txt index 37ccb3bde..d82d7fd1f 100644 --- a/Build/License.txt +++ b/Build/License.txt @@ -1,4 +1,4 @@ -Notepad3 and MiniPath Copyright © 2008-2019 Rizonesoft, All rights reserved. +Notepad3 and MiniPath Copyright © 2008-2020 Rizonesoft, All rights reserved. https://www.rizonesoft.com Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Build/Readme.txt b/Build/Readme.txt index 268a639a7..00e527478 100644 --- a/Build/Readme.txt +++ b/Build/Readme.txt @@ -2,7 +2,7 @@ = = = Notepad3 - light-weight Scintilla-based text editor for Windows = = = -= (c) Rizonesoft 2008-2019 = += (c) Rizonesoft 2008-2020 = = https://www.rizonesoft.com = = = ================================================================================ diff --git a/Build/make_installer.bat b/Build/make_installer.bat index 678a9d08b..50307b98c 100644 --- a/Build/make_installer.bat +++ b/Build/make_installer.bat @@ -1,16 +1,16 @@ @ECHO OFF rem ****************************************************************************** -rem * -rem * Notepad2-mod -rem * -rem * make_installer.bat -rem * Batch file for building the installer for Notepad2-mod -rem * -rem * See License.txt for details about distribution and modification. -rem * -rem * (c) XhmikosR 2010-2015 -rem * https://github.com/XhmikosR/notepad2-mod -rem * +rem * * +rem * Notepad2-mod * +rem * * +rem * make_installer.bat * +rem * Batch file for building the installer for Notepad2-mod * +rem * * +rem * See License.txt for details about distribution and modification. * +rem * * +rem * (c) XhmikosR 2010-2015 * +rem * https://github.com/XhmikosR/notepad2-mod * +rem * * rem ****************************************************************************** SETLOCAL ENABLEEXTENSIONS diff --git a/Build/make_zip.bat b/Build/make_zip.bat index 52850f92f..38729948f 100644 --- a/Build/make_zip.bat +++ b/Build/make_zip.bat @@ -1,16 +1,16 @@ @ECHO OFF rem ****************************************************************************** -rem * -rem * Notepad3 -rem * -rem * make_zip.bat -rem * Batch file for creating the zip packages -rem * -rem * See License.txt for details about distribution and modification. -rem * -rem * (c) Rizonesoft 2008-2019 -rem * https://rizonesoft.com -rem * +rem * * +rem * Notepad3 * +rem * * +rem * make_zip.bat * +rem * Batch file for creating the zip packages * +rem * * +rem * See License.txt for details about distribution and modification. * +rem * * +rem * (c) Rizonesoft 2008-2020 * +rem * https://rizonesoft.com * +rem * * rem ****************************************************************************** SETLOCAL ENABLEEXTENSIONS diff --git a/Build/upx.bat b/Build/upx.bat index db527a304..ed105058c 100644 --- a/Build/upx.bat +++ b/Build/upx.bat @@ -7,8 +7,8 @@ rem * upx.bat * rem * Batch file to compress all executable files. * rem * * rem * * -rem * (c) Rizonesoft 2008-2019 * -rem * https://rizonesoft.com * +rem * (c) Rizonesoft 2008-2020 * +rem * https://rizonesoft.com * rem * * rem * * rem **************************************************************************** diff --git a/License.txt b/License.txt index 37ccb3bde..d82d7fd1f 100644 --- a/License.txt +++ b/License.txt @@ -1,4 +1,4 @@ -Notepad3 and MiniPath Copyright © 2008-2019 Rizonesoft, All rights reserved. +Notepad3 and MiniPath Copyright © 2008-2020 Rizonesoft, All rights reserved. https://www.rizonesoft.com Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Readme.txt b/Readme.txt index 268a639a7..00e527478 100644 --- a/Readme.txt +++ b/Readme.txt @@ -2,7 +2,7 @@ = = = Notepad3 - light-weight Scintilla-based text editor for Windows = = = -= (c) Rizonesoft 2008-2019 = += (c) Rizonesoft 2008-2020 = = https://www.rizonesoft.com = = = ================================================================================ diff --git a/Versions/build.txt b/Versions/build.txt index 424f6c4ac..301e95077 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -2996 +2997 diff --git a/ced/ced/_tellenc.hpp b/ced/ced/_tellenc.hpp index e4be2e4c3..b21f4bda4 100644 --- a/ced/ced/_tellenc.hpp +++ b/ced/ced/_tellenc.hpp @@ -1,14 +1,14 @@ // encoding: UTF-8 -S/****************************************************************************** +S/***************************************************************************** * * * * * Notepad3 * * * * EncTables.hpp * -* Encoding detector tables * +* Encoding detector tables * * Based on code from Notepad2, (c) Florian Balmer 1996-2011 * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/doc/Notepad3.txt b/doc/Notepad3.txt index bf834d293..aa260b655 100644 --- a/doc/Notepad3.txt +++ b/doc/Notepad3.txt @@ -3,7 +3,7 @@ = = = Notepad3 - light-weight Scintilla-based text editor for Windows = = = -= (c) Rizonesoft 2008-2019 = += (c) Rizonesoft 2008-2020 = = https://rizonesoft.com = = = = forked from Notepad2-mod = diff --git a/language/np3_af_za/strings_af_za.rc b/language/np3_af_za/strings_af_za.rc index 02fd851a1..3363b747e 100644 --- a/language/np3_af_za/strings_af_za.rc +++ b/language/np3_af_za/strings_af_za.rc @@ -332,7 +332,7 @@ IDS_MUI_ABOUT_RTF_5 "\ IDS_MUI_ABOUT_RTF_6 "\ \\cf0 \\fs20\\b1\\ul1 Notepad3 License:\\ul0\\b0\\fs18\\par\ \\cf0 \\par\ -\\cf0 Notepad3 and MiniPath Copyright \\u0169 2015-2019 Rizonesoft, All rights reserved.\\par\ +\\cf0 Notepad3 and MiniPath Copyright \\u0169 2008-2020 Rizonesoft, All rights reserved.\\par\ \\cf0 https://www.rizonesoft.com\\par\ \\cf0 \\par\ \\cf0 Redistribution and use in source and binary forms, with or without modification,\\par\ diff --git a/language/np3_be_by/strings_be_by.rc b/language/np3_be_by/strings_be_by.rc index 8de1f7187..286ef3d36 100644 --- a/language/np3_be_by/strings_be_by.rc +++ b/language/np3_be_by/strings_be_by.rc @@ -332,7 +332,7 @@ IDS_MUI_ABOUT_RTF_5 "\ IDS_MUI_ABOUT_RTF_6 "\ \\cf0 \\fs20\\b1\\ul1 \\f1\\'cb\\'b3\\'f6\\'fd\\'ed\\'e7\\'b3\\'ff\\f0 Notepad3:\\ul0\\b0\\fs18\\par\ \\cf0 \\par\ -\\cf0 Notepad3 and MiniPath Copyright \\u0169 2015-2019 Rizonesoft, All rights reserved.\\par\ +\\cf0 Notepad3 and MiniPath Copyright \\u0169 2008-2020 Rizonesoft, All rights reserved.\\par\ \\cf0 https://www.rizonesoft.com\\par\ \\cf0 \\par\ \\cf0 Redistribution and use in source and binary forms, with or without modification,\\par\ diff --git a/language/np3_de_de/strings_de_de.rc b/language/np3_de_de/strings_de_de.rc index b949ee0c2..a393d6642 100644 --- a/language/np3_de_de/strings_de_de.rc +++ b/language/np3_de_de/strings_de_de.rc @@ -331,7 +331,7 @@ IDS_MUI_ABOUT_RTF_5 "\ IDS_MUI_ABOUT_RTF_6 "\ \\cf0 \\fs20\\b1\\ul1 Notepad3 Lizenz:\\ul0\\b0\\fs18\\par\ \\cf0 \\par\ -\\cf0 Notepad3 und MiniPath Urheberrecht \\u0169 2015-2019 Rizonesoft, Alle Rechte vorbehalten.\\par\ +\\cf0 Notepad3 und MiniPath Urheberrecht \\u0169 2008-2020 Rizonesoft, Alle Rechte vorbehalten.\\par\ \\cf0 https://www.rizonesoft.com\\par\ \\cf0 \\par\ \\cf0 Weiterverbreitung und Verwendung in nichtkompilierter oder kompilierter Form,\\par\ diff --git a/language/np3_en_gb/strings_en_gb.rc b/language/np3_en_gb/strings_en_gb.rc index 3695e07e4..f21e2af3c 100644 --- a/language/np3_en_gb/strings_en_gb.rc +++ b/language/np3_en_gb/strings_en_gb.rc @@ -331,7 +331,7 @@ IDS_MUI_ABOUT_RTF_5 "\ IDS_MUI_ABOUT_RTF_6 "\ \\cf0 \\fs20\\b1\\ul1 Notepad3 Licence:\\ul0\\b0\\fs18\\par\ \\cf0 \\par\ -\\cf0 Notepad3 and MiniPath Copyright \\u0169 2015-2019 Rizonesoft, All rights reserved.\\par\ +\\cf0 Notepad3 and MiniPath Copyright \\u0169 2008-2020 Rizonesoft, All rights reserved.\\par\ \\cf0 https://www.rizonesoft.com\\par\ \\cf0 \\par\ \\cf0 Redistribution and use in source and binary forms, with or without modification,\\par\ diff --git a/language/np3_en_us/strings_en_us.rc b/language/np3_en_us/strings_en_us.rc index 7f9d75c4a..ce8cb5af0 100644 --- a/language/np3_en_us/strings_en_us.rc +++ b/language/np3_en_us/strings_en_us.rc @@ -331,7 +331,7 @@ IDS_MUI_ABOUT_RTF_5 "\ IDS_MUI_ABOUT_RTF_6 "\ \\cf0 \\fs20\\b1\\ul1 Notepad3 Licence:\\ul0\\b0\\fs18\\par\ \\cf0 \\par\ -\\cf0 Notepad3 and MiniPath Copyright \\u0169 2015-2019 Rizonesoft, All rights reserved.\\par\ +\\cf0 Notepad3 and MiniPath Copyright \\u0169 2008-2020 Rizonesoft, All rights reserved.\\par\ \\cf0 https://www.rizonesoft.com\\par\ \\cf0 \\par\ \\cf0 Redistribution and use in source and binary forms, with or without modification,\\par\ diff --git a/language/np3_es_es/strings_es_es.rc b/language/np3_es_es/strings_es_es.rc index fc007d003..b78fea225 100644 --- a/language/np3_es_es/strings_es_es.rc +++ b/language/np3_es_es/strings_es_es.rc @@ -331,7 +331,7 @@ IDS_MUI_ABOUT_RTF_5 "\ IDS_MUI_ABOUT_RTF_6 "\ \\cf0 \\fs20\\b1\\ul1 Licencia Notepad3:\\ul0\\b0\\fs18\\par\ \\cf0 \\par\ -\\cf0 Notepad3 y MiniPath Copyright \\u0169 2015-2019 Rizonesoft, Todos derechos reservados.\\par\ +\\cf0 Notepad3 y MiniPath Copyright \\u0169 2008-2020 Rizonesoft, Todos derechos reservados.\\par\ \\cf0 https://www.rizonesoft.com\\par\ \\cf0 \\par\ \\cf0 La redistribución y el uso en las formas de código fuente y binario, con o sin\\par\ diff --git a/language/np3_fr_fr/strings_fr_fr.rc b/language/np3_fr_fr/strings_fr_fr.rc index 965479b7f..5d0c9dfd8 100644 --- a/language/np3_fr_fr/strings_fr_fr.rc +++ b/language/np3_fr_fr/strings_fr_fr.rc @@ -331,7 +331,7 @@ IDS_MUI_ABOUT_RTF_5 "\ IDS_MUI_ABOUT_RTF_6 "\ \\cf0 \\fs20\\b1\\ul1 Licence Notepad3:\\ul0\\b0\\fs18\\par\ \\cf0 \\par\ -\\cf0 Notepad3 et MiniPath Copyright \\u0169 2015-2019 Rizonesoft, Tous droits réservés.\\par\ +\\cf0 Notepad3 et MiniPath Copyright \\u0169 2008-2020 Rizonesoft, Tous droits réservés.\\par\ \\cf0 https://www.rizonesoft.com\\par\ \\cf0 \\par\ \\cf0 La redistribution et l'utilisation sous formes source et binaire, avec ou sans modification,\\par\ diff --git a/language/np3_hu_hu/strings_hu_hu.rc b/language/np3_hu_hu/strings_hu_hu.rc index ca1b110db..13027df87 100644 --- a/language/np3_hu_hu/strings_hu_hu.rc +++ b/language/np3_hu_hu/strings_hu_hu.rc @@ -332,7 +332,7 @@ IDS_MUI_ABOUT_RTF_5 "\ IDS_MUI_ABOUT_RTF_6 "\ \\cf0 \\fs20\\b1\\ul1 Notepad3 Licensz:\\ul0\\b0\\fs18\\par\ \\cf0 \\par\ -\\cf0 Notepad3 and MiniPath Copyright \\u0169 2015-2019 Rizonesoft, All rights reserved.\\par\ +\\cf0 Notepad3 and MiniPath Copyright \\u0169 2008-2020 Rizonesoft, All rights reserved.\\par\ \\cf0 https://www.rizonesoft.com\\par\ \\cf0 \\par\ \\cf0 Redistribution and use in source and binary forms, with or without modification,\\par\ diff --git a/language/np3_it_it/strings_it_it.rc b/language/np3_it_it/strings_it_it.rc index 45537b77d..d85fcaad2 100644 --- a/language/np3_it_it/strings_it_it.rc +++ b/language/np3_it_it/strings_it_it.rc @@ -332,7 +332,7 @@ IDS_MUI_ABOUT_RTF_5 "\ IDS_MUI_ABOUT_RTF_6 "\ \\cf0 \\fs20\\b1\\ul1 Licenza Notepad3:\\ul0\\b0\\fs18\\par\ \\cf0 \\par\ -\\cf0 Notepad3 and MiniPath Copyright \\u0169 2015-2019 Rizonesoft, All rights reserved.\\par\ +\\cf0 Notepad3 and MiniPath Copyright \\u0169 2008-2020 Rizonesoft, All rights reserved.\\par\ \\cf0 https://www.rizonesoft.com\\par\ \\cf0 \\par\ \\cf0 Redistribution and use in source and binary forms, with or without modification,\\par\ diff --git a/language/np3_ja_jp/strings_ja_jp.rc b/language/np3_ja_jp/strings_ja_jp.rc index 62ce48878..31c467722 100644 --- a/language/np3_ja_jp/strings_ja_jp.rc +++ b/language/np3_ja_jp/strings_ja_jp.rc @@ -331,7 +331,7 @@ IDS_MUI_ABOUT_RTF_5 "\ IDS_MUI_ABOUT_RTF_6 "\ \\cf0 \\fs20\\b1\\ul1 Notepad3 \\f2\\'83\\'89\\'83\\'43\\'83\\'5a\\'83\\'93\\'83\\'58\\f0 :\\ul0\\b0\\fs18\\par\ \\cf0 \\par\ -\\cf0 Notepad3 and MiniPath Copyright \\u0169 2015-2019 Rizonesoft, All rights reserved.\\par\ +\\cf0 Notepad3 and MiniPath Copyright \\u0169 2008-2020 Rizonesoft, All rights reserved.\\par\ \\cf0 https://www.rizonesoft.com\\par\ \\cf0 \\par\ \\cf0 Redistribution and use in source and binary forms, with or without modification,\\par\ diff --git a/language/np3_ko_kr/strings_ko_kr.rc b/language/np3_ko_kr/strings_ko_kr.rc index 70a0df1a9..7b468637f 100644 --- a/language/np3_ko_kr/strings_ko_kr.rc +++ b/language/np3_ko_kr/strings_ko_kr.rc @@ -332,7 +332,7 @@ IDS_MUI_ABOUT_RTF_5 "\ IDS_MUI_ABOUT_RTF_6 "\ \\cf0 \\fs20\\b1\\ul1 Notepad3 \\f1\\'b6\\'f3\\'c0\\'cc\\'bc\\'be\\'bd\\'ba\\f0 :\\ul0\\b0\\fs18\\par\ \\cf0 \\par\ -\\cf0 Notepad3 and MiniPath Copyright \\u0169 2015-2019 Rizonesoft, All rights reserved.\\par\ +\\cf0 Notepad3 and MiniPath Copyright \\u0169 2008-2020 Rizonesoft, All rights reserved.\\par\ \\cf0 https://www.rizonesoft.com\\par\ \\cf0 \\par\ \\cf0 Redistribution and use in source and binary forms, with or without modification,\\par\ diff --git a/language/np3_nl_nl/strings_nl_nl.rc b/language/np3_nl_nl/strings_nl_nl.rc index 91796f772..dcbd0ec39 100644 --- a/language/np3_nl_nl/strings_nl_nl.rc +++ b/language/np3_nl_nl/strings_nl_nl.rc @@ -331,7 +331,7 @@ IDS_MUI_ABOUT_RTF_5 "\ IDS_MUI_ABOUT_RTF_6 "\ \\cf0 \\fs20\\b1\\ul1 Notepad3 Licentie:\\ul0\\b0\\fs18\\par\ \\cf0 \\par\ -\\cf0 Notepad3 en MiniPath Copyright \\u0169 2015-2019 Rizonesoft, Alle rechten gereserveerd.\\par\ +\\cf0 Notepad3 en MiniPath Copyright \\u0169 2008-2020 Rizonesoft, Alle rechten gereserveerd.\\par\ \\cf0 https://www.rizonesoft.com\\par\ \\cf0 \\par\ \\cf0 Herdistributie en gebruik in bron- en binaire vorm, met of zonder aanpassingen,\\par\ diff --git a/language/np3_pl_pl/strings_pl_pl.rc b/language/np3_pl_pl/strings_pl_pl.rc index 280240a3c..1cb450c82 100644 --- a/language/np3_pl_pl/strings_pl_pl.rc +++ b/language/np3_pl_pl/strings_pl_pl.rc @@ -332,7 +332,7 @@ IDS_MUI_ABOUT_RTF_5 "\ IDS_MUI_ABOUT_RTF_6 "\ \\cf0 \\fs20\\b1\\ul1 Licencja Notepad3:\\ul0\\b0\\fs18\\par\ \\cf0 \\par\ -\\cf0 Notepad3 and MiniPath Copyright \\u0169 2015-2019 Rizonesoft, All rights reserved.\\par\ +\\cf0 Notepad3 and MiniPath Copyright \\u0169 2008-2020 Rizonesoft, All rights reserved.\\par\ \\cf0 https://www.rizonesoft.com\\par\ \\cf0 \\par\ \\cf0 Redistribution and use in source and binary forms, with or without modification,\\par\ diff --git a/language/np3_pt_br/strings_pt_br.rc b/language/np3_pt_br/strings_pt_br.rc index 4301962b2..b8b92076f 100644 --- a/language/np3_pt_br/strings_pt_br.rc +++ b/language/np3_pt_br/strings_pt_br.rc @@ -331,7 +331,7 @@ IDS_MUI_ABOUT_RTF_5 "\ IDS_MUI_ABOUT_RTF_6 "\ \\cf0 \\fs20\\b1\\ul1 Notepad3 Licença:\\ul0\\b0\\fs18\\par\ \\cf0 \\par\ -\\cf0 Notepad3 and MiniPath Copyright \\u0169 2015-2019 Rizonesoft, All rights reserved.\\par\ +\\cf0 Notepad3 and MiniPath Copyright \\u0169 2008-2020 Rizonesoft, All rights reserved.\\par\ \\cf0 https://www.rizonesoft.com\\par\ \\cf0 \\par\ \\cf0 Redistribution and use in source and binary forms, with or without modification,\\par\ diff --git a/language/np3_ru_ru/strings_ru_ru.rc b/language/np3_ru_ru/strings_ru_ru.rc index 7a35448a0..a854c94b3 100644 --- a/language/np3_ru_ru/strings_ru_ru.rc +++ b/language/np3_ru_ru/strings_ru_ru.rc @@ -332,7 +332,7 @@ IDS_MUI_ABOUT_RTF_5 "\ IDS_MUI_ABOUT_RTF_6 "\ \\cf0 \\fs20\\b1\\ul1 \\f1\\'cb\\'e8\\'f6\\'e5\\'ed\\'e7\\'e8\\'ff\\f0 Notepad3:\\ul0\\b0\\fs18\\par\ \\cf0 \\par\ -\\cf0 Notepad3 and MiniPath Copyright \\u0169 2015-2019 Rizonesoft, All rights reserved.\\par\ +\\cf0 Notepad3 and MiniPath Copyright \\u0169 2008-2020 Rizonesoft, All rights reserved.\\par\ \\cf0 https://www.rizonesoft.com\\par\ \\cf0 \\par\ \\cf0 Redistribution and use in source and binary forms, with or without modification,\\par\ diff --git a/language/np3_sk_sk/strings_sk_sk.rc b/language/np3_sk_sk/strings_sk_sk.rc index 39c1b3894..2089510d3 100644 --- a/language/np3_sk_sk/strings_sk_sk.rc +++ b/language/np3_sk_sk/strings_sk_sk.rc @@ -331,7 +331,7 @@ IDS_MUI_ABOUT_RTF_5 "\ IDS_MUI_ABOUT_RTF_6 "\ \\cf0 \\fs20\\b1\\ul1 Notepad3 Licencia:\\ul0\\b0\\fs18\\par\ \\cf0 \\par\ -\\cf0 Notepad3 and MiniPath Copyright \\u0169 2015-2019 Rizonesoft, All rights reserved.\\par\ +\\cf0 Notepad3 and MiniPath Copyright \\u0169 2008-2020 Rizonesoft, All rights reserved.\\par\ \\cf0 https://www.rizonesoft.com\\par\ \\cf0 \\par\ \\cf0 Redistribution and use in source and binary forms, with or without modification,\\par\ diff --git a/language/np3_sv_se/strings_sv_se.rc b/language/np3_sv_se/strings_sv_se.rc index 98c1b8247..6cf04c1cf 100644 --- a/language/np3_sv_se/strings_sv_se.rc +++ b/language/np3_sv_se/strings_sv_se.rc @@ -332,7 +332,7 @@ IDS_MUI_ABOUT_RTF_5 "\ IDS_MUI_ABOUT_RTF_6 "\ \\cf0 \\fs20\\b1\\ul1 Notepad3 Licens:\\ul0\\b0\\fs18\\par\ \\cf0 \\par\ -\\cf0 Notepad3 and MiniPath Copyright \\u0169 2015-2019 Rizonesoft, All rights reserved.\\par\ +\\cf0 Notepad3 and MiniPath Copyright \\u0169 2008-2020 Rizonesoft, All rights reserved.\\par\ \\cf0 https://www.rizonesoft.com\\par\ \\cf0 \\par\ \\cf0 Redistribution and use in source and binary forms, with or without modification,\\par\ diff --git a/language/np3_tr_tr/strings_tr_tr.rc b/language/np3_tr_tr/strings_tr_tr.rc index 757d2ed2c..bf3a33da4 100644 --- a/language/np3_tr_tr/strings_tr_tr.rc +++ b/language/np3_tr_tr/strings_tr_tr.rc @@ -331,7 +331,7 @@ IDS_MUI_ABOUT_RTF_5 "\ IDS_MUI_ABOUT_RTF_6 "\ \\cf0 \\fs20\\b1\\ul1 Notepad3 Licence:\\ul0\\b0\\fs18\\par\ \\cf0 \\par\ -\\cf0 Notepad3 and MiniPath Copyright \\u0169 2015-2019 Rizonesoft, All rights reserved.\\par\ +\\cf0 Notepad3 and MiniPath Copyright \\u0169 2008-2020 Rizonesoft, All rights reserved.\\par\ \\cf0 https://www.rizonesoft.com\\par\ \\cf0 \\par\ \\cf0 Redistribution and use in source and binary forms, with or without modification,\\par\ diff --git a/language/np3_zh_cn/strings_zh_cn.rc b/language/np3_zh_cn/strings_zh_cn.rc index 6be233954..6c63acd3b 100644 --- a/language/np3_zh_cn/strings_zh_cn.rc +++ b/language/np3_zh_cn/strings_zh_cn.rc @@ -332,7 +332,7 @@ IDS_MUI_ABOUT_RTF_5 "\ IDS_MUI_ABOUT_RTF_6 "\ \\cf0 \\fs20\\b1\\ul1 Notepad3 \\f1\\b0\\'d0\\'ed\\'bf\\'c9\\'d6\\'a4\\'a3\\'ba\\f0\\b1\\ul0\\b0\\fs18\\par\ \\cf0 \\par\ -\\cf0 Notepad3 and MiniPath Copyright \\u0169 2015-2019 Rizonesoft, All rights reserved.\\par\ +\\cf0 Notepad3 and MiniPath Copyright \\u0169 2008-2020 Rizonesoft, All rights reserved.\\par\ \\cf0 https://www.rizonesoft.com\\par\ \\cf0 \\par\ \\cf0 Redistribution and use in source and binary forms, with or without modification,\\par\ diff --git a/minipath/License.txt b/minipath/License.txt index 1fdd7f795..6d4074ac2 100644 --- a/minipath/License.txt +++ b/minipath/License.txt @@ -2,7 +2,7 @@ = = = Notepad3 - light-weight Scintilla-based text editor for Windows = = = -= (c) Rizonesoft 2008-2019 = += (c) Rizonesoft 2008-2020 = = https://www.rizonesoft.com = = = ================================================================================ @@ -12,7 +12,7 @@ Rizonesoft Notepad3 --- Licenses --- -------------------------------------------------- License for Notepad3 and MiniPath -------------------------------------------------- -Copyright © 2008-2019 Rizonesoft, +Copyright © 2008-2020 Rizonesoft, All rights reserved. metapath Copyright © 2004-2011 Florian Balmer diff --git a/minipath/src/Config.cpp b/minipath/src/Config.cpp index 07dd9d750..f74dbcafb 100644 --- a/minipath/src/Config.cpp +++ b/minipath/src/Config.cpp @@ -7,7 +7,7 @@ * Config.cpp * * Methods to read and write configuration * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/minipath/src/Config.h b/minipath/src/Config.h index 5c0442ece..69083f3cd 100644 --- a/minipath/src/Config.h +++ b/minipath/src/Config.h @@ -7,7 +7,7 @@ * Config.h * * Methods to read and write configuration * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/minipath/src/Dialogs.c b/minipath/src/Dialogs.c index c476e5894..4045705fc 100644 --- a/minipath/src/Dialogs.c +++ b/minipath/src/Dialogs.c @@ -8,7 +8,7 @@ * dialog boxes implementation * * Based on code from metapath, (c) Florian Balmer 1996-2011 * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/minipath/src/Dialogs.h b/minipath/src/Dialogs.h index be7f89145..c3095c2db 100644 --- a/minipath/src/Dialogs.h +++ b/minipath/src/Dialogs.h @@ -8,7 +8,7 @@ * Definitions for metapath dialog boxes * * Based on code from metapath, (c) Florian Balmer 1996-2011 * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/minipath/src/Dlapi.c b/minipath/src/Dlapi.c index dce4084cd..5e68e0400 100644 --- a/minipath/src/Dlapi.c +++ b/minipath/src/Dlapi.c @@ -8,7 +8,7 @@ * Directory Listing APIs used in metapath * * Based on code from metapath, (c) Florian Balmer 1996-2011 * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/minipath/src/Dlapi.h b/minipath/src/Dlapi.h index 76e5110b5..fec3791c0 100644 --- a/minipath/src/Dlapi.h +++ b/minipath/src/Dlapi.h @@ -8,7 +8,7 @@ * Definitions for Directory Listing APIs * * Based on code from metapath, (c) Florian Balmer 1996-2011 * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/minipath/src/DropSource.cpp b/minipath/src/DropSource.cpp index b76cee3b7..212e4f639 100644 --- a/minipath/src/DropSource.cpp +++ b/minipath/src/DropSource.cpp @@ -8,7 +8,7 @@ * OLE drop source functionality * * Based on code from metapath, (c) Florian Balmer 1996-2011 * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/minipath/src/DropSource.h b/minipath/src/DropSource.h index ef0e4de31..67e59ca0e 100644 --- a/minipath/src/DropSource.h +++ b/minipath/src/DropSource.h @@ -8,7 +8,7 @@ * OLE drop source functionality * * Based on code from metapath, (c) Florian Balmer 1996-2011 * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/minipath/src/Helpers.c b/minipath/src/Helpers.c index 5d65ec4ee..cc741f51b 100644 --- a/minipath/src/Helpers.c +++ b/minipath/src/Helpers.c @@ -8,7 +8,7 @@ * General helper functions * * Based on code from metapath, (c) Florian Balmer 1996-2011 * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/minipath/src/Helpers.h b/minipath/src/Helpers.h index 766901049..e72aa37b1 100644 --- a/minipath/src/Helpers.h +++ b/minipath/src/Helpers.h @@ -8,7 +8,7 @@ * Definitions for general helper functions and macros * * Based on code from metapath, (c) Florian Balmer 1996-2011 * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/minipath/src/minipath.c b/minipath/src/minipath.c index 0d56a1f62..94e230e78 100644 --- a/minipath/src/minipath.c +++ b/minipath/src/minipath.c @@ -8,7 +8,7 @@ * Main application window functionality * * Based on code from metapath, (c) Florian Balmer 1996-2011 * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/minipath/src/minipath.h b/minipath/src/minipath.h index 48e0d2e93..415a2912a 100644 --- a/minipath/src/minipath.h +++ b/minipath/src/minipath.h @@ -8,7 +8,7 @@ * Global definitions and declarations * * Based on code from metapath, (c) Florian Balmer 1996-2011 * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/minipath/src/version.h b/minipath/src/version.h index 11da72f46..8e5236d88 100644 --- a/minipath/src/version.h +++ b/minipath/src/version.h @@ -8,7 +8,7 @@ * MiniPath version information * * Based on code from metapath, (c) Florian Balmer 1996-2011 * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * @@ -29,8 +29,8 @@ #define VERSION_FILEVERSION_NUM VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_BUILD #define VERSION_FILEVERSION_SHORT STRINGIFY(VERSION_MAJOR) "." STRINGIFY(VERSION_MINOR) "." \ STRINGIFY(VERSION_REV) "." STRINGIFY(VERSION_BUILD) -#define VERSION_LEGALCOPYRIGHT_SHORT L"Copyright © 2008-2019" -#define VERSION_LEGALCOPYRIGHT_LONG L"Copyright © Rizonesoft 2008-2019" +#define VERSION_LEGALCOPYRIGHT_SHORT L"Copyright © 2008-2020" +#define VERSION_LEGALCOPYRIGHT_LONG L"Copyright © Rizonesoft 2008-2020" #define VERSION_INTERNALNAME L"MiniPath" #define VERSION_ORIGINALFILENAME L"minipath.exe" diff --git a/np3portableapp/build_np3portableapp.cmd b/np3portableapp/build_np3portableapp.cmd index 038144e3a..99699c10b 100644 --- a/np3portableapp/build_np3portableapp.cmd +++ b/np3portableapp/build_np3portableapp.cmd @@ -1,4 +1,5 @@ @echo off +:: encoding: UTF-8 setlocal enableextensions :: ==================================================================================================================== :: Build batch to create a PortableApps.com's (https://portableapps.com/development) diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index fc6d37e00..bc26f9762 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 BETA diff --git a/src/AccelKeys.c b/src/AccelKeys.c index 5d634df22..67affebef 100644 --- a/src/AccelKeys.c +++ b/src/AccelKeys.c @@ -6,9 +6,9 @@ * * * AccelKeys.c * * Load Accelerator Keys at Runtime * -* * +* * * * -* (c) Rizonesoft 2015-2018 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * *******************************************************************************/ diff --git a/src/Config/Config.cpp b/src/Config/Config.cpp index 2b66313d6..f4ec82568 100644 --- a/src/Config/Config.cpp +++ b/src/Config/Config.cpp @@ -7,7 +7,7 @@ * Config.cpp * * Methods to read and write configuration * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/src/Config/Config.h b/src/Config/Config.h index bf0a47570..b29d4ea34 100644 --- a/src/Config/Config.h +++ b/src/Config/Config.h @@ -7,7 +7,7 @@ * Config.h * * Methods to read and write configuration * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/src/Dialogs.c b/src/Dialogs.c index d7e96eaa2..6a907b17b 100644 --- a/src/Dialogs.c +++ b/src/Dialogs.c @@ -8,7 +8,7 @@ * Notepad3 dialog boxes implementation * * Based on code from Notepad2, (c) Florian Balmer 1996-2011 * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/src/Dialogs.h b/src/Dialogs.h index da7b54016..45866aebe 100644 --- a/src/Dialogs.h +++ b/src/Dialogs.h @@ -8,7 +8,7 @@ * Definitions for Notepad3 dialog boxes * * Based on code from Notepad2, (c) Florian Balmer 1996-2011 * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/src/Dlapi.c b/src/Dlapi.c index c18a07850..f54df01ca 100644 --- a/src/Dlapi.c +++ b/src/Dlapi.c @@ -8,7 +8,7 @@ * Directory Listing APIs used in Notepad3 * * Based on code from Notepad2, (c) Florian Balmer 1996-2011 * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/src/Dlapi.h b/src/Dlapi.h index f3f1ce551..e94442b88 100644 --- a/src/Dlapi.h +++ b/src/Dlapi.h @@ -8,7 +8,7 @@ * Definitions for Directory Listing APIs * * Based on code from Notepad2, (c) Florian Balmer 1996-2011 * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/src/Edit.c b/src/Edit.c index 8f1267612..9bf3928c4 100644 --- a/src/Edit.c +++ b/src/Edit.c @@ -8,7 +8,7 @@ * Text File Editing Helper Stuff * * Based on code from Notepad2, (c) Florian Balmer 1996-2011 * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/src/Edit.h b/src/Edit.h index 881ff3a6f..148d24c44 100644 --- a/src/Edit.h +++ b/src/Edit.h @@ -8,7 +8,7 @@ * Text File Editing Helper Stuff * * Based on code from Notepad2, (c) Florian Balmer 1996-2011 * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/src/Encoding.c b/src/Encoding.c index 6cdefb30c..9591d3e6c 100644 --- a/src/Encoding.c +++ b/src/Encoding.c @@ -10,7 +10,7 @@ * * * * * * -* (c) Rizonesoft 2015-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/src/Encoding.h b/src/Encoding.h index 5c00cbf76..65015e779 100644 --- a/src/Encoding.h +++ b/src/Encoding.h @@ -10,7 +10,7 @@ * Parts taken from SciTE, (c) Neil Hodgson * * MinimizeToTray, (c) 2000 Matthew Ellis * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/src/EncodingDetection.cpp b/src/EncodingDetection.cpp index a5ad63639..a19421bc5 100644 --- a/src/EncodingDetection.cpp +++ b/src/EncodingDetection.cpp @@ -8,7 +8,7 @@ * Interface to Encoding Detector (CED or UCHARDET) * * * * * -* (c) Rizonesoft 2015-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/src/Helpers.c b/src/Helpers.c index 04958ff05..5e805b733 100644 --- a/src/Helpers.c +++ b/src/Helpers.c @@ -10,7 +10,7 @@ * Parts taken from SciTE, (c) Neil Hodgson * * MinimizeToTray, (c) 2000 Matthew Ellis * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/src/Helpers.h b/src/Helpers.h index ce9faa791..59786f668 100644 --- a/src/Helpers.h +++ b/src/Helpers.h @@ -8,7 +8,7 @@ * Definitions for general helper functions and macros * * Based on code from Notepad2, (c) Florian Balmer 1996-2011 * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/src/MuiLanguage.c b/src/MuiLanguage.c index f18912393..2afd0c7f0 100644 --- a/src/MuiLanguage.c +++ b/src/MuiLanguage.c @@ -7,7 +7,7 @@ * MuiLanguage.c * * General MUI Language support functions * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/src/MuiLanguage.h b/src/MuiLanguage.h index 3800b5be6..1310debde 100644 --- a/src/MuiLanguage.h +++ b/src/MuiLanguage.h @@ -8,7 +8,7 @@ * Definitions for MUI Language support * * Based on code from Notepad2, (c) Florian Balmer 1996-2011 * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/src/Notepad3.c b/src/Notepad3.c index 7414609ca..230db4f7f 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -8,7 +8,7 @@ * Main application window functionality * * Based on code from Notepad2, (c) Florian Balmer 1996-2011 * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/src/Notepad3.h b/src/Notepad3.h index c23db8072..b643fddb9 100644 --- a/src/Notepad3.h +++ b/src/Notepad3.h @@ -8,7 +8,7 @@ * Global definitions and declarations * * Based on code from Notepad2, (c) Florian Balmer 1996-2011 * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/src/Print.cpp b/src/Print.cpp index 3f488f495..82850fb64 100644 --- a/src/Print.cpp +++ b/src/Print.cpp @@ -10,7 +10,7 @@ * * * Mostly taken from SciTE, (c) Neil Hodgson * * * -* (c) Rizonesoft 2015-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/src/SciCall.h b/src/SciCall.h index 9b2827e68..6257183a2 100644 --- a/src/SciCall.h +++ b/src/SciCall.h @@ -6,13 +6,13 @@ * * * SciCall.h * * Inline wrappers for Scintilla API calls, arranged in the order and * -* grouping in which they appear in the Scintilla documentation. * +* grouping in which they appear in the Scintilla documentation. * * Based on code from Notepad2, (c) Florian Balmer 1996-2011 * * * * The use of these inline wrapper functions with declared types will * * ensure that we get the benefit of the compiler's type checking. * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/src/Styles.c b/src/Styles.c index cd2c2a8a4..d969296d6 100644 --- a/src/Styles.c +++ b/src/Styles.c @@ -9,7 +9,7 @@ * Based on code from Notepad2, (c) Florian Balmer 1996-2011 * * Mostly taken from SciTE, (c) Neil Hodgson * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * http://www.rizonesoft.com * * * * * diff --git a/src/Styles.h b/src/Styles.h index a6ad6d22f..cb1971c11 100644 --- a/src/Styles.h +++ b/src/Styles.h @@ -8,7 +8,7 @@ * Scintilla Style Management * * Based on code from Notepad2, (c) Florian Balmer 1996-2011 * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/src/TypeDefs.h b/src/TypeDefs.h index 032960903..14232b723 100644 --- a/src/TypeDefs.h +++ b/src/TypeDefs.h @@ -6,7 +6,7 @@ * * * TypeDefs.h * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/src/Version.h b/src/Version.h index 99c9d8f18..200af3f17 100644 --- a/src/Version.h +++ b/src/Version.h @@ -7,7 +7,7 @@ * Version.h * * Based on code from Notepad2-mod, (c) XhmikosR 2010-2015 * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://www.rizonesoft.com * * * * * @@ -42,8 +42,8 @@ #pragma message("Release Build: " _STRG(VERSION_FILEVERSION_LONG)) #endif -#define VERSION_LEGALCOPYRIGHT "Copyright © 2015-2019 Rizonesoft" -//#define VERSION_LEGALCOPYRIGHT_LONG "© Rizonesoft 2015-2019" +#define VERSION_LEGALCOPYRIGHT "Copyright © 2008-2020 Rizonesoft" +//#define VERSION_LEGALCOPYRIGHT_LONG "© Rizonesoft 2008-2020" #define VERSION_AUTHORNAME "© Rizonesoft" #define VERSION_WEBPAGEDISPLAY "https://www.rizonesoft.com" #define VERSION_COMPANYNAME "© Rizonesoft" diff --git a/src/VersionEx.h b/src/VersionEx.h index 84bfc82da..4d1cd6740 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -7,9 +7,9 @@ #define APPNAME Notepad3 #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 -#define VERSION_MINOR 19 -#define VERSION_REV 1215 -#define VERSION_BUILD 2996 +#define VERSION_MINOR 20 +#define VERSION_REV 103 +#define VERSION_BUILD 2997 #define SCINTILLA_VER 421 #define ONIGURUMA_REGEX_VER 6.9.4 #define UCHARDET_VER 2018.09.27 diff --git a/test/test_files/StyleLexers/styleLexCPP/Config.cpp b/test/test_files/StyleLexers/styleLexCPP/Config.cpp index 26b0339da..b13833ce2 100644 --- a/test/test_files/StyleLexers/styleLexCPP/Config.cpp +++ b/test/test_files/StyleLexers/styleLexCPP/Config.cpp @@ -6,7 +6,7 @@ * Config.cpp * * Methods to read and write configuration * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * * diff --git a/test/test_files/StyleLexers/styleLexCPP/Notepad3.c b/test/test_files/StyleLexers/styleLexCPP/Notepad3.c index ab4852edb..788b8ad5f 100644 --- a/test/test_files/StyleLexers/styleLexCPP/Notepad3.c +++ b/test/test_files/StyleLexers/styleLexCPP/Notepad3.c @@ -7,7 +7,7 @@ * Main application window functionality * * Based on code from Notepad2, (c) Florian Balmer 1996-2011 * * * -* (c) Rizonesoft 2008-2019 * +* (c) Rizonesoft 2008-2020 * * https://rizonesoft.com * * * * *