CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into Dev_DarkMode

Browse Source
This commit is contained in:
RaiKoHoff 2020-09-03 09:57:12 +02:00
commit 1178fc0b8b
27 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Build/Changes.txt
View File

@ -33,7 +33,7 @@ SUP - (S)et(UP) / Installer Package
========================================================
Current BETA/RC Version 5.20.901.(build_#) (2020-09-01)
Current BETA/RC Version 5.20.902.(build_#) (2020-09-02)
========================================================
--------------------------------------------------------
@ -102,7 +102,9 @@ ENHANCEMENT:
FIXES:
--------------------------------------------------------
[.###.#]-
[901.1]- Crash caused by buffer overflow.
[.901.2]- Buffer size calculation.
[.901.2]- Running out of occurrences bookmarks.
[.901.1]- Crash caused by buffer overflow.
[.831.1]- Recent File List (File History): Disable OK/Remove on empty list.
[.831.1]- Enhanced internal icon/bitmap handling.
[.830.1]- Remove needless function.

2
Versions/day.txt
View File

@ -1 +1 @@
901
902

1
language/np3_af_za/strings_af_za.rc
View File

@ -199,6 +199,7 @@ BEGIN
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Klik om skakel in leser oop te maak."
IDS_MUI_INF_PRSVFILEMODTM
"Die behoud van die oorspronklike tydstempel vir lêerveranderings is geaktiveer.\nHierdie opsie bly vir hierdie sessie!"
IDS_MUI_OUT_OFF_OCCMRK "Running out of Occurrence Markers (Bookmark/Highligt)!"
END
STRINGTABLE

1
language/np3_be_by/strings_be_by.rc
View File

@ -199,6 +199,7 @@ BEGIN
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Click, каб адкрыць спасылку ў браўзеры."
IDS_MUI_INF_PRSVFILEMODTM
"Захоўванне зыходняй часаадзнакі змянення файла ўключана.\nГэта опцыя застанецца ўключанай для гэтай сесіі!"
IDS_MUI_OUT_OFF_OCCMRK "Running out of Occurrence Markers (Bookmark/Highligt)!"
END
STRINGTABLE

1
language/np3_en_gb/strings_en_gb.rc
View File

@ -199,6 +199,7 @@ BEGIN
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Click to open link in browser."
IDS_MUI_INF_PRSVFILEMODTM
"Preserving original File Modification Timestamp enabled.\nThis option will stay for this session!"
IDS_MUI_OUT_OFF_OCCMRK "Running out of Occurrence Markers (Bookmark/Highligt)!"
END
STRINGTABLE

1
language/np3_es_es/strings_es_es.rc
View File

@ -199,6 +199,7 @@ BEGIN
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Cliquear para abrir el enlace en navegador."
IDS_MUI_INF_PRSVFILEMODTM
"Conservar la marca de tiempo de modificación del archivo original habilitada.\n¡Esta opción permanecerá para esta sesión!"
IDS_MUI_OUT_OFF_OCCMRK "No hay otros marcadores de ocurrencia (Marcador/Resaltar)!"
END
STRINGTABLE

1
language/np3_es_mx/strings_es_mx.rc
View File

@ -199,6 +199,7 @@ BEGIN
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Cliquear para abrir el enlace en navegador."
IDS_MUI_INF_PRSVFILEMODTM
"Conservar la marca de tiempo de modificación del archivo original habilitada.\n¡Esta opción permanecerá para esta sesión!"
IDS_MUI_OUT_OFF_OCCMRK "No hay otros marcadores de ocurrencia (Marcador/Resaltar)!"
END
STRINGTABLE

1
language/np3_fr_fr/strings_fr_fr.rc
View File

@ -199,6 +199,7 @@ BEGIN
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Clic pour ouvrir le lien dans le navigateur."
IDS_MUI_INF_PRSVFILEMODTM
"Préservation de l'horodatage de modification original du fichier activée.\nCette option restera active pour cette session !"
IDS_MUI_OUT_OFF_OCCMRK "Il n'y a pas d'autres marqueurs d'occurrence (Signet/Surbrillance)!"
END
STRINGTABLE

1
language/np3_hi_in/strings_hi_in.rc
View File

@ -199,6 +199,7 @@ BEGIN
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Click to open link in browser."
IDS_MUI_INF_PRSVFILEMODTM
"Preserving original File Modification Timestamp enabled.\nThis option will stay for this session!"
IDS_MUI_OUT_OFF_OCCMRK "Running out of Occurrence Markers (Bookmark/Highligt)!"
END
STRINGTABLE

1
language/np3_hu_hu/strings_hu_hu.rc
View File

@ -199,6 +199,7 @@ BEGIN
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Kattintás a böngészőben való megnyitáshoz."
IDS_MUI_INF_PRSVFILEMODTM
"Az eredeti fájl módosítási idejeének megőrzése opció be van kapcsolva.\nA beállítás így marad erre a munkamenetre!"
IDS_MUI_OUT_OFF_OCCMRK "Running out of Occurrence Markers (Bookmark/Highligt)!"
END
STRINGTABLE

1
language/np3_id_id/strings_id_id.rc
View File

@ -199,6 +199,7 @@ BEGIN
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Click to open link in browser."
IDS_MUI_INF_PRSVFILEMODTM
"Preserving original File Modification Timestamp enabled.\nThis option will stay for this session!"
IDS_MUI_OUT_OFF_OCCMRK "Running out of Occurrence Markers (Bookmark/Highligt)!"
END
STRINGTABLE

1
language/np3_it_it/strings_it_it.rc
View File

@ -199,6 +199,7 @@ BEGIN
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Click per aprire il link nel browser."
IDS_MUI_INF_PRSVFILEMODTM
"Conservazione della data di ultima modifica originale abilitata.\nQuesta opzione rimarrà attiva per questa sessione!"
IDS_MUI_OUT_OFF_OCCMRK "Running out of Occurrence Markers (Bookmark/Highligt)!"
END
STRINGTABLE

1
language/np3_ja_jp/strings_ja_jp.rc
View File

@ -199,6 +199,7 @@ BEGIN
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + クリック : ブラウザーでリンクを開きます。"
IDS_MUI_INF_PRSVFILEMODTM
"元ファイルの更新日時のままにします。\nこのセッションでのみ有効となります。"
IDS_MUI_OUT_OFF_OCCMRK "Running out of Occurrence Markers (Bookmark/Highligt)!"
END
STRINGTABLE

1
language/np3_ko_kr/strings_ko_kr.rc
View File

@ -199,6 +199,7 @@ BEGIN
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Click 브라우저에서 링크 열기."
IDS_MUI_INF_PRSVFILEMODTM
"기존의 파일 수정 타임스탬프를 보존합니다.\n이 옵션은 이 세션에 한에서만 적용됩니다!"
IDS_MUI_OUT_OFF_OCCMRK "Running out of Occurrence Markers (Bookmark/Highligt)!"
END
STRINGTABLE

1
language/np3_nl_nl/strings_nl_nl.rc
View File

@ -199,6 +199,7 @@ BEGIN
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Klik om de link in de browser te openen."
IDS_MUI_INF_PRSVFILEMODTM
"Tijdstempel originele bestandswijziging behouden ingeschakeld.\nDeze optie blijft voor deze sessie!"
IDS_MUI_OUT_OFF_OCCMRK "Er zijn geen andere voorval markeringen (Bladwijzer/Markeer)!"
END
STRINGTABLE

1
language/np3_pl_pl/strings_pl_pl.rc
View File

@ -199,6 +199,7 @@ BEGIN
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Kliknij, aby otworzyć link w przeglądarce."
IDS_MUI_INF_PRSVFILEMODTM
"Włączono zachowanie znacznika czasu w modyfikacji pliku.\nTa opcja pozostanie dla tej sesji!"
IDS_MUI_OUT_OFF_OCCMRK "Running out of Occurrence Markers (Bookmark/Highligt)!"
END
STRINGTABLE

1
language/np3_pt_br/strings_pt_br.rc
View File

@ -199,6 +199,7 @@ BEGIN
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Click para abrir o link no navegador."
IDS_MUI_INF_PRSVFILEMODTM
"Preservação do Timestamp original de Modificação de Arquivo habilitado.\nEsta opção ficará ativa durante esta sessão!"
IDS_MUI_OUT_OFF_OCCMRK "Running out of Occurrence Markers (Bookmark/Highligt)!"
END
STRINGTABLE

1
language/np3_pt_pt/strings_pt_pt.rc
View File

@ -199,6 +199,7 @@ BEGIN
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Clique para abrir a ligação no navegador."
IDS_MUI_INF_PRSVFILEMODTM
"Manter a data/hora de modificação original do ficheiro activada.\nEsta opção será válida para esta sessão!"
IDS_MUI_OUT_OFF_OCCMRK "Running out of Occurrence Markers (Bookmark/Highligt)!"
END
STRINGTABLE

1
language/np3_ru_ru/strings_ru_ru.rc
View File

@ -199,6 +199,7 @@ BEGIN
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Click, чтобы открыть ссылку в браузере."
IDS_MUI_INF_PRSVFILEMODTM
"Сохранение исходной метки времени изменения файла включено.\nЭта опция останется включенной для текущей сессии!"
IDS_MUI_OUT_OFF_OCCMRK "Running out of Occurrence Markers (Bookmark/Highligt)!"
END
STRINGTABLE

1
language/np3_sk_sk/strings_sk_sk.rc
View File

@ -199,6 +199,7 @@ BEGIN
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + kliknutím otvoríte prepojenie."
IDS_MUI_INF_PRSVFILEMODTM
"Zachovanie pôvodnej časovej pečiatky pri úprave súboru je povolené.\nTáto možnosť zostane len pre túto reláciu!"
IDS_MUI_OUT_OFF_OCCMRK "Running out of Occurrence Markers (Bookmark/Highligt)!"
END
STRINGTABLE

1
language/np3_sv_se/strings_sv_se.rc
View File

@ -199,6 +199,7 @@ BEGIN
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Klicka för att öppna länken i webbläsaren."
IDS_MUI_INF_PRSVFILEMODTM
"Bevarande av tidsstämpel för filmodifiering är aktiverad.\nInställningen är giltig för denna session!"
IDS_MUI_OUT_OFF_OCCMRK "Running out of Occurrence Markers (Bookmark/Highligt)!"
END
STRINGTABLE

1
language/np3_tr_tr/strings_tr_tr.rc
View File

@ -199,6 +199,7 @@ BEGIN
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Click to open link in browser."
IDS_MUI_INF_PRSVFILEMODTM
"Preserving original File Modification Timestamp enabled.\nThis option will stay for this session!"
IDS_MUI_OUT_OFF_OCCMRK "Running out of Occurrence Markers (Bookmark/Highligt)!"
END
STRINGTABLE

1
language/np3_vi_vn/strings_vi_vn.rc
View File

@ -199,6 +199,7 @@ BEGIN
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Click to open link in browser."
IDS_MUI_INF_PRSVFILEMODTM
"Preserving original File Modification Timestamp enabled.\nThis option will stay for this session!"
IDS_MUI_OUT_OFF_OCCMRK "Running out of Occurrence Markers (Bookmark/Highligt)!"
END
STRINGTABLE

1
language/np3_zh_cn/strings_zh_cn.rc
View File

@ -199,6 +199,7 @@ BEGIN
IDS_MUI_URL_OPEN_BROWSER "\n按住 Ctrl 同时点击以在浏览器中打开链接。"
IDS_MUI_INF_PRSVFILEMODTM
"已启用维持文件最后修改时间功能。\n\n本选项将在当前会话期间生效。"
IDS_MUI_OUT_OFF_OCCMRK "Running out of Occurrence Markers (Bookmark/Highligt)!"
END
STRINGTABLE

1
language/np3_zh_tw/strings_zh_tw.rc
View File

@ -199,6 +199,7 @@ BEGIN
IDS_MUI_URL_OPEN_BROWSER "\n按住 Ctrl 同時點選以在瀏覽器中打開鏈接。"
IDS_MUI_INF_PRSVFILEMODTM
"已啟用維持檔案最後修改時間功能。\n\n本選項將在目前會話期間生效。"
IDS_MUI_OUT_OFF_OCCMRK "Running out of Occurrence Markers (Bookmark/Highligt)!"
END
STRINGTABLE

2
res/Notepad3.exe.manifest.conf
View File

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.20.901.1"
version="5.20.902.1"
type="win32"
/>
<description>Notepad3 rc</description>

2
src/VersionEx.h
View File

@ -8,7 +8,7 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 20
#define VERSION_REV 901
#define VERSION_REV 902
#define VERSION_BUILD 1
#define SCINTILLA_VER 444
#define ONIGURUMA_REGEX_VER 6.9.5