From 1c44eb1966e49fd7a7901aac61fe70f73e9aa0cf Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Mon, 16 Mar 2020 17:22:05 +0100 Subject: [PATCH 1/3] +upd: Minor update in "KeyboardShortcuts.txt" - add "Oniguruma_RE.txt" in Installer and NotepadPortable doc --- Build/Changes.txt | 6 +++--- Build/Docs/KeyboardShortcuts.txt | 4 ++-- Build/notepad3_setup.iss | 1 + Build/notepad3_x86_setup.iss | 1 + Versions/build.txt | 2 +- np3portableapp/build_np3portableapp.cmd | 1 + res/Notepad3.exe.manifest.conf | 2 +- src/VersionEx.h | 4 ++-- 8 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Build/Changes.txt b/Build/Changes.txt index 6e4e52d18..1f72e4b0d 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -31,14 +31,14 @@ UCD - (UCD)ARDET is an Encoding Detector Library ===================================================== -Current RC3 Version 5.20.315.(build_#) (2020-03-15) +Current RC3 Version 5.20.316.(build_#) (2020-03-16) // Version 5.20.3xx.x (xx March 2020) ===================================================== ----------------------------------------------------- NEW: ----------------------------------------------------- -- remove scaling of Toolbar image for DPI (avoid blurry images) +- Remove scaling of Toolbar image for DPI (avoid blurry images). - "Open with Notepad3" Right-Click in Explorer Context Menu. - In About Resources: Data Sharing Service from https://workupload.com/. - Automatic scrolling when dragging text near window edge. @@ -58,7 +58,7 @@ NEW: CHANGES: ----------------------------------------------------- - Update "KeyboardShortcuts.txt". -- Split undo typing sequence by line-breaks default -> true +- Split undo typing sequence by line-breaks default -> true. - Add file history to to recent docs (taskbar) jumplist. - NP3 INI file read/write using file locking (shared read / exclusive write) for multiple instances. - Reset build-of-the-day number in AppVeyor on new day. diff --git a/Build/Docs/KeyboardShortcuts.txt b/Build/Docs/KeyboardShortcuts.txt index c0710f2cc..b5a2b601f 100644 --- a/Build/Docs/KeyboardShortcuts.txt +++ b/Build/Docs/KeyboardShortcuts.txt @@ -8,7 +8,7 @@ ================================================================================ -*** Keyboard Shortcuts *** date: 2020/03/15 +*** Keyboard Shortcuts *** date: 2020/03/16 --------------------------------------------------------- @@ -21,7 +21,7 @@ Ctrl+S Save file. F6 Save file as... Ctrl+F6 Save file Copy... - Ctrl+Alt+F6 Save with Original file &Date/Time. + Ctrl+Alt+F6 Save with Original file "Date/Time". Ctrl+P Print file... Ctrl+M Run MiniPath file Browser plugin... Ctrl+Alt+H Open Recent file (History)... diff --git a/Build/notepad3_setup.iss b/Build/notepad3_setup.iss index 5b27d505b..ac989443b 100644 --- a/Build/notepad3_setup.iss +++ b/Build/notepad3_setup.iss @@ -196,6 +196,7 @@ Source: {#bindir}\Release_x86_v142\lng\zh-CN\mplng.dll.mui; DestDir: {ap Source: {#bindir}\Release_x64_v142\lng\zh-CN\np3lng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion; Check: Is64BitInstallMode() Source: {#bindir}\Release_x86_v142\lng\zh-CN\np3lng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion; Check: not Is64BitInstallMode() Source: Docs\KeyboardShortcuts.txt; DestDir: {app}\Docs; Flags: ignoreversion +Source: Docs\Oniguruma_RE.txt; DestDir: {app}\Docs; Flags: ignoreversion Source: Docs\Notepad3.txt; DestDir: {app}\Docs; Flags: ignoreversion Source: Docs\crypto\encryption-doc.txt; DestDir: {app}\Docs\crypto; Flags: ignoreversion Source: Docs\crypto\read_me.txt; DestDir: {app}\Docs\crypto; Flags: ignoreversion diff --git a/Build/notepad3_x86_setup.iss b/Build/notepad3_x86_setup.iss index cfa0cb7a8..7e888687d 100644 --- a/Build/notepad3_x86_setup.iss +++ b/Build/notepad3_x86_setup.iss @@ -152,6 +152,7 @@ Source: {#bindir}\Release_x86_v142\lng\sv-SE\np3lng.dll.mui; DestDir: {ap Source: {#bindir}\Release_x86_v142\lng\zh-CN\mplng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion Source: {#bindir}\Release_x86_v142\lng\zh-CN\np3lng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion Source: Docs\KeyboardShortcuts.txt; DestDir: {app}\Docs; Flags: ignoreversion +Source: Docs\Oniguruma_RE.txt; DestDir: {app}\Docs; Flags: ignoreversion Source: Docs\Notepad3.txt; DestDir: {app}\Docs; Flags: ignoreversion Source: Docs\crypto\encryption-doc.txt; DestDir: {app}\Docs\crypto; Flags: ignoreversion Source: Docs\crypto\read_me.txt; DestDir: {app}\Docs\crypto; Flags: ignoreversion 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/np3portableapp/build_np3portableapp.cmd b/np3portableapp/build_np3portableapp.cmd index 5ba79a49d..4f403507f 100644 --- a/np3portableapp/build_np3portableapp.cmd +++ b/np3portableapp/build_np3portableapp.cmd @@ -94,6 +94,7 @@ copy "%NP3_DISTRIB_DIR%\License.txt" "%NP3_PORTAPP_DIR%\Other\Help\License.txt" copy "%NP3_DISTRIB_DIR%\Readme.txt" "%NP3_PORTAPP_DIR%\Other\Help\Readme.txt" /Y /V copy "%NP3_DOC_DIR%\Notepad3.txt" "%NP3_PORTAPP_DIR%\Other\Help\Notepad3.txt" /Y /V copy "%NP3_DOC_DIR%\KeyboardShortcuts.txt" "%NP3_PORTAPP_DIR%\Other\Help\KeyboardShortcuts.txt" /Y /V +copy "%NP3_DOC_DIR%\Oniguruma_RE.txt" "%NP3_PORTAPP_DIR%\Other\Help\Oniguruma_RE.txt" /Y /V copy "%NP3_DOC_DIR%\crypto\encryption-doc.txt" "%NP3_PORTAPP_DIR%\Other\Help\encryption-doc.txt" /Y /V diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index afc730e77..f4af70105 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 934d0e883..877c166f4 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -9,11 +9,11 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 20 #define VERSION_REV 316 -#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 #define TINYEXPR_VER 2018.05.11 #define UTHASH_VER 2.1.0 #define VERSION_PATCH RC3 -#define VERSION_COMMIT_ID t7820-rk +#define VERSION_COMMIT_ID dkt1-amr From 61b0acb427f381a90dea3b694e8426bf0945fb9d Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Mon, 16 Mar 2020 21:31:05 +0100 Subject: [PATCH 2/3] MUI - Minor update in "Command Line Help" list - translation added loine in es-ES, fr-FR and nl-NL --- Build/Docs/KeyboardShortcuts.txt | 4 ++-- language/np3_af_za/strings_af_za.rc | 3 ++- language/np3_be_by/strings_be_by.rc | 3 ++- language/np3_de_de/strings_de_de.rc | 3 ++- language/np3_en_gb/strings_en_gb.rc | 3 ++- language/np3_en_us/strings_en_us.rc | 3 ++- language/np3_es_es/strings_es_es.rc | 3 ++- language/np3_fr_fr/strings_fr_fr.rc | 3 ++- language/np3_hu_hu/strings_hu_hu.rc | 3 ++- language/np3_it_it/strings_it_it.rc | 3 ++- language/np3_ja_jp/strings_ja_jp.rc | 1 + language/np3_ko_kr/strings_ko_kr.rc | 3 ++- language/np3_nl_nl/strings_nl_nl.rc | 3 ++- language/np3_pl_pl/strings_pl_pl.rc | 3 ++- language/np3_pt_br/strings_pt_br.rc | 3 ++- language/np3_ru_ru/strings_ru_ru.rc | 3 ++- language/np3_sk_sk/strings_sk_sk.rc | 3 ++- language/np3_sv_se/strings_sv_se.rc | 3 ++- language/np3_tr_tr/strings_tr_tr.rc | 3 ++- language/np3_zh_cn/strings_zh_cn.rc | 3 ++- 20 files changed, 39 insertions(+), 20 deletions(-) diff --git a/Build/Docs/KeyboardShortcuts.txt b/Build/Docs/KeyboardShortcuts.txt index b5a2b601f..897c01e97 100644 --- a/Build/Docs/KeyboardShortcuts.txt +++ b/Build/Docs/KeyboardShortcuts.txt @@ -385,8 +385,8 @@ /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). - or /p ,,,, [all integers] + /p Set window position and size (/p0, /ps, /pf,l,t,r,b,m) + or /p ,,,, [all integers]. /t Set window title. /i Start as tray icon. /o Keep window on top. diff --git a/language/np3_af_za/strings_af_za.rc b/language/np3_af_za/strings_af_za.rc index 84aeff970..f952b27b2 100644 --- a/language/np3_af_za/strings_af_za.rc +++ b/language/np3_af_za/strings_af_za.rc @@ -277,7 +277,8 @@ Opsies:\r\n\ /b\tMaak 'n nuwe plakbord oop om klipbordinskrywings te versamel.\r\n\ /n\tMaak altyd 'n nuwe venster oop (/ns enkele lêer instansie).\r\n\ /r\tHergebruik venster (/rs enkele lêer instansie).\r\n\ -/p\tStel venster posisie en grootte (/p0, /ps, /pf,l,t,r,b,m).\r\n\ +/p\tStel venster posisie en grootte (/p0, /ps, /pf,l,t,r,b,m)\r\n\ +\tor /p ,,,, [all integers].\r\n\ /t\tStel venster titel.\r\n\ /i\tBegin as tray ikoon.\r\n\ /o\tHou venster bo-op.\r\n\ diff --git a/language/np3_be_by/strings_be_by.rc b/language/np3_be_by/strings_be_by.rc index 72b2e91a7..91f81c1b8 100644 --- a/language/np3_be_by/strings_be_by.rc +++ b/language/np3_be_by/strings_be_by.rc @@ -277,7 +277,8 @@ Notepad3 \t[/?] [...[Кадоўка]] [...[Канчаткі радкоў]] [/e] /b\tАдкрыць новае акно для збірання змяненняў буфера абмену.\r\n\ /n\tЗаўсёды адкрываць новае акно (/ns адзін экзэмпляр файла).\r\n\ /r\tВыкарыстаць былое акно (/rs адзін экзэмпляр файла).\r\n\ -/p\tЗадаць пазіцыю і памер акна (/p0, /ps, /pf,l,t,r,b,m).\r\n\ +/p\tЗадаць пазіцыю і памер акна (/p0, /ps, /pf,l,t,r,b,m)\r\n\ +\tor /p ,,,, [all integers].\r\n\ /t\tЗадаць назву акна.\r\n\ /i\tЗапусціць значком на паліцы задач.\r\n\ /o\tЗверху іншых вокнаў.\r\n\ diff --git a/language/np3_de_de/strings_de_de.rc b/language/np3_de_de/strings_de_de.rc index 711ad5676..4c59e5bd8 100644 --- a/language/np3_de_de/strings_de_de.rc +++ b/language/np3_de_de/strings_de_de.rc @@ -277,7 +277,8 @@ Optionen:\r\n\ /b\tÖffne ein neues 'Paste Board' um die Einträge\r\n\tder Zwischenablage zu sammeln.\r\n\ /n\tÖffne immer ein neues Fenster (/ns single file instance).\r\n\ /r\tBenutze geöffnetes Fenster erneut (/rs single file instance).\r\n\ -/p\tSetze Fenster: Position und Größe (/p0, /ps, /pf,l,t,r,b,m).\r\n\ +/p\tSetze Fenster: Position und Größe (/p0, /ps, /pf,l,t,r,b,m)\r\n\ +\tor /p ,,,, [all integers].\r\n\ /t\tSetze Fenster-Titel.\r\n\ /i\tStarte als 'Tray-Icon'.\r\n\ /o\tHalte Fenster immer auf oberster Ebene.\r\n\ diff --git a/language/np3_en_gb/strings_en_gb.rc b/language/np3_en_gb/strings_en_gb.rc index c48f3cd7c..ebb633967 100644 --- a/language/np3_en_gb/strings_en_gb.rc +++ b/language/np3_en_gb/strings_en_gb.rc @@ -277,7 +277,8 @@ Options:\r\n\ /b\tOpen new paste board to collect clipboard entries.\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\ +/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m)\r\n\ +\tor /p ,,,, [all integers].\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/language/np3_en_us/strings_en_us.rc b/language/np3_en_us/strings_en_us.rc index 43922e7df..64a0a7968 100644 --- a/language/np3_en_us/strings_en_us.rc +++ b/language/np3_en_us/strings_en_us.rc @@ -277,7 +277,8 @@ Options:\r\n\ /b\tOpen new paste board to collect clipboard entries.\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\ +/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m)\r\n\ +\tor /p ,,,, [all integers].\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/language/np3_es_es/strings_es_es.rc b/language/np3_es_es/strings_es_es.rc index 2df4c50b3..c6eabb7c0 100644 --- a/language/np3_es_es/strings_es_es.rc +++ b/language/np3_es_es/strings_es_es.rc @@ -277,7 +277,8 @@ Opciones:\r\n\ /b\tAbre una nueva tabla de pegar para recoger las entradas\r\n\tdel portapapeles.\r\n\ /n\tSiempre abre una nueva ventana (/ns instancia de archivo único).\r\n\ /r\tReutilizar la ventana (/rs instancia de archivo único).\r\n\ -/p\tEstablecer el tamaño y la posición de la ventana (/p0, /ps,\r\n\t/pf,l,t,r,b,m).\r\n\ +/p\tEstablecer el tamaño y la posición de la ventana (/p0, /ps,\r\n\t/pf,l,t,r,b,m)\r\n\ +\to /p ,,,, [todos enteros].\r\n\ /t\tEstablecer el título de la ventana.\r\n\ /i\tComenzar como un icono de la barra de tareas.\r\n\ /o\tVentana siempre visible.\r\n\ diff --git a/language/np3_fr_fr/strings_fr_fr.rc b/language/np3_fr_fr/strings_fr_fr.rc index 0a08a7429..abb5b0138 100644 --- a/language/np3_fr_fr/strings_fr_fr.rc +++ b/language/np3_fr_fr/strings_fr_fr.rc @@ -277,7 +277,8 @@ Options:\r\n\ /b\tOuvrir un nouveau tableau de collage pour collecter les entrées\r\n\tdu presse-papiers.\r\n\ /n\tToujours ouvrir une nouvelle fenêtre (/ns instance\r\n\tde fichier unique).\r\n\ /r\tRéutiliser la fenêtre (/rs instance de fichier unique).\r\n\ -/p\tDéfinir la position et la taille de la fenêtre (/p0, /ps, /pf,l,t,r,b,m).\r\n\ +/p\tDéfinir la position et la taille de la fenêtre (/p0, /ps, /pf,l,t,r,b,m)\r\n\ +\tou /p ,,,, [tous entiers].\r\n\ /t\tDéfinir un titre de fenêtre.\r\n\ /i\tDémarrer en tant que icône de barre de tâches.\r\n\ /o\tFenêtre toujours visible.\r\n\ diff --git a/language/np3_hu_hu/strings_hu_hu.rc b/language/np3_hu_hu/strings_hu_hu.rc index 1560e4203..b919136b3 100644 --- a/language/np3_hu_hu/strings_hu_hu.rc +++ b/language/np3_hu_hu/strings_hu_hu.rc @@ -277,7 +277,8 @@ Opciók:\r\n\ /b\tÚj dokumentum megnyitása, ahova a vágólap tartalma gyűlik.\r\n\ /n\tMindig nyisson új ablakot (/ns egyetlen fájl példány).\r\n\ /r\tAblak újrahasznosítása (/rs egyetlen fájl példány).\r\n\ -/p\tAblak pozíció és méret beállítása (/p0, /ps, /pf,l,t,r,b,m).\r\n\ +/p\tAblak pozíció és méret beállítása (/p0, /ps, /pf,l,t,r,b,m)\r\n\ +\tor /p ,,,, [all integers].\r\n\ /t\tCímsor szövegének beállítása.\r\n\ /i\tIndítás óra melé kicsinyítve.\r\n\ /o\tAblak mindig felül.\r\n\ diff --git a/language/np3_it_it/strings_it_it.rc b/language/np3_it_it/strings_it_it.rc index 1be251c16..dac3afe2e 100644 --- a/language/np3_it_it/strings_it_it.rc +++ b/language/np3_it_it/strings_it_it.rc @@ -277,7 +277,8 @@ Opzioni:\r\n\ /b\tApri una nuova Paste Board per collezionare il testo copiato negli Appunti.\r\n\ /n\tApri sempre una nuova finestra (/ns istanza singola).\r\n\ /r\tRiutilizza finestra (/rs istanza singola).\r\n\ -/p\tImposta posizione e dimensione della finestra (/p0, /ps, /pf,l,t,r,b,m).\r\n\ +/p\tImposta posizione e dimensione della finestra (/p0, /ps, /pf,l,t,r,b,m)\r\n\ +\tor /p ,,,, [all integers].\r\n\ /t\tImposta titolo della finestra.\r\n\ /i\tAvvia come icona nella Tray.\r\n\ /o\tMantieni finestra in primo piano.\r\n\ diff --git a/language/np3_ja_jp/strings_ja_jp.rc b/language/np3_ja_jp/strings_ja_jp.rc index c6d68a5cb..2e1e1f0cc 100644 --- a/language/np3_ja_jp/strings_ja_jp.rc +++ b/language/np3_ja_jp/strings_ja_jp.rc @@ -278,6 +278,7 @@ Notepad3 \t[/?] [...[文字コード]] [...[改行コード]] [/e] [/g] [/m] [/l /n\t新しいウィンドウで開く (/ns ファイルは単一のインスタンス)\r\n\ /r\tひとつウインドウを再利用 (/rs 同じく単一のインスタンス\r\n\ /p\tウィンドウの位置とサイズを指定 [/p x,y,sizex,y[,max]] (/p0, /ps,\r\n\t/pf,l,t,r,b,m)\r\n\ +\tor /p ,,,, [all integers]\r\n\ /t\tタイトルバーの文字列を指定 [/t text]\r\n\ /i\tシステムトレイ内に起動\r\n\ /o\t常に手前に表示\r\n\ diff --git a/language/np3_ko_kr/strings_ko_kr.rc b/language/np3_ko_kr/strings_ko_kr.rc index 95fb5d5d3..e97eb99e4 100644 --- a/language/np3_ko_kr/strings_ko_kr.rc +++ b/language/np3_ko_kr/strings_ko_kr.rc @@ -277,7 +277,8 @@ Notepad3 \t[/?] [...[인코딩]] [...[줄 끝 모드]] [/e] [/g] [/m] [/l]\r\n\ /b\t클립보드 항목 수집용 붙여넣기판으로 열기.\r\n\ /n\t항상 새 창 열기 (/ns 단일 파일 인스턴스).\r\n\ /r\t윈도우 다시 사용 (/rs 단일 파일 인스턴스).\r\n\ -/p\t윈도우 위치와 크기 지정 (/p0, /ps, /pf,l,t,r,b,m).\r\n\ +/p\t윈도우 위치와 크기 지정 (/p0, /ps, /pf,l,t,r,b,m)\r\n\ +\tor /p ,,,, [all integers].\r\n\ /t\t윈도우 타이틀 지정.\r\n\ /i\t트레이 아이콘으로 실행.\r\n\ /o\t최상위 창으로.\r\n\ diff --git a/language/np3_nl_nl/strings_nl_nl.rc b/language/np3_nl_nl/strings_nl_nl.rc index 2de77af71..eab8516ac 100644 --- a/language/np3_nl_nl/strings_nl_nl.rc +++ b/language/np3_nl_nl/strings_nl_nl.rc @@ -277,7 +277,8 @@ Opties:\r\n\ /b\tOpen nieuw plakbord om de klemborditems te verzamelen.\r\n\ /n\tOpen altijd een nieuw venster (/ns één bestand instantie).\r\n\ /r\tHergebruik venster (/rs één bestand instantie).\r\n\ -/p\tStel vensterpositie en -grootte in (/p0, /ps, /pf,l,t,r,b,m).\r\n\ +/p\tStel vensterpositie en -grootte in (/p0, /ps, /pf,l,t,r,b,m)\r\n\ +\tof /p ,,,, [alle gehele getallen].\r\n\ /t\tStel de titel van het venster in.\r\n\ /i\tStart als systeemvak icoon.\r\n\ /o\tHoud het venster bovenop.\r\n\ diff --git a/language/np3_pl_pl/strings_pl_pl.rc b/language/np3_pl_pl/strings_pl_pl.rc index 16a4f3f4c..14cf42e0d 100644 --- a/language/np3_pl_pl/strings_pl_pl.rc +++ b/language/np3_pl_pl/strings_pl_pl.rc @@ -277,7 +277,8 @@ Options:\r\n\ /b\tOpen new paste board to collect clipboard entries.\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\ +/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m)\r\n\ +\tor /p ,,,, [all integers].\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/language/np3_pt_br/strings_pt_br.rc b/language/np3_pt_br/strings_pt_br.rc index f993fc51f..f720a4460 100644 --- a/language/np3_pt_br/strings_pt_br.rc +++ b/language/np3_pt_br/strings_pt_br.rc @@ -277,7 +277,8 @@ Options:\r\n\ /b\tOpen new paste board to collect clipboard entries.\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\ +/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m)\r\n\ +\tor /p ,,,, [all integers].\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/language/np3_ru_ru/strings_ru_ru.rc b/language/np3_ru_ru/strings_ru_ru.rc index 68f6951bb..85ea4459c 100644 --- a/language/np3_ru_ru/strings_ru_ru.rc +++ b/language/np3_ru_ru/strings_ru_ru.rc @@ -277,7 +277,8 @@ Notepad3 \t[/?] [...[Кодировка]] [...[Окончания строк]] [ /b\tОткрыть новое окно для сбора изменений буфера обмена.\r\n\ /n\tВсегда открывать новое окно (/ns один экземпляр файла).\r\n\ /r\tПереиспользовать окно (/rs один экземпляр файла).\r\n\ -/p\tЗадать положение и размер окна (/p0, /ps, /pf,l,t,r,b,m).\r\n\ +/p\tЗадать положение и размер окна (/p0, /ps, /pf,l,t,r,b,m)\r\n\ +\tor /p ,,,, [all integers].\r\n\ /t\tЗадать заголовок окна.\r\n\ /i\tЗапустить иконкой в области уведомлений.\r\n\ /o\tПоверх других окон.\r\n\ diff --git a/language/np3_sk_sk/strings_sk_sk.rc b/language/np3_sk_sk/strings_sk_sk.rc index f102c14aa..a666f4f5c 100644 --- a/language/np3_sk_sk/strings_sk_sk.rc +++ b/language/np3_sk_sk/strings_sk_sk.rc @@ -277,7 +277,8 @@ Options:\r\n\ /b\tOpen new paste board to collect clipboard entries.\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\ +/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m)\r\n\ +\tor /p ,,,, [all integers].\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/language/np3_sv_se/strings_sv_se.rc b/language/np3_sv_se/strings_sv_se.rc index 8087b7b55..9682d69f2 100644 --- a/language/np3_sv_se/strings_sv_se.rc +++ b/language/np3_sv_se/strings_sv_se.rc @@ -277,7 +277,8 @@ Tillval:\r\n\ /b\tÖppna urklippsbordet för att samla alla urklipp.\r\n\ /n\tÖppna alltid nytt fönster (/ns enkel filinstans).\r\n\ /r\tÅteranvänd fönster (/rs enkel filinstans).\r\n\ -/p\tAnge fönsterposition och storlek (/p0, /ps, /pf,l,t,r,b,m).\r\n\ +/p\tAnge fönsterposition och storlek (/p0, /ps, /pf,l,t,r,b,m)\r\n\ +\tor /p ,,,, [all integers].\r\n\ /t\tAnge fönstertitel.\r\n\ /i\tStarta som ikon i verktygsfältet.\r\n\ /o\tVisa alltid fönstret överst.\r\n\ diff --git a/language/np3_tr_tr/strings_tr_tr.rc b/language/np3_tr_tr/strings_tr_tr.rc index 4dc6301d8..777bd1beb 100644 --- a/language/np3_tr_tr/strings_tr_tr.rc +++ b/language/np3_tr_tr/strings_tr_tr.rc @@ -277,7 +277,8 @@ Options:\r\n\ /b\tOpen new paste board to collect clipboard entries.\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\ +/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m)\r\n\ +\tor /p ,,,, [all integers].\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/language/np3_zh_cn/strings_zh_cn.rc b/language/np3_zh_cn/strings_zh_cn.rc index 6e693bc90..789617031 100644 --- a/language/np3_zh_cn/strings_zh_cn.rc +++ b/language/np3_zh_cn/strings_zh_cn.rc @@ -277,7 +277,8 @@ Notepad3 \t[/?] [...[编码]] [...[换行符模式]] [/e] [/g] [/m] [/l]\r\n\ /b\t打开剪贴板收集窗口（自动粘贴加入到剪贴板中的内容）。\r\n\ /n\t总是打开新窗口（/ns 对于每个文件只允许打开一个实例）。\r\n\ /r\t重用已存在的窗口（/rs 对于每个文件只允许打开一个实例）。\r\n\ -/p\t设置窗口位置和大小（/p0, /ps, /pf,l,t,r,b,m）。\r\n\ +/p\t设置窗口位置和大小（/p0, /ps, /pf,l,t,r,b,m）\r\n\ +\tor /p ,,,, [all integers]。\r\n\ /t\t设置窗口标题。\r\n\ /i\t以托盘图标状态启动。\r\n\ /o\t窗口置顶。\r\n\ From 1ab41ce1feda24de1e0b211a126c1d7b417a340a Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Mon, 16 Mar 2020 21:32:27 +0100 Subject: [PATCH 3/3] + upd: Versioning files --- Versions/build.txt | 2 +- res/Notepad3.exe.manifest.conf | 2 +- src/VersionEx.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Versions/build.txt b/Versions/build.txt index 0cfbf0888..00750edc0 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -2 +3 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index f4af70105..88b25ea79 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 877c166f4..ec4388f04 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -9,7 +9,7 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 20 #define VERSION_REV 316 -#define VERSION_BUILD 2 +#define VERSION_BUILD 3 #define SCINTILLA_VER 432 #define ONIGURUMA_REGEX_VER 6.9.4 #define UCHARDET_VER 2018.09.27