From 63e420cf9c12323d7bbd3d77e463c385c149b2ad Mon Sep 17 00:00:00 2001 From: raspopov Date: Thu, 11 May 2023 10:37:35 +0300 Subject: [PATCH] Project updated to VS2022. --- Localization.sln | 8 +++-- README.md | 29 +++++++++------- build.cmd | 62 +++++++--------------------------- clean.cmd | 12 ------- exe2po/exe2po.cpp | 4 +-- exe2po/exe2po.rc | 4 +-- exe2po/exe2po.vcxproj | 54 ++++++++++++++++++----------- exe2po/stdafx.cpp | 4 +-- exe2po/stdafx.h | 4 +-- sample/res/sample.ico | Bin 22486 -> 0 bytes sample/res/sample.rc2 | 13 ------- sample/resource.h | 2 -- sample/sample.cpp | 4 +-- sample/sample.h | 4 +-- sample/sample.rc | 18 ++-------- sample/sample.vcxproj | 58 +++++++++++++++---------------- sample/sample.vcxproj.filters | 6 ---- sample/sampleDlg.cpp | 8 ++--- sample/sampleDlg.h | 5 ++- sample/stdafx.cpp | 4 +-- sample/stdafx.h | 4 +-- 21 files changed, 119 insertions(+), 188 deletions(-) delete mode 100644 clean.cmd delete mode 100644 sample/res/sample.ico delete mode 100644 sample/res/sample.rc2 diff --git a/Localization.sln b/Localization.sln index 52408a6..d92a846 100644 --- a/Localization.sln +++ b/Localization.sln @@ -1,14 +1,18 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27703.2047 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.33627.172 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exe2po", "exe2po\exe2po.vcxproj", "{29F88A73-AB86-4748-B96B-E010EA4DD45D}" + ProjectSection(ProjectDependencies) = postProject + {13D18C95-84A4-4B3A-AC51-40B90C7B7A07} = {13D18C95-84A4-4B3A-AC51-40B90C7B7A07} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample", "sample\sample.vcxproj", "{13D18C95-84A4-4B3A-AC51-40B90C7B7A07}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4081BAC6-060E-4E22-96F2-595FB5E9F56F}" ProjectSection(SolutionItems) = preProject + build.cmd = build.cmd exe2po-register.reg = exe2po-register.reg exe2po-unregister.reg = exe2po-unregister.reg LICENSE = LICENSE diff --git a/README.md b/README.md index c31b6f0..aa430d5 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![Codacy Badge](https://api.codacy.com/project/badge/Grade/983675f415f5405da0846ec33156092f)](https://www.codacy.com/app/raspopov/po-localization?utm_source=github.com&utm_medium=referral&utm_content=raspopov/po-localization&utm_campaign=Badge_Grade) PO-Localization ------------------ +=============== This is a library designed to help C++ developers in creating Windows application to translate it on world languages. Project contains an @@ -10,8 +10,8 @@ adds ability to use translated PO-files to application itself. The PO-file is a native format of poEdit (a very convenient application for translators). - Compression -------------- +Compression +----------- Library can load translations in uncompressed or compressed formats (Lempel-Ziv algorithm only). Uncompressed files has ".po" extension and @@ -30,8 +30,8 @@ files. Note: Some versions of compress.exe produces incorrect compressed files (1 byte differ) just get another version of utility. - EXE to PO file converter usage --------------------------------- +EXE to PO file converter usage +------------------------------ exe2po.exe {input file.exe} {output file.po} @@ -70,8 +70,8 @@ Generated .po-file blocks for string resources: msgid "English string" msgstr "" - License ---------- +License +------- Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -85,12 +85,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - Copyrights ------------- +Copyrights +---------- -PO-Localization -Copyright (C) Nikolay Raspopov, 2011-2018. \ -https://www.cherubicsoft.com/en/projects/po-localization +* PO-Localization + +Copyright (C) Nikolay Raspopov, 2011-2023. + +https://www.cherubicsoft.com/en/projects/po-localization/ + +* Microsoft (R) File Compression Utility Version 2.50 -Microsoft (R) File Compression Utility Version 2.50 \ Copyright (C) Microsoft Corp. 1990-1994. All rights reserved. diff --git a/build.cmd b/build.cmd index 50be3cb..2edac52 100644 --- a/build.cmd +++ b/build.cmd @@ -1,51 +1,15 @@ @echo off setlocal - -call clean.cmd - -set vc="%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" -if exist %vc% goto :build -set vc="%VS150COMNTOOLS%..\..\VC\Auxiliary\Build\vcvarsall.bat" -if exist %vc% goto :build -echo Microsoft Visual C++ 2015/2017 is missing. Please go to http://www.visualstudio.com/ and install free Community edition. -exit /b 1 - -:build -echo Building... -call %vc% x86 -msbuild Localization.sln /v:m /t:Rebuild /p:Configuration=Release /p:Platform=Win32 -if exist Win32\release\exe2po.exe goto pack -echo Binary file is missing. Compile project first please. -exit /b 1 - -:pack -echo. -echo Detecting 7-Zip... -set zip="%ProgramFiles%\7-Zip\7z.exe" -if exist %zip% goto zip -set zip="%ProgramFiles(x86)%\7-Zip\7z.exe" -if exist %zip% goto zip -set zip="%ProgramW6432%\7-Zip\7z.exe" -if exist %zip% goto zip -echo The 7-Zip utility is missing. Please go to http://www.7-zip.org/ and install 7-Zip. -exit /b 1 - -:zip -echo. -echo Packing by 7-Zip: %zip%... -for /F "tokens=3" %%i in ( 'findstr ProductVersion exe2po\exe2po.rc' ) do set version=%%~i -md "..\redist" 2>nul: -set dst="%CD%\..\redist\po-localization-%version%.zip" -del %dst% 2>nul: -cd exe2po -%zip% a -tzip -mx9 -mm=Deflate64 -mpass=15 -stl %dst% gpl-2.0.txt -cd ..\src -%zip% a -tzip -mx9 -mm=Deflate64 -mpass=15 -stl %dst% lgpl-2.1.txt Localization.h Localization.cpp COMPRESS.EXE -cd ..\Win32\release -%zip% a -tzip -mx9 -mm=Deflate64 -mpass=15 -stl %dst% exe2po.exe -cd ..\.. -%zip% a -tzip -mx9 -mm=Deflate64 -mpass=15 -stl -r -xr!*.user -xr!*.aps -xr!*.p_ -xr!win32 -xr!x64 %dst% sample ReadMe.txt *.reg -echo. - -echo Done. -exit /b 0 \ No newline at end of file +set "cur=%cd%\" +pushd "%~dp0" +for /F "tokens=3" %%i in ( 'findstr ProductVersion %~dp0exe2po\exe2po.rc' ) do set "version=%%~i" +set "dst=%cur%po-localization-%version%.zip" +echo Packing %dst%... +del "%dst%" 2>nul +rd /q /s sample\Win32\ 2>nul +rd /q /s sample\x64\ 2>nul +del sample\*.user 2>nul +del sample\*.aps 2>nul +del sample\res\*.p_ 2>nul +powershell -Command "& { Compress-Archive -Path '%cur%exe2po.exe','%cur%sample.exe',ReadMe*,LICENSE,*.reg,src\*,sample\ -DestinationPath '%dst%' }" +popd \ No newline at end of file diff --git a/clean.cmd b/clean.cmd deleted file mode 100644 index 679dc48..0000000 --- a/clean.cmd +++ /dev/null @@ -1,12 +0,0 @@ -@echo off -echo Cleaning... -if exist "ipch" rd /s /q "ipch" && echo Removing "ipch"... -if exist "Win32" rd /s /q "Win32" && echo Removing "Win32"... -if exist "x64" rd /s /q "x64" && echo Removing "x64"... -for /r %%i in (*.aps) do del /q "%%i" && echo Removing "%%i"... -for /r %%i in (*.ncb) do del /q "%%i" && echo Removing "%%i"... -for /r %%i in (*.sdf) do del /q "%%i" && echo Removing "%%i"... -for /d /r %%i in (*.*) do if exist "%%i\Win32" rd /s /q "%%i\Win32" && echo Removing "%%i\Win32"... -for /d /r %%i in (*.*) do if exist "%%i\x64" rd /s /q "%%i\x64" && echo Cleaning %%i\x64"... -echo. -exit /b 0 \ No newline at end of file diff --git a/exe2po/exe2po.cpp b/exe2po/exe2po.cpp index 94afb0c..ced0a65 100644 --- a/exe2po/exe2po.cpp +++ b/exe2po/exe2po.cpp @@ -3,9 +3,9 @@ /* This file is part of EXE to PO file converter (EXE2PO) -https://github.com/raspopov/po-localization +https://www.cherubicsoft.com/en/projects/po-localization/ -Copyright (C) 2011-2018 Nikolay Raspopov +Copyright (C) 2011-2023 Nikolay Raspopov Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/exe2po/exe2po.rc b/exe2po/exe2po.rc index 2c00d8b..d9f6e9d 100644 --- a/exe2po/exe2po.rc +++ b/exe2po/exe2po.rc @@ -41,12 +41,12 @@ BEGIN BEGIN BLOCK "000004b0" BEGIN - VALUE "Comments", "https://github.com/raspopov/po-localization" + VALUE "Comments", "https://www.cherubicsoft.com/en/projects/po-localization/" VALUE "CompanyName", "Raspopov" VALUE "FileDescription", "EXE to PO file converter" VALUE "FileVersion", "1.0.0.4" VALUE "InternalName", "exe2po" - VALUE "LegalCopyright", "Copyright © 2011-2018 Nikolay Raspopov" + VALUE "LegalCopyright", "Copyright © 2011-2023 Nikolay Raspopov" VALUE "OriginalFilename", "exe2po.exe" VALUE "ProductName", "Localization Library" VALUE "ProductVersion", "1.0.0.4" diff --git a/exe2po/exe2po.vcxproj b/exe2po/exe2po.vcxproj index 9d6b524..f408376 100644 --- a/exe2po/exe2po.vcxproj +++ b/exe2po/exe2po.vcxproj @@ -22,30 +22,30 @@ {29F88A73-AB86-4748-B96B-E010EA4DD45D} exe2po Win32Proj - 10.0.17763.0 + 10.0 Application Unicode true - v141 + v143 Application Unicode true - v141 + v143 Application Unicode - v141 + v143 Application Unicode - v141 + v143 @@ -95,12 +95,14 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug true false Use Level4 EditAndContinue + true + true shlwapi.lib;%(AdditionalDependencies) @@ -109,18 +111,21 @@ MachineX86 false + Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug true false Use Level4 ProgramDatabase + true + true shlwapi.lib;%(AdditionalDependencies) @@ -128,21 +133,20 @@ Console false + - Full - AnySuitable - true - Speed - true + MaxSpeed WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL + MultiThreaded true false Use Level4 true + true + true shlwapi.lib;%(AdditionalDependencies) @@ -152,21 +156,26 @@ MachineX86 true + + + pushd "$(OutDir)" +call $(SolutionDir)build.cmd +popd + + - Full - AnySuitable - true - Speed - true + MaxSpeed WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL + MultiThreaded true false Use Level4 true + true + true shlwapi.lib;%(AdditionalDependencies) @@ -175,6 +184,13 @@ true true + + + pushd "$(OutDir)" +call $(SolutionDir)build.cmd +popd + + diff --git a/exe2po/stdafx.cpp b/exe2po/stdafx.cpp index 4beb0ac..23d3584 100644 --- a/exe2po/stdafx.cpp +++ b/exe2po/stdafx.cpp @@ -3,9 +3,9 @@ /* This file is part of EXE to PO file converter (EXE2PO) -https://github.com/raspopov/po-localization +https://www.cherubicsoft.com/en/projects/po-localization/ -Copyright (C) 2011-2018 Nikolay Raspopov +Copyright (C) 2011-2023 Nikolay Raspopov Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/exe2po/stdafx.h b/exe2po/stdafx.h index 673a5af..20c2c74 100644 --- a/exe2po/stdafx.h +++ b/exe2po/stdafx.h @@ -1,8 +1,8 @@ /* This file is part of EXE to PO file converter (EXE2PO) -https://github.com/raspopov/po-localization +https://www.cherubicsoft.com/en/projects/po-localization/ -Copyright (C) 2011-2018 Nikolay Raspopov +Copyright (C) 2011-2023 Nikolay Raspopov Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/sample/res/sample.ico b/sample/res/sample.ico deleted file mode 100644 index da39f105f0dd01f1200cad51d0f4b301353b6e76..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22486 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 Ugk1j%2r|83`G=g2&qnEg0j{8sO#lD@ diff --git a/sample/res/sample.rc2 b/sample/res/sample.rc2 deleted file mode 100644 index ee18c74..0000000 --- a/sample/res/sample.rc2 +++ /dev/null @@ -1,13 +0,0 @@ -// -// sample.RC2 - resources Microsoft Visual C++ does not edit directly -// - -#ifdef APSTUDIO_INVOKED -#error this file is not editable by Microsoft Visual C++ -#endif //APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// Add manually edited resources here... - -///////////////////////////////////////////////////////////////////////////// diff --git a/sample/resource.h b/sample/resource.h index 010751b..cc40953 100644 --- a/sample/resource.h +++ b/sample/resource.h @@ -3,7 +3,6 @@ // Used by sample.rc // #define IDD_SAMPLE_DIALOG 102 -#define IDR_MAINFRAME 128 #define IDS_STRING130 130 #define IDR_MENU1 131 #define IDC_BUTTON1 1000 @@ -14,7 +13,6 @@ #define IDC_LANGS 1005 #define IDC_COMBO2 1006 #define IDC_EDIT2 1007 -#define IDC_HOTKEY1 1010 #define IDC_SYSLINK1 1011 #define IDC_MFCLINK1 1012 #define IDC_COMMAND1 1013 diff --git a/sample/sample.cpp b/sample/sample.cpp index 29c41f1..82ad444 100644 --- a/sample/sample.cpp +++ b/sample/sample.cpp @@ -3,9 +3,9 @@ /* This file is part of Localization library -https://github.com/raspopov/po-localization +https://www.cherubicsoft.com/en/projects/po-localization/ -Copyright (C) 2011-2018 Nikolay Raspopov +Copyright (C) 2011-2023 Nikolay Raspopov Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/sample/sample.h b/sample/sample.h index eb480c4..756a2c0 100644 --- a/sample/sample.h +++ b/sample/sample.h @@ -1,8 +1,8 @@ /* This file is part of Localization library -https://github.com/raspopov/po-localization +https://www.cherubicsoft.com/en/projects/po-localization/ -Copyright (C) 2011-2018 Nikolay Raspopov +Copyright (C) 2011-2023 Nikolay Raspopov Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/sample/sample.rc b/sample/sample.rc index 9dc9114..ee2fef5 100644 --- a/sample/sample.rc +++ b/sample/sample.rc @@ -19,16 +19,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #pragma code_page(1251) -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDR_MAINFRAME ICON "res\\sample.ico" - - ///////////////////////////////////////////////////////////////////////////// // // Dialog @@ -81,12 +71,12 @@ BEGIN BEGIN BLOCK "000004b0" BEGIN - VALUE "Comments", "https://github.com/raspopov/po-localization" + VALUE "Comments", "https://www.cherubicsoft.com/en/projects/po-localization/" VALUE "CompanyName", "Raspopov" VALUE "FileDescription", "Localization Library Sample" VALUE "FileVersion", "1.0.0.4" VALUE "InternalName", "sample" - VALUE "LegalCopyright", "Copyright © 2011-2018 Nikolay Raspopov" + VALUE "LegalCopyright", "Copyright © 2011-2023 Nikolay Raspopov" VALUE "OriginalFilename", "sample.exe" VALUE "ProductName", "Localization Library" VALUE "ProductVersion", "1.0.0.4" @@ -251,8 +241,6 @@ BEGIN "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n" "LANGUAGE 9, 1\r\n" "#pragma code_page(1252)\r\n" - "#include ""res\\sample.rc2"" // non-Microsoft Visual C++ edited resources\r\n" - "#include ""afxres.rc"" // Standard components\r\n" "#endif\r\n" "\0" END @@ -277,8 +265,6 @@ END #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) LANGUAGE 9, 1 #pragma code_page(1252) -#include "res\sample.rc2" // non-Microsoft Visual C++ edited resources -#include "afxres.rc" // Standard components #endif ///////////////////////////////////////////////////////////////////////////// diff --git a/sample/sample.vcxproj b/sample/sample.vcxproj index d99e8cb..0e81dd1 100644 --- a/sample/sample.vcxproj +++ b/sample/sample.vcxproj @@ -22,34 +22,34 @@ {13D18C95-84A4-4B3A-AC51-40B90C7B7A07} sample MFCProj - 10.0.17763.0 + 10.0 Application - Dynamic + Static Unicode true - v141 + v143 Application - Dynamic + Static Unicode true - v141 + v143 Application - Dynamic + Static Unicode - v141 + v143 Application - Dynamic + Static Unicode - v141 + v143 @@ -102,15 +102,17 @@ Disabled - ..\src;%(AdditionalIncludeDirectories) + ..\src;..;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions) EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug true false Use Level4 EditAndContinue + true + true _DEBUG;%(PreprocessorDefinitions) @@ -132,15 +134,17 @@ Disabled - ..\src;%(AdditionalIncludeDirectories) + ..\src;..;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions) EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug true false Use Level4 ProgramDatabase + true + true _DEBUG;%(PreprocessorDefinitions) @@ -161,19 +165,16 @@ true - Full - AnySuitable - true - Speed - true - ..\src;%(AdditionalIncludeDirectories) + MaxSpeed + ..\src;..;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions) - false - MultiThreadedDLL + MultiThreaded true false Use Level4 + true + true NDEBUG;%(PreprocessorDefinitions) @@ -194,19 +195,16 @@ false - Full - AnySuitable - true - Speed - true - ..\src;%(AdditionalIncludeDirectories) + MaxSpeed + ..\src;..;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions) - false - MultiThreadedDLL + MultiThreaded true false Use Level4 + true + true NDEBUG;%(PreprocessorDefinitions) @@ -250,8 +248,6 @@ %(RootDir)%(Directory)%(Filename).p_;%(Outputs) - - diff --git a/sample/sample.vcxproj.filters b/sample/sample.vcxproj.filters index e2fe3c4..be5ef86 100644 --- a/sample/sample.vcxproj.filters +++ b/sample/sample.vcxproj.filters @@ -29,12 +29,6 @@ Resource Files - - Resource Files - - - Resource Files - diff --git a/sample/sampleDlg.cpp b/sample/sampleDlg.cpp index d5b871f..aa7ce0a 100644 --- a/sample/sampleDlg.cpp +++ b/sample/sampleDlg.cpp @@ -3,9 +3,9 @@ /* This file is part of Localization library -https://github.com/raspopov/po-localization +https://www.cherubicsoft.com/en/projects/po-localization/ -Copyright (C) 2011-2018 Nikolay Raspopov +Copyright (C) 2011-2023 Nikolay Raspopov Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -32,7 +32,6 @@ CSampleDlg::CSampleDlg(CWnd* pParent /*=NULL*/) : CDialog(CSampleDlg::IDD, pParent) , m_nCombo ( 0 ) { - m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME); } void CSampleDlg::DoDataExchange(CDataExchange* pDX) @@ -54,9 +53,6 @@ BOOL CSampleDlg::OnInitDialog() { CDialog::OnInitDialog(); - SetIcon( m_hIcon, TRUE ); // Set big icon - SetIcon( m_hIcon, FALSE ); // Set small icon - theApp.m_pLoc.FillComboBox( m_pLangs.GetSafeHwnd() ); theApp.m_pLoc.Translate( GetSafeHwnd(), CSampleDlg::IDD ); diff --git a/sample/sampleDlg.h b/sample/sampleDlg.h index 962250e..b34e158 100644 --- a/sample/sampleDlg.h +++ b/sample/sampleDlg.h @@ -1,8 +1,8 @@ /* This file is part of Localization library -https://github.com/raspopov/po-localization +https://www.cherubicsoft.com/en/projects/po-localization/ -Copyright (C) 2011-2018 Nikolay Raspopov +Copyright (C) 2011-2023 Nikolay Raspopov Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -27,7 +27,6 @@ class CSampleDlg : public CDialog enum { IDD = IDD_SAMPLE_DIALOG }; protected: - HICON m_hIcon; CString m_sEdit; int m_nCombo; CComboBox m_pLangs; diff --git a/sample/stdafx.cpp b/sample/stdafx.cpp index 9f402f8..5c0ac82 100644 --- a/sample/stdafx.cpp +++ b/sample/stdafx.cpp @@ -3,9 +3,9 @@ /* This file is part of Localization library -https://github.com/raspopov/po-localization +https://www.cherubicsoft.com/en/projects/po-localization/ -Copyright (C) 2011-2018 Nikolay Raspopov +Copyright (C) 2011-2023 Nikolay Raspopov Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/sample/stdafx.h b/sample/stdafx.h index 00a434b..1b152cf 100644 --- a/sample/stdafx.h +++ b/sample/stdafx.h @@ -1,8 +1,8 @@ /* This file is part of Localization library -https://github.com/raspopov/po-localization +https://www.cherubicsoft.com/en/projects/po-localization/ -Copyright (C) 2011-2018 Nikolay Raspopov +Copyright (C) 2011-2023 Nikolay Raspopov Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.