diff --git a/Version_RC.cmd b/Version_RC.cmd index 807d88996..063a7d9e4 100644 --- a/Version_RC.cmd +++ b/Version_RC.cmd @@ -1,6 +1,6 @@ @echo off setlocal -set _VERPATCH_="RC" +set _VERPATCH_=RC echo."%_VERPATCH_%">.\np3portableapp\_buildname.txt Version -VerPatch "%_VERPATCH_%" endlocal diff --git a/doc/KeyboardShortcuts.txt b/doc/KeyboardShortcuts.txt index cbe0671b8..cccf3f779 100644 --- a/doc/KeyboardShortcuts.txt +++ b/doc/KeyboardShortcuts.txt @@ -198,10 +198,10 @@ Keyboard Shortcuts for Notepad3 Misc. - Esc Optionally minimize or exit Notepad2. - Shift+Esc Save file and exit Notepad2. - F1 Display version info. - + Esc Optionally minimize or exit Notepad3. + Shift+Esc Save file and exit Notepad3. + F1 Online Documentation. + Shift+F1 Display Info version "About…" Regular Expression Syntax @@ -261,40 +261,47 @@ Regular Expression Syntax - Convert tabs to double spaces: find "\t" replace with " " -Command Line Switches +Command Line Help - Notepad2.exe [(encoding)] [(line ending mode)] [/g ln[,col]] - [/m[-][r|b] text] [/q] [/s ext] [/d] [/h] [/x] [/c] - [/b] [/n|/ns] [/r|/rs] - [/p x,y,cx,cy[,max]|/p0|/ps|/pf,l,t,r,b,m] - [/t title] [/i] [/f ini|/f0] [/?] [+|-] [file] ... +Usage: + Notepad3 [/?] […[Encoding]] […[Line ending mode]] [/e] [/g] [/m] [/l] + [/q] [/s] [/d] [/h] [/x] [/c] [/b] [/n] [/r| [/p] [/t] [/i] [/o] + [/f] [/u] [/v] [/vd] [/z] [[drive:][path]filename[…]] - file File to open, can be a relative pathname, or a shell link. - Must be the last argument, no quoted spaces by default. - + Accept multiple file arguments (with quoted spaces). - - Accept single file argument (without quoted spaces). - ... Desired file encoding (can be one of /ansi, /unicode, - /unicodebe, /utf8 or /utf8sig). - ... Desired line ending mode (either /crlf, /lf, or /cr). - /g Jump to specified position, /g -1 means end of file. - /m Match specified text (/m- last, /mr regex, /mb backslash). - /q Force creation of new files without prompt. - /s Select syntax scheme associated with specified extension. - /d Select default text scheme. - /h Select Web Source Code scheme. - /x Select XML Document scheme. - /c Open a new Notepad2 window and paste the clipboard contents. - /b Open a new Notepad2 paste board to collect clipboard entries. - /n Always open a new Notepad2 window (/ns single file instance). - /r Reuse Notepad2 window (/rs single file instance). - /p Set window position to x,y with size cx,cy, optional max set - to nonzero to zoom; /p0 system, /ps internal defaults; - /p(f)ull,(l)eft,(t)op,(r)ight,(b)ottom,(m)argin. - /t Set window title. - /i Start as tray icon. - /f Specify ini-file; /f0 use no ini-file (don't save settings). - /v Print file and quit. - /vd Print file, but show Printer config dialog. - /z Skip next (Registry based Notepad replacement) - /? Display a brief summary about command line parameters. + file Must be the last argument, no quoted spaces by default. + + Accept multiple file arguments (with quoted spaces). + - Accept single file argument (without quoted spaces). +Options: + /? Dispay this help message. + … Encoding (/ansi, /unicode, /unicodebe, /utf8, /utf8sig). + … Line ending mode (/crlf, /cr, /lf). + /e File source encoding. + /g Jump to specified position (/g -1 end of file). + /m Match specified text (/m- last, /mr regex, /mb backslash). + /l Auto-reload modified files. + /q Force creation of new files without prompt. + /s Select specified syntax scheme. + /d Select default text scheme. + /h Select Web Source Code scheme. + /x Select XML Document scheme. + /c Open new window and paste clipboard contents. + /b Open new paste board to collect clipboard entries. + /n Always open a new window (/ns single file instance). + /r Reuse window (/rs single file instance). + /p Set window position and size (/p0, /ps, /pf,l,t,r,b,m). + /t Set window title. + /i Start as tray icon. + /o Keep window on top. + /f Specify ini-file (/f0 no ini-file). + /u Launch with elevated privileges. + /v Print file immediately and quit. + /vd Print file (open printer dialog). + /z Skip next (usable for registry-based Notepad replacement). + +Examples: + Notepad3 /utf8sig /crlf d:\temp\Test.txt + … Open a new file: "Test.txt" Encoding=UTF-8-BOM, EoL=CRLF. + Notepad3 /v d:\temp\Test.txt + … Print the file: "Test.txt" immediately. + \ No newline at end of file diff --git a/language/common_res.rc b/language/common_res.rc index ee4cb8982..07be0cca0 100644 --- a/language/common_res.rc +++ b/language/common_res.rc @@ -102,18 +102,20 @@ IDS_MUI_ABOUT_LIBS "\ // // For "craigo-": to access the right site "https://github.com/craigo-", -// a slash "/" is voluntarily added after the "craigo-" ! +// a slash "/" is voluntarily added after the "craigo-" ! // IDS_MUI_ABOUT_ACKNOWLEDGES "\ -\\cf0 craigo-\\tab https://github.com/craigo-/\\par\ -\\cf0 lhmouse\\tab https://github.com/lhmouse\\par\ -\\cf0 hpwamr\\tab https://github.com/hpwamr\\par\ -\\cf0 engelhro\\tab https://github.com/engelhro\\par\ -\\cf0 AlexIljin\\tab https://github.com/AlexIljin\\par\ -\\cf0 maboroshin\\tab https://github.com/maboroshin\\par\ -\\cf0 zufuliu\\tab https://github.com/zufuliu\\par\ \\cf0 alexantr\\tab https://github.com/alexantr\\par\ +\\cf0 AlexIljin\\tab https://github.com/AlexIljin\\par\ +\\cf0 craigo-\\tab https://github.com/craigo-/\\par\ +\\cf0 engelhro\\tab https://github.com/engelhro\\par\ +\\cf0 hpwamr\\tab https://github.com/hpwamr\\par\ +\\cf0 lhmouse\\tab https://github.com/lhmouse\\par\ +\\cf0 maboroshin\\tab https://github.com/maboroshin\\par\ +\\cf0 rizonesoft\\tab https://github.com/rizonesoft\\par\ +\\cf0 xsak\\tab https://github.com/xsak\\par\ +\\cf0 zufuliu\\tab https://github.com/zufuliu\\par\ \\cf0 \\par\ " diff --git a/language/np3_af_za/strings_af_za.rc b/language/np3_af_za/strings_af_za.rc index 8d2640f41..104ac8f8d 100644 --- a/language/np3_af_za/strings_af_za.rc +++ b/language/np3_af_za/strings_af_za.rc @@ -188,7 +188,7 @@ END STRINGTABLE BEGIN - IDS_MUI_TRANSL_AUTHOR "(af-ZA) Afrikaanse vertaling deur Rizonesoft" + IDS_MUI_TRANSL_AUTHOR "(af-ZA) Afrikaanse vertaling deur rizonesoft" IDS_MUI_EXAMPLE_TEXT "The quick brown fox jumps over the lazy dog, 0123456789." IDS_MUI_ZERO_LEN_MATCH "^ Zero-Length Match" IDS_MUI_GOTO_LINE "Line (1 - %lli):" diff --git a/minipath/language/mp_af_za/strings_af_za.rc b/minipath/language/mp_af_za/strings_af_za.rc index 98683bcf9..b4f366e38 100644 --- a/minipath/language/mp_af_za/strings_af_za.rc +++ b/minipath/language/mp_af_za/strings_af_za.rc @@ -131,7 +131,7 @@ BEGIN IDS_COPYMOVE "Kies 'n bestemmingsgids." IDS_CREATELINK "Kies 'n bestemmingsgids vir die nuwe skakel." IDS_SAVESETTINGS "Stoor Instellings\nDie huidige program instellings is gestoor." - IDS_MUI_TRANSL_AUTHOR "(af-ZA) Afrikaans vertaling deur Rizonesoft" + IDS_MUI_TRANSL_AUTHOR "(af-ZA) Afrikaans vertaling deur rizonesoft" END diff --git a/minipath/src/minipath.c b/minipath/src/minipath.c index 1121941fe..0c0a2d26d 100644 --- a/minipath/src/minipath.c +++ b/minipath/src/minipath.c @@ -161,7 +161,7 @@ HMODULE g_hLngResContainer = NULL; WCHAR g_tchPrefLngLocName[LOCALE_NAME_MAX_LENGTH + 1]; LANGID g_iPrefLANGID = MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US); // 'en-US' internal default -static WCHAR* const g_tchAvailableLanguages = L"af-ZA be-BY de-DE es-ES en-GB fr-FR hu-HU ja-JP nl-NL pt-BR ru-RU zh-CN"; +static WCHAR* const g_tchAvailableLanguages = L"af-ZA be-BY de-DE en-GB es-ES fr-FR hu-HU ja-JP nl-NL pt-BR ru-RU zh-CN"; //============================================================================= diff --git a/np3portableapp/Notepad3Portable/App/AppInfo/installer.ini b/np3portableapp/Notepad3Portable/App/AppInfo/installer.ini index ccf80b2d1..13995f50b 100644 --- a/np3portableapp/Notepad3Portable/App/AppInfo/installer.ini +++ b/np3portableapp/Notepad3Portable/App/AppInfo/installer.ini @@ -16,7 +16,9 @@ BELARUSIAN=true DUTCH=true FRENCH=true GERMAN=true +HUNGARIAN=true JAPANESE=true +PORTUGUESEBR=true RUSSIAN=true SIMPCHINESE=true SPANISH=true diff --git a/np3portableapp/Notepad3Portable/App/AppInfo/installer_template.ini b/np3portableapp/Notepad3Portable/App/AppInfo/installer_template.ini index bca6ec811..6c872eab3 100644 --- a/np3portableapp/Notepad3Portable/App/AppInfo/installer_template.ini +++ b/np3portableapp/Notepad3Portable/App/AppInfo/installer_template.ini @@ -95,7 +95,7 @@ FRENCH=true GERMAN=true ;GREEK=true ;HEBREW=true -;HUNGARIAN=true +HUNGARIAN=true ;ICELANDIC=true ;IGBO=true ;INDONESIAN=true @@ -117,7 +117,7 @@ JAPANESE=true ;PASHTO=true ;POLISH=true ;PORTUGUESE=true -;PORTUGUESEBR=true +PORTUGUESEBR=true ;ROMANIAN=true RUSSIAN=true ;SERBIAN=true diff --git a/np3portableapp/Notepad3Portable/Other/Source/Notepad3.nsi b/np3portableapp/Notepad3Portable/Other/Source/Notepad3.nsi index 324e83737..1973ec22d 100644 --- a/np3portableapp/Notepad3Portable/Other/Source/Notepad3.nsi +++ b/np3portableapp/Notepad3Portable/Other/Source/Notepad3.nsi @@ -43,7 +43,7 @@ VIAddVersionKey FileDescription "Based on code from Notepad2, ® Florian Balmer VIAddVersionKey FileVersion "${VER}" VIAddVersionKey ProductVersion "${VER}" VIAddVersionKey InternalName "${PORTABLEAPPNAME}" -VIAddVersionKey LegalTrademarks "Rizonesoft® 2008-2018" +VIAddVersionKey LegalTrademarks "Rizonesoft® 2008-2019" VIAddVersionKey OriginalFilename "${DEFAULTEXE}" ;VIAddVersionKey PrivateBuild "" ;VIAddVersionKey SpecialBuild "" diff --git a/np3portableapp/build_np3portableapp.cmd b/np3portableapp/build_np3portableapp.cmd index 36aad53de..9f4663ee1 100644 --- a/np3portableapp/build_np3portableapp.cmd +++ b/np3portableapp/build_np3portableapp.cmd @@ -28,7 +28,7 @@ setlocal enableextensions :: ==================================================================================================================== -set NP3_LANGUAGE_SET=af-ZA be-BY de-DE en-GB es-ES fr-FR ja-JP nl-NL ru-RU zh-CN +set NP3_LANGUAGE_SET=af-ZA be-BY de-DE en-GB es-ES fr-FR hu-HU ja-JP nl-NL pt-BR ru-RU zh-CN :: ==================================================================================================================== diff --git a/src/Notepad3.c b/src/Notepad3.c index d14b7dc71..04b6c4677 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -85,7 +85,7 @@ static WCHAR s_wchIniFile2[MAX_PATH + 1] = { L'\0' }; static WCHAR s_wchTmpFilePath[MAX_PATH + 1] = { L'\0' }; // 'en-US' internal default -static WCHAR* const s_tchAvailableLanguages = L"af-ZA be-BY de-DE es-ES en-GB fr-FR hu-HU ja-JP nl-NL pt-BR ru-RU zh-CN"; +static WCHAR* const s_tchAvailableLanguages = L"af-ZA be-BY de-DE en-GB es-ES fr-FR hu-HU ja-JP nl-NL pt-BR ru-RU zh-CN"; static int s_iSettingsVersion = CFG_VER_CURRENT; static bool s_bEnableSaveSettings = true;