Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_Lexilla

This commit is contained in:
Rainer Kottenhoff 2021-03-28 20:28:41 +02:00
commit f4aa19a10a
29 changed files with 148 additions and 11 deletions

View File

@ -476,6 +476,7 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE

View File

@ -476,6 +476,7 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE

View File

@ -476,6 +476,7 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE

View File

@ -476,6 +476,7 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE

View File

@ -476,6 +476,7 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE

View File

@ -476,6 +476,7 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE

View File

@ -476,6 +476,7 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE

View File

@ -476,6 +476,7 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE

View File

@ -476,6 +476,7 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE

View File

@ -476,6 +476,7 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE

View File

@ -476,6 +476,7 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE

View File

@ -476,6 +476,7 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE

View File

@ -476,6 +476,7 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "데코레이터"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE

View File

@ -476,6 +476,7 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE

View File

@ -476,6 +476,7 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE

View File

@ -280,9 +280,9 @@ BEGIN
CONTROL "&Nenhuma.", IDC_RADIO_BTN_A,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,99,10
CONTROL "&Mostrar mensagem.", IDC_RADIO_BTN_B,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,99,10
CONTROL "Recarregar &automaticamente.", IDC_RADIO_BTN_C,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,120,10
CONTROL "&Exclusive File Lock.", IDC_RADIO_BTN_D,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,7,43,99,10
CONTROL "Bloqueio de Arquivo &Exclusivo.", IDC_RADIO_BTN_D,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,7,43,99,10
CONTROL "&Redefinir se novo arquivo for aberto.", IDC_CHECK_BOX_A,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,125,10
CONTROL "&Monitoring Log.", IDC_CHECK_BOX_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,120,10
CONTROL "Registro de &Monitoramento.", IDC_CHECK_BOX_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,120,10
DEFPUSHBUTTON "OK",IDOK,127,7,50,14
PUSHBUTTON "Cancelar",IDCANCEL,127,24,50,14
END

View File

@ -476,6 +476,7 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE

View File

@ -64,8 +64,8 @@ BEGIN
MENUITEM "Salvar &Cópia...\tCtrl+F6", IDM_FILE_SAVECOPY
MENUITEM "Salvar com &Data/Hora do Arquivo Original\tCtrl+Alt+F6", IDM_FILE_PRESERVE_FILEMODTIME
MENUITEM SEPARATOR
MENUITEM "Apenas &Leitura File Attribute", IDM_FILE_READONLY
MENUITEM "&Lock File (Read-Shared)", IDM_FILE_LOCK_SHARE_READ
MENUITEM "Atributo de Arquivo Somente &Leitura", IDM_FILE_READONLY
MENUITEM "B&loquear Arquivo (Leitura Compartilhada)", IDM_FILE_LOCK_SHARE_READ
MENUITEM SEPARATOR
MENUITEM "Definir Senha de Cr&iptografia...", IDM_SETPASS
MENUITEM SEPARATOR

View File

@ -178,7 +178,7 @@ BEGIN
IDS_MUI_FILECHANGENOTIFY
"O presente arquivo foi modificado por um programa externo. Recarregar?"
IDS_MUI_FILECHANGENOTIFY2 "O presente arquivo foi apagado. Salvar agora?"
IDS_MUI_FILELOCK_ERROR "Can not acquire exclusive file lock for ""%s""!"
IDS_MUI_FILELOCK_ERROR "Não foi possível adquirir bloqueio de arquivo exclusivo para ""%s""!"
IDS_MUI_STICKYWINPOS "Posição de Janela Fixada foi ativada. Qualquer nova janela do Notepad3 usará as configurações de posicionamento de janela correntes."
IDS_MUI_SAVEDSETTINGS "As configurações correntes do programa foram gravadas."
IDS_MUI_CREATEINI_FAIL "Erro criando arquivo de configuração."

View File

@ -476,6 +476,7 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE

View File

@ -476,6 +476,7 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE

View File

@ -476,6 +476,7 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE

View File

@ -476,6 +476,7 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE

View File

@ -476,6 +476,7 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE

View File

@ -476,6 +476,7 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE

View File

@ -476,6 +476,7 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE

View File

@ -476,6 +476,7 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE

View File

@ -39,10 +39,54 @@ BEGIN
"#include ""../language/np3_en_us/np3_en_us.rc""\r\n"
#elif defined(MUI_BASE_LNG_AF_ZA)
"#include ""../language/np3_af_za/np3_af_za.rc""\r\n"
#elif defined(MUI_BASE_LNG_BE_BY)
"#include ""../language/np3_be_by/np3_be_by.rc""\r\n"
#elif defined(MUI_BASE_LNG_DE_DE)
"#include ""../language/np3_de_de/np3_de_de.rc""\r\n"
#elif defined(MUI_BASE_LNG_EL_GR)
"#include ""../language/np3_el_gr/np3_el_gr.rc""\r\n"
#elif defined(MUI_BASE_LNG_EN_GB)
"#include ""../language/np3_en_gb/np3_en_gb.rc""\r\n"
#elif defined(MUI_BASE_LNG_ES_419)
"#include ""../language/np3_es_419/np3_es_419.rc""\r\n"
#elif defined(MUI_BASE_LNG_ES_ES)
"#include ""../language/np3_es_es/np3_es_es.rc""\r\n"
#elif defined(MUI_BASE_LNG_FR_FR)
"#include ""../language/np3_fr_fr/np3_fr_fr.rc""\r\n"
#elif defined(MUI_BASE_LNG_HI_IN)
"#include ""../language/np3_hi_in/np3_hi_in.rc""\r\n"
#elif defined(MUI_BASE_LNG_HU_HU)
"#include ""../language/np3_hu_hu/np3_hu_hu.rc""\r\n"
#elif defined(MUI_BASE_LNG_ID_ID)
"#include ""../language/np3_id_id/np3_id_id.rc""\r\n"
#elif defined(MUI_BASE_LNG_IT_IT)
"#include ""../language/np3_it_it/np3_it_it.rc""\r\n"
#elif defined(MUI_BASE_LNG_JA_JP)
"#include ""../language/np3_ja_jp/np3_ja_jp.rc""\r\n"
#elif defined(MUI_BASE_LNG_KO_KR)
"#include ""../language/np3_ko_kr/np3_ko_kr.rc""\r\n"
#elif defined(MUI_BASE_LNG_NL_NL)
"#include ""../language/np3_nl_nl/np3_nl_nl.rc""\r\n"
#elif defined(MUI_BASE_LNG_PL_PL)
"#include ""../language/np3_pl_pl/np3_pl_pl.rc""\r\n"
#elif defined(MUI_BASE_LNG_PT_BR)
"#include ""../language/np3_pt_br/np3_pt_br.rc""\r\n"
#elif defined(MUI_BASE_LNG_PT_PT)
"#include ""../language/np3_pt_pt/np3_pt_pt.rc""\r\n"
#elif defined(MUI_BASE_LNG_RU_RU)
"#include ""../language/np3_ru_ru/np3_ru_ru.rc""\r\n"
#elif defined(MUI_BASE_LNG_SK_SK)
"#include ""../language/np3_sk_sk/np3_sk_sk.rc""\r\n"
#elif defined(MUI_BASE_LNG_SV_SE)
"#include ""../language/np3_sv_se/np3_sv_se.rc""\r\n"
#elif defined(MUI_BASE_LNG_TR_TR)
"#include ""../language/np3_tr_tr/np3_tr_tr.rc""\r\n"
#elif defined(MUI_BASE_LNG_VI_VN)
"#include ""../language/np3_vi_vn/np3_vi_vn.rc""\r\n"
#elif defined(MUI_BASE_LNG_ZH_CN)
"#include ""../language/np3_zh_cn/np3_zh_cn.rc""\r\n"
#elif defined(MUI_BASE_LNG_ZH_TW)
"#include ""../language/np3_zh_tw/np3_zh_tw.rc""\r\n"
#endif
"\0"
@ -429,14 +473,59 @@ END
// Generated from the TEXTINCLUDE 3 resource.
//
#include "Notepad3.ver"
#if defined(MUI_BASE_LNG_EN_US)
#include "../language/np3_en_us/np3_en_us.rc"
#include "../language/np3_en_us/np3_en_us.rc"
#elif defined(MUI_BASE_LNG_AF_ZA)
#include "../language/np3_af_za/np3_af_za.rc"
#include "../language/np3_af_za/np3_af_za.rc"
#elif defined(MUI_BASE_LNG_BE_BY)
#include "../language/np3_be_by/np3_be_by.rc"
#elif defined(MUI_BASE_LNG_DE_DE)
#include "../language/np3_de_de/np3_de_de.rc"
#include "../language/np3_de_de/np3_de_de.rc"
#elif defined(MUI_BASE_LNG_EL_GR)
#include "../language/np3_el_gr/np3_el_gr.rc"
#elif defined(MUI_BASE_LNG_EN_GB)
#include "../language/np3_en_gb/np3_en_gb.rc"
#elif defined(MUI_BASE_LNG_ES_419)
#include "../language/np3_es_419/np3_es_419.rc"
#elif defined(MUI_BASE_LNG_ES_ES)
#include "../language/np3_es_es/np3_es_es.rc"
#elif defined(MUI_BASE_LNG_FR_FR)
#include "../language/np3_fr_fr/np3_fr_fr.rc"
#include "../language/np3_fr_fr/np3_fr_fr.rc"
#elif defined(MUI_BASE_LNG_HI_IN)
#include "../language/np3_hi_in/np3_hi_in.rc"
#elif defined(MUI_BASE_LNG_HU_HU)
#include "../language/np3_hu_hu/np3_hu_hu.rc"
#elif defined(MUI_BASE_LNG_ID_ID)
#include "../language/np3_id_id/np3_id_id.rc"
#elif defined(MUI_BASE_LNG_IT_IT)
#include "../language/np3_it_it/np3_it_it.rc"
#elif defined(MUI_BASE_LNG_JA_JP)
#include "../language/np3_ja_jp/np3_ja_jp.rc"
#elif defined(MUI_BASE_LNG_KO_KR)
#include "../language/np3_ko_kr/np3_ko_kr.rc"
#elif defined(MUI_BASE_LNG_NL_NL)
#include "../language/np3_nl_nl/np3_nl_nl.rc"
#elif defined(MUI_BASE_LNG_PL_PL)
#include "../language/np3_pl_pl/np3_pl_pl.rc"
#elif defined(MUI_BASE_LNG_PT_BR)
#include "../language/np3_pt_br/np3_pt_br.rc"
#elif defined(MUI_BASE_LNG_PT_PT)
#include "../language/np3_pt_pt/np3_pt_pt.rc"
#elif defined(MUI_BASE_LNG_RU_RU)
#include "../language/np3_ru_ru/np3_ru_ru.rc"
#elif defined(MUI_BASE_LNG_SK_SK)
#include "../language/np3_sk_sk/np3_sk_sk.rc"
#elif defined(MUI_BASE_LNG_SV_SE)
#include "../language/np3_sv_se/np3_sv_se.rc"
#elif defined(MUI_BASE_LNG_TR_TR)
#include "../language/np3_tr_tr/np3_tr_tr.rc"
#elif defined(MUI_BASE_LNG_VI_VN)
#include "../language/np3_vi_vn/np3_vi_vn.rc"
#elif defined(MUI_BASE_LNG_ZH_CN)
#include "../language/np3_zh_cn/np3_zh_cn.rc"
#elif defined(MUI_BASE_LNG_ZH_TW)
#include "../language/np3_zh_tw/np3_zh_tw.rc"
#endif
/////////////////////////////////////////////////////////////////////////////

View File

@ -10,10 +10,11 @@
#endif
// ==========================================
// How to build a NON MUI Notepad3 version for desired Language
// 1. Comment-Out the following line
#define HAVE_DYN_LOAD_LIBS_MUI_LNGS 1
// ------------------------------------------
/// - extent Notepad3.rc file accordingly
// - extent Notepad3.rc file accordingly
// ------------------------------------------
#ifdef HAVE_DYN_LOAD_LIBS_MUI_LNGS
// currently only en-US allowed
@ -21,9 +22,32 @@
#define MUI_BASE_LNG_EN_US 1
#else
#define MUI_BASE_LNG_EN_US 1
// 2. Uncomment one of the following lines according to the desired Language
//#define MUI_BASE_LNG_AF_ZA 1
//#define MUI_BASE_LNG_BE_BY 1
//#define MUI_BASE_LNG_DE_DE 1
//#define MUI_BASE_LNG_EL_GR 1
//#define MUI_BASE_LNG_EN_GB 1
//#define MUI_BASE_LNG_ES_419 1
//#define MUI_BASE_LNG_ES_ES 1
//#define MUI_BASE_LNG_FR_FR 1
//#define MUI_BASE_LNG_HI_IN 1
//#define MUI_BASE_LNG_HU_HU 1
//#define MUI_BASE_LNG_ID_ID 1
//#define MUI_BASE_LNG_IT_IT 1
//#define MUI_BASE_LNG_JA_JP 1
//#define MUI_BASE_LNG_KO_KR 1
//#define MUI_BASE_LNG_NL_NL 1
//#define MUI_BASE_LNG_PL_PL 1
//#define MUI_BASE_LNG_PT_BR 1
//#define MUI_BASE_LNG_PT_PT 1
//#define MUI_BASE_LNG_RU_RU 1
//#define MUI_BASE_LNG_SK_SK 1
//#define MUI_BASE_LNG_SV_SE 1
//#define MUI_BASE_LNG_TR_TR 1
//#define MUI_BASE_LNG_VI_VN 1
//#define MUI_BASE_LNG_ZH_CN 1
//#define MUI_BASE_LNG_ZH_TW 1
#endif
// ==========================================