Merge pull request #2205 from hpwamr/mui

+ upd: Maintenance of the acknowledgments list.
2026-06-11 21:03:05 +08:00 · 2020-04-08 17:52:11 +02:00 · 2020-04-08 17:52:11 +02:00 · e38cb080bb
commit e38cb080bb
parent 3849bceaea a11f8fa19e
14 changed files with 14 additions and 21 deletions
--- a/Version_PAPPS.cmd
+++ b/Version_PAPPS.cmd
@ -1,6 +0,0 @@
-@echo off
-setlocal
-set _VERPATCH_=Dev_Test_2
-echo "%_VERPATCH_%">.\np3portableapp\_buildname.txt
-Version -VerPatch "%_VERPATCH_%"
-endlocal
--- a/Versions/build.txt
+++ b/Versions/build.txt
@ -1 +1 @@
-3
+4
--- a/language/common_res.rc
+++ b/language/common_res.rc
@ -118,7 +118,6 @@ IDS_MUI_ABOUT_ACKNOWLEDGES  "\
 \\cf0 lhmouse\\tab https://github.com/lhmouse\\par\
 \\cf0 ltGuillaume\\tab https://github.com/ltGuillaume\\par\
 \\cf0 maboroshin\\tab https://github.com/maboroshin\\par\
-\\cf0 marciliocn\\tab https://github.com/marciliocn\\par\
 \\cf0 RaffaeleBianc0\\tab https://github.com/RaffaeleBianc0\\par\
 \\cf0 rizonesoft\\tab https://github.com/rizonesoft\\par\
 \\cf0 ThreeLightsBeyond\\tab https://github.com/ThreeLightsBeyond\\par\
--- a/language/np3_ko_kr/strings_ko_kr.rc
+++ b/language/np3_ko_kr/strings_ko_kr.rc
@ -227,7 +227,7 @@ END

 STRINGTABLE
 BEGIN
-    IDS_MUI_TRANSL_AUTHOR   "(ko-KR) 한국어 번역 testinsovr"
+    IDS_MUI_TRANSL_AUTHOR   "(ko-KR) 한국어 번역 ghost"
    IDS_MUI_TITLE_FIXBASE   " BASE (%s)"
    IDS_MUI_TITLE_RELCUR    " +++ %s: %s - 스타일 +++"
    IDS_MUI_TITLE_FIXCUR    " %s: %s - 스타일"
--- a/language/np3_pt_br/strings_pt_br.rc
+++ b/language/np3_pt_br/strings_pt_br.rc
@ -227,7 +227,7 @@ END

 STRINGTABLE
 BEGIN
-    IDS_MUI_TRANSL_AUTHOR   "(pt-BR) Tradução em português brasileiro por marciliocn"
+    IDS_MUI_TRANSL_AUTHOR   "(pt-BR) Tradução em português brasileiro por ghost"
    IDS_MUI_TITLE_FIXBASE   " BASE (%s)"
    IDS_MUI_TITLE_RELCUR    " +++ %s: %s Style +++"
    IDS_MUI_TITLE_FIXCUR    " %s: %s Style"
--- a/language/np3_sk_sk/strings_sk_sk.rc
+++ b/language/np3_sk_sk/strings_sk_sk.rc
@ -227,7 +227,7 @@ END

 STRINGTABLE
 BEGIN
-    IDS_MUI_TRANSL_AUTHOR   "(sk-SK) Slovenský preklad od Dylino"
+    IDS_MUI_TRANSL_AUTHOR   "(sk-SK) Slovenský preklad od ghost"
    IDS_MUI_TITLE_FIXBASE   " BASE (%s)"
    IDS_MUI_TITLE_RELCUR    " +++ %s: %s Style +++"
    IDS_MUI_TITLE_FIXCUR    " %s: %s Style"
--- a/language/np3_tr_tr/strings_tr_tr.rc
+++ b/language/np3_tr_tr/strings_tr_tr.rc
@ -227,7 +227,7 @@ END

 STRINGTABLE
 BEGIN
-    IDS_MUI_TRANSL_AUTHOR   "(tr-TR) okans tarafından Türkçe çeviri"
+    IDS_MUI_TRANSL_AUTHOR   "(tr-TR) ghost tarafından Türkçe çeviri"
    IDS_MUI_TITLE_FIXBASE   " BASE (%s)"
    IDS_MUI_TITLE_RELCUR    " +++ %s: %s Style +++"
    IDS_MUI_TITLE_FIXCUR    " %s: %s Style"
--- a/minipath/language/mp_ko_kr/strings_ko_kr.rc
+++ b/minipath/language/mp_ko_kr/strings_ko_kr.rc
@ -132,7 +132,7 @@ BEGIN
    IDS_COPYMOVE            "지정 프로그램 디렉토리 선택."
    IDS_CREATELINK          "새로 만들 링크의 디렉토리를 선택하세요."
    IDS_SAVESETTINGS        "설정 저장\n현재의 프로그램 설정이 저장 되었습니다."
-    IDS_MUI_TRANSL_AUTHOR   "(ko-KR) 한국어 번역 testinsovr"
+    IDS_MUI_TRANSL_AUTHOR   "(ko-KR) 한국어 번역 ghost"
 END


--- a/minipath/language/mp_pt_br/strings_pt_br.rc
+++ b/minipath/language/mp_pt_br/strings_pt_br.rc
@ -132,7 +132,7 @@ BEGIN
    IDS_COPYMOVE            "Select a destination directory."
    IDS_CREATELINK          "Select a destination directory for the new link."
    IDS_SAVESETTINGS        "Save Settings\nThe current program settings have been saved."
-    IDS_MUI_TRANSL_AUTHOR   "(pt-BR) Tradução em português brasileiro por marciliocn"
+    IDS_MUI_TRANSL_AUTHOR   "(pt-BR) Tradução em português brasileiro por ghost"
 END


--- a/minipath/language/mp_sk_sk/strings_sk_sk.rc
+++ b/minipath/language/mp_sk_sk/strings_sk_sk.rc
@ -132,7 +132,7 @@ BEGIN
    IDS_COPYMOVE            "Select a destination directory."
    IDS_CREATELINK          "Select a destination directory for the new link."
    IDS_SAVESETTINGS        "Save Settings\nThe current program settings have been saved."
-    IDS_MUI_TRANSL_AUTHOR   "Slovenský preklad od Dylino"
+    IDS_MUI_TRANSL_AUTHOR   "Slovenský preklad od ghost"
 END


--- a/minipath/language/mp_tr_tr/strings_tr_tr.rc
+++ b/minipath/language/mp_tr_tr/strings_tr_tr.rc
@ -132,7 +132,7 @@ BEGIN
    IDS_COPYMOVE            "Select a destination directory."
    IDS_CREATELINK          "Select a destination directory for the new link."
    IDS_SAVESETTINGS        "Save Settings\nThe current program settings have been saved."
-    IDS_MUI_TRANSL_AUTHOR   "(tr-TR) okans tarafından Türkçe çeviri"
+    IDS_MUI_TRANSL_AUTHOR   "(tr-TR) ghost tarafından Türkçe çeviri"
 END


--- a/np3portableapp/_buildname.txt
+++ b/np3portableapp/_buildname.txt
@ -1 +1 @@
-"RC3"
+BETA
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@ -3,8 +3,8 @@
  <assemblyIdentity
    name="Notepad3"
    processorArchitecture="*"
-    version="5.20.408.1"
+    version="5.20.408.4"
    type="win32"
  />
-  <description>Notepad3 RC3</description>
+  <description>Notepad3 BETA</description>
 </assembly>
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@ -9,11 +9,11 @@
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 20
 #define VERSION_REV 408
-#define VERSION_BUILD 1
+#define VERSION_BUILD 4
 #define SCINTILLA_VER 432
 #define ONIGURUMA_REGEX_VER 6.9.5
 #define UCHARDET_VER 2018.09.27
 #define TINYEXPR_VER 2018.05.11
 #define UTHASH_VER 2.1.0
-#define VERSION_PATCH RC3
+#define VERSION_PATCH BETA
 #define VERSION_COMMIT_ID dkt1-amr