diff --git a/Versions/build.txt b/Versions/build.txt index d00491fd7..0cfbf0888 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -1 +2 diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc index 1af8101e7..880a4c226 100644 --- a/language/np3_pl_pl/menu_pl_pl.rc +++ b/language/np3_pl_pl/menu_pl_pl.rc @@ -282,7 +282,7 @@ BEGIN MENUITEM "Zaznacz wyraz lub wiersz\tCtrl+Spc", IDM_EDIT_SELECTWORD MENUITEM "Multiwybór-wszystko pasujące\tCtrl+Shift+Spc", IDM_EDIT_SELECTALLMATCHES MENUITEM SEPARATOR - MENUITEM "Split Undo &Transaction at Line-Breaks", IDM_VIEW_SPLIT_UNDOTYPSEQ_LNBRK + MENUITEM "Podział operacji cofania przy przenoszeniu wierszy", IDM_VIEW_SPLIT_UNDOTYPSEQ_LNBRK END MENUITEM SEPARATOR POPUP "Zakładki" diff --git a/language/np3_pl_pl/strings_pl_pl.rc b/language/np3_pl_pl/strings_pl_pl.rc index 14cf42e0d..8a4758f51 100644 --- a/language/np3_pl_pl/strings_pl_pl.rc +++ b/language/np3_pl_pl/strings_pl_pl.rc @@ -278,7 +278,7 @@ Options:\r\n\ /n\tAlways open a new window (/ns single file instance).\r\n\ /r\tReuse window (/rs single file instance).\r\n\ /p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m)\r\n\ -\tor /p ,,,, [all integers].\r\n\ +\tor /p ,,,, [wszystkie liczby].\r\n\ /t\tSet window title.\r\n\ /i\tStart as tray icon.\r\n\ /o\tKeep window on top.\r\n\ diff --git a/np3portableapp/build_np3portableapp.cmd b/np3portableapp/build_np3portableapp.cmd index c99daf883..1959e1cfc 100644 --- a/np3portableapp/build_np3portableapp.cmd +++ b/np3portableapp/build_np3portableapp.cmd @@ -36,9 +36,18 @@ set NP3_LANGUAGE_SET=af-ZA be-BY de-DE en-GB es-ES fr-FR hu-HU it-IT ja-JP ko-KR :: ==================================================================================================================== :: --- Environment --- + +if exist D:\PortableApps\PortableApps.comInstaller\ ( + set PORTAPP_ROOT_DIR=D:\PortableApps +) else ( + if exist D:\Rizonesoft\PortableApps\PortableApps\PortableApps.comInstaller\ ( + set PORTAPP_ROOT_DIR=D:\Rizonesoft\PortableApps\PortableApps + ) else ( + goto :END + ) +) + set SCRIPT_DIR=%~dp0 -set PORTAPP_ROOT_DIR=D:\PortableApps -::set PORTAPP_ROOT_DIR=D:\Rizonesoft\PortableApps\PortableApps set PORTAPP_APP_COMPACTOR=%PORTAPP_ROOT_DIR%\PortableApps.comAppCompactor\PortableApps.comAppCompactor.exe set PORTAPP_LAUNCHER_CREATOR=%PORTAPP_ROOT_DIR%\PortableApps.comLauncher\PortableApps.comLauncherGenerator.exe set PORTAPP_INSTALLER_CREATOR=%PORTAPP_ROOT_DIR%\PortableApps.comInstaller\PortableApps.comInstaller.exe @@ -189,7 +198,7 @@ goto :END >> "%~4" echo(!modified! endlocal ) - goto:EOF + goto :EOF :: -------------------------------------------------------------------------------------------------------------------- :GETDATE @@ -203,19 +212,19 @@ goto :END ::echo datestamp: "%datestamp%" ::echo timestamp: "%timestamp%" ::echo fullstamp: "%fullstamp%" - goto:EOF + goto :EOF :: -------------------------------------------------------------------------------------------------------------------- :GETFILEVER set "file=%~1" - if not defined file goto:EOF - if not exist "%file%" goto:EOF + if not defined file goto :EOF + if not exist "%file%" goto :EOF set "FILEVER=" for /F "tokens=2 delims==" %%a in (' wmic datafile where name^="%file:\=\\%" Get Version /value ') do set "FILEVER=%%a" ::echo %file% = %FILEVER% - goto:EOF + goto :EOF :: -------------------------------------------------------------------------------------------------------------------- :GETBUILD @@ -223,7 +232,7 @@ goto :END set /a BUILD = %nxbuild% - 1 set /p DEVNAME=<%NP3_BUILD_NAME% set DEVNAME=%DEVNAME:"=% - goto:EOF + goto :EOF :: -------------------------------------------------------------------------------------------------------------------- rem Resolve path to absolute. @@ -232,7 +241,7 @@ rem Param 2: Path to resolve. rem Return: Resolved absolute path. :RESOLVEPATH set %1=%~dpfn2 - goto:EOF + goto :EOF :: -------------------------------------------------------------------------------------------------------------------- :: ==================================================================================================================== diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 28f485d08..3da502a5d 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 RC3 diff --git a/src/VersionEx.h b/src/VersionEx.h index b267788c8..5f4bb56b5 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -9,7 +9,7 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 20 #define VERSION_REV 321 -#define VERSION_BUILD 1 +#define VERSION_BUILD 2 #define SCINTILLA_VER 432 #define ONIGURUMA_REGEX_VER 6.9.4 #define UCHARDET_VER 2018.09.27