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 branch 'Dev_Fixes4Release' into Dev_AccelKeys

Browse Source 
# Conflicts:
#	language/common_res.rc
#	language/np3_af_za/strings_af_za.rc
#	language/np3_be_by/strings_be_by.rc
#	language/np3_de_de/strings_de_de.rc
#	language/np3_en_gb/strings_en_gb.rc
#	language/np3_en_us/strings_en_us.rc
#	language/np3_es_es/strings_es_es.rc
#	language/np3_fr_fr/strings_fr_fr.rc
#	language/np3_ja_jp/strings_ja_jp.rc
#	language/np3_nl_nl/strings_nl_nl.rc
#	language/np3_ru_ru/strings_ru_ru.rc
#	language/np3_zh_cn/strings_zh_cn.rc
This commit is contained in:
Rainer Kottenhoff 2018-11-09 16:37:59 +01:00
commit 812cdf0793
14 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
language/common_res.h
View File

@ -122,17 +122,19 @@
#define IDS_MUI_TITLE_FIXCUR 15026
#define IDS_MUI_TITLE_RELARB 15027
#define IDS_MUI_TITLE_FIXARB 15028
#define IDS_MUI_ABOUT_RTF_1 15029
#define IDS_MUI_ABOUT_RTF_2 15030
#define IDS_MUI_ABOUT_RTF_3 15031
#define IDS_MUI_ABOUT_RTF_4 15032
#define IDS_MUI_ABOUT_RTF_5 15033
#define IDS_MUI_ABOUT_RTF_6 15034
#define IDS_MUI_ABOUT_CONTRIBS 15035
#define IDS_MUI_ABOUT_LIBS 15036
#define IDS_MUI_ABOUT_ACKNOWLEDGES 15037
#define IDS_MUI_ABOUT_MORE 15038
#define IDS_MUI_ABOUT_LICENSES 15039
#define IDS_MUI_ABOUT_RTF_0 15029
#define IDS_MUI_ABOUT_RTF_1 15030
#define IDS_MUI_ABOUT_RTF_2 15031
#define IDS_MUI_ABOUT_RTF_3 15032
#define IDS_MUI_ABOUT_RTF_4 15033
#define IDS_MUI_ABOUT_RTF_5 15034
#define IDS_MUI_ABOUT_RTF_6 15035
#define IDS_MUI_ABOUT_DEV 15036
#define IDS_MUI_ABOUT_CONTRIBS 15037
#define IDS_MUI_ABOUT_LIBS 15038
#define IDS_MUI_ABOUT_ACKNOWLEDGES 15039
#define IDS_MUI_ABOUT_MORE 15040
#define IDS_MUI_ABOUT_LICENSES 15041
#define IDS_MUI_TRANSL_AUTHOR 15050
#define IDS_MUI_ASSOCIATED_EXT 15051

BIN
language/common_res.rc
View File

Binary file not shown.

BIN
language/np3_af_za/strings_af_za.rc
View File

Binary file not shown.

BIN
language/np3_be_by/strings_be_by.rc
View File

Binary file not shown.

BIN
language/np3_de_de/strings_de_de.rc
View File

Binary file not shown.

BIN
language/np3_en_gb/strings_en_gb.rc
View File

Binary file not shown.

BIN
language/np3_en_us/strings_en_us.rc
View File

Binary file not shown.

BIN
language/np3_es_es/strings_es_es.rc
View File

Binary file not shown.

BIN
language/np3_fr_fr/strings_fr_fr.rc
View File

Binary file not shown.

BIN
language/np3_ja_jp/strings_ja_jp.rc
View File

Binary file not shown.

BIN
language/np3_nl_nl/strings_nl_nl.rc
View File

Binary file not shown.

BIN
language/np3_ru_ru/strings_ru_ru.rc
View File

Binary file not shown.

BIN
language/np3_zh_cn/strings_zh_cn.rc
View File

Binary file not shown.

6
src/Dialogs.c
View File

@ -527,8 +527,12 @@ INT_PTR CALLBACK AboutDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam
static char* pAboutInfo = NULL;
char pAboutRes[4000];
GetLngStringA(IDS_MUI_ABOUT_RTF_1, pAboutRes, COUNTOF(pAboutRes));
GetLngStringA(IDS_MUI_ABOUT_RTF_0, pAboutRes, COUNTOF(pAboutRes));
StringCchCopyA(pAboutResource, COUNTOF(pAboutResource), pAboutRes);
GetLngStringA(IDS_MUI_ABOUT_DEV, pAboutRes, COUNTOF(pAboutRes));
StringCchCatA(pAboutResource, COUNTOF(pAboutResource), pAboutRes);
GetLngStringA(IDS_MUI_ABOUT_RTF_1, pAboutRes, COUNTOF(pAboutRes));
StringCchCatA(pAboutResource, COUNTOF(pAboutResource), pAboutRes);
GetLngStringA(IDS_MUI_ABOUT_CONTRIBS, pAboutRes, COUNTOF(pAboutRes));
StringCchCatA(pAboutResource, COUNTOF(pAboutResource), pAboutRes);
GetLngStringA(IDS_MUI_ABOUT_RTF_2, pAboutRes, COUNTOF(pAboutRes));