From 93a92b910bbe648eb1533b57790de352845172b2 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Fri, 9 Aug 2019 18:38:31 +0200 Subject: [PATCH] + chg: Encoding (Default) Settings dialog: use positive wording for all items (suite) --- Versions/build.txt | 2 +- language/np3_af_za/dialogs_af_za.rc | 9 ++++++--- language/np3_be_by/dialogs_be_by.rc | 9 ++++++--- language/np3_es_es/dialogs_es_es.rc | 6 +++--- language/np3_fr_fr/dialogs_fr_fr.rc | 6 +++--- language/np3_hu_hu/dialogs_hu_hu.rc | 9 ++++++--- language/np3_it_it/dialogs_it_it.rc | 9 ++++++--- language/np3_ja_jp/dialogs_ja_jp.rc | 9 ++++++--- language/np3_ko_kr/dialogs_ko_kr.rc | 9 ++++++--- language/np3_nl_nl/dialogs_nl_nl.rc | 6 +++--- language/np3_pl_pl/dialogs_pl_pl.rc | 9 ++++++--- language/np3_pt_br/dialogs_pt_br.rc | 6 +++--- language/np3_ru_ru/dialogs_ru_ru.rc | 9 ++++++--- language/np3_tr_tr/dialogs_tr_tr.rc | 6 +++--- language/np3_zh_cn/dialogs_zh_cn.rc | 9 ++++++--- res/Notepad3.exe.manifest.conf | 2 +- src/VersionEx.h | 4 ++-- 17 files changed, 73 insertions(+), 46 deletions(-) diff --git a/Versions/build.txt b/Versions/build.txt index bf72017ea..7d7127b73 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -2523 +2524 diff --git a/language/np3_af_za/dialogs_af_za.rc b/language/np3_af_za/dialogs_af_za.rc index 126131153..19e1f5464 100644 --- a/language/np3_af_za/dialogs_af_za.rc +++ b/language/np3_af_za/dialogs_af_za.rc @@ -191,11 +191,14 @@ BEGIN "Button", BS_AUTOCHECKBOX | WS_TABSTOP,14,82,155,10 CONTROL "Maak 8-bit *.&nfo/diz lers in DOS-437 wyse oop.",IDC_NFOASOEM, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,94,155,10 - CONTROL "Moenie enkoderingler &tags ontleed nie.",IDC_ENCODINGFROMFILEVARS, + CONTROL "Parse encoding file &tags..",IDC_ENCODINGFROMFILEVARS, +// CONTROL "Moenie enkoderingler &tags ontleed nie.",IDC_ENCODINGFROMFILEVARS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,106,155,10 - CONTROL "Slaan &ANSI-kode opsporing oor.",IDC_NOANSICPDETECTION, + CONTROL "Perform &ANSI Code Page analysis.",IDC_NOANSICPDETECTION, +// CONTROL "Slaan &ANSI-kode opsporing oor.",IDC_NOANSICPDETECTION, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,118,155,10 - CONTROL "Slaan &UNICODE-kode opsporing oor.",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,155,10 + CONTROL "Enable &UNICODE detection.",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,155,10 +// CONTROL "Slaan &UNICODE-kode opsporing oor.",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,155,10 DEFPUSHBUTTON "OK",IDOK,87,151,50,14 PUSHBUTTON "Kanselleer",IDCANCEL,140,151,50,14 END diff --git a/language/np3_be_by/dialogs_be_by.rc b/language/np3_be_by/dialogs_be_by.rc index 1eea335df..289faa932 100644 --- a/language/np3_be_by/dialogs_be_by.rc +++ b/language/np3_be_by/dialogs_be_by.rc @@ -191,11 +191,14 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,82,141,10 CONTROL " 8- *.&nfo/diz DOS-437",IDC_NFOASOEM, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,94,182,10 - CONTROL " & ",IDC_ENCODINGFROMFILEVARS, + CONTROL "Parse encoding file &tags.",IDC_ENCODINGFROMFILEVARS, +// CONTROL " & ",IDC_ENCODINGFROMFILEVARS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,106,125,10 - CONTROL " &ANSI",IDC_NOANSICPDETECTION, + CONTROL "Perform &ANSI Code Page analysis.",IDC_NOANSICPDETECTION, +// CONTROL " &ANSI",IDC_NOANSICPDETECTION, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,118,147,10 - CONTROL " &UNICODE",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,96,10 + CONTROL "Enable &UNICODE detection",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,96,10 +// CONTROL " &UNICODE",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,96,10 DEFPUSHBUTTON "OK",IDOK,101,151,50,14 PUSHBUTTON "",IDCANCEL,154,151,50,14 END diff --git a/language/np3_es_es/dialogs_es_es.rc b/language/np3_es_es/dialogs_es_es.rc index 299fef0db..0dcdee522 100644 --- a/language/np3_es_es/dialogs_es_es.rc +++ b/language/np3_es_es/dialogs_es_es.rc @@ -191,11 +191,11 @@ BEGIN "Button", BS_AUTOCHECKBOX | WS_TABSTOP,14,82,155,10 CONTROL "Abrir archivos 8-bit *.&nfo/diz en modo DOS-437.",IDC_NFOASOEM, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,94,155,10 - CONTROL "No analizar las e&tiquetas de codificacin de archivos.",IDC_ENCODINGFROMFILEVARS, + CONTROL "Analizar las e&tiquetas de codificacin de archivos.",IDC_ENCODINGFROMFILEVARS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,106,180,10 - CONTROL "Omitir deteccin de pgina de cdigos ANSI.",IDC_NOANSICPDETECTION, + CONTROL "Realizar el anlisis de la pgina de cdigos ANSI.",IDC_NOANSICPDETECTION, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,118,180,10 - CONTROL "Omitir la deteccin &UNICODE.",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,122,10 + CONTROL "Habilitar la deteccin &UNICODE.",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,122,10 DEFPUSHBUTTON "OK",IDOK,87,151,50,14 PUSHBUTTON "Cancelar",IDCANCEL,140,151,50,14 END diff --git a/language/np3_fr_fr/dialogs_fr_fr.rc b/language/np3_fr_fr/dialogs_fr_fr.rc index 17250a8d0..4a91ce3ec 100644 --- a/language/np3_fr_fr/dialogs_fr_fr.rc +++ b/language/np3_fr_fr/dialogs_fr_fr.rc @@ -191,11 +191,11 @@ BEGIN "Button", BS_AUTOCHECKBOX | WS_TABSTOP,14,82,170,10 CONTROL "Ouvrir fichiers 8-bit *.&nfo/diz en mode DOS-437.",IDC_NFOASOEM, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,94,155,10 - CONTROL "Pas analyser les balises de codage de &fichier.",IDC_ENCODINGFROMFILEVARS, + CONTROL "Analyser les balises de codage de &fichier.",IDC_ENCODINGFROMFILEVARS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,106,168,10 - CONTROL "Sauter &ANSI Code Page dtection.",IDC_NOANSICPDETECTION, + CONTROL "Effectuer une analyse de la page de code &ANSI.",IDC_NOANSICPDETECTION, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,118,122,10 - CONTROL "Sauter &UNICODE dtection.",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,122,10 + CONTROL "Activer la dtection &UNICODE..",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,122,10 DEFPUSHBUTTON "OK",IDOK,87,151,50,14 PUSHBUTTON "Annuler",IDCANCEL,140,151,50,14 END diff --git a/language/np3_hu_hu/dialogs_hu_hu.rc b/language/np3_hu_hu/dialogs_hu_hu.rc index 65d4dad15..9bdd2b37f 100644 --- a/language/np3_hu_hu/dialogs_hu_hu.rc +++ b/language/np3_hu_hu/dialogs_hu_hu.rc @@ -191,11 +191,14 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,82,170,10 CONTROL "A 8-bit *.&nfo/diz fjlok megnyitsa DOS-437 mdban.",IDC_NFOASOEM, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,94,170,10 - CONTROL "Ne dolgozza fel a kdolsi f&jlok cmkit.",IDC_ENCODINGFROMFILEVARS, + CONTROL "Parse encoding file &tags.",IDC_ENCODINGFROMFILEVARS, +// CONTROL "Ne dolgozza fel a kdolsi f&jlok cmkit.",IDC_ENCODINGFROMFILEVARS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,106,155,10 - CONTROL "&ANSI kdlap detektls kihagysa.",IDC_NOANSICPDETECTION, + CONTROL "&Perform &ANSI Code Page analysis.",IDC_NOANSICPDETECTION, +// CONTROL "&ANSI kdlap detektls kihagysa.",IDC_NOANSICPDETECTION, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,118,122,10 - CONTROL "&UNICODE detektls kihagysa.",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,122,10 + CONTROL "Enable &UNICODE detection.",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,122,10 +// CONTROL "&UNICODE detektls kihagysa.",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,122,10 DEFPUSHBUTTON "OK",IDOK,87,151,50,14 PUSHBUTTON "Mgsem",IDCANCEL,140,151,50,14 END diff --git a/language/np3_it_it/dialogs_it_it.rc b/language/np3_it_it/dialogs_it_it.rc index ba3c63a0b..0591012bf 100644 --- a/language/np3_it_it/dialogs_it_it.rc +++ b/language/np3_it_it/dialogs_it_it.rc @@ -191,11 +191,14 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,82,1155,10 CONTROL "Apri file 8-bit *.&nfo/diz in DOS-437 mode.",IDC_NFOASOEM, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,94,155,10 - CONTROL "Non fare il parsing degli encoding file &tags.",IDC_ENCODINGFROMFILEVARS, + CONTROL "Parse encoding file &tags.",IDC_ENCODINGFROMFILEVARS, +// CONTROL "Non fare il parsing degli encoding file &tags.",IDC_ENCODINGFROMFILEVARS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,106,155,10 - CONTROL "Salta il riconoscimento della &ANSI Code Page.",IDC_NOANSICPDETECTION, + CONTROL "Perform &ANSI Code Page analysis.",IDC_NOANSICPDETECTION, +// CONTROL "Salta il riconoscimento della &ANSI Code Page.",IDC_NOANSICPDETECTION, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,118,155,10 - CONTROL "Salta il riconoscimento dell'&UNICODE.",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,122,10 + CONTROL "Enable &UNICODE detection.",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,122,10 +// CONTROL "Salta il riconoscimento dell'&UNICODE.",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,122,10 DEFPUSHBUTTON "OK",IDOK,97,151,50,14 PUSHBUTTON "Annulla",IDCANCEL,150,151,50,14 END diff --git a/language/np3_ja_jp/dialogs_ja_jp.rc b/language/np3_ja_jp/dialogs_ja_jp.rc index 29ff93bfa..9ab849820 100644 --- a/language/np3_ja_jp/dialogs_ja_jp.rc +++ b/language/np3_ja_jp/dialogs_ja_jp.rc @@ -191,11 +191,14 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,82,122,10 CONTROL "8-bit nfo/dizt@CDOS-437[hŊJ(&N)",IDC_NFOASOEM, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,94,165,10 - CONTROL "^O̕R[h̎w͂Ȃ(&T)",IDC_ENCODINGFROMFILEVARS, + CONTROL "Parse encoding file &tags(&T)",IDC_ENCODINGFROMFILEVARS, +// CONTROL "^O̕R[h̎w͂Ȃ(&T)",IDC_ENCODINGFROMFILEVARS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,106,153,10 - CONTROL "ANSI̔ʂȗ(&A)",IDC_NOANSICPDETECTION, + CONTROL "Perform &ANSI Code Page analysis(&A)",IDC_NOANSICPDETECTION, +// CONTROL "ANSI̔ʂȗ(&A)",IDC_NOANSICPDETECTION, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,118,122,10 - CONTROL "Unicode̔ʂȗ(&U)",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,122,10 + CONTROL "Enable &UNICODE detection(&U)",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,122,10 +// CONTROL "Unicode̔ʂȗ(&U)",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,122,10 DEFPUSHBUTTON "OK",IDOK,87,151,50,14 PUSHBUTTON "LZ",IDCANCEL,140,151,50,14 END diff --git a/language/np3_ko_kr/dialogs_ko_kr.rc b/language/np3_ko_kr/dialogs_ko_kr.rc index ddc1285eb..d3fec98b4 100644 --- a/language/np3_ko_kr/dialogs_ko_kr.rc +++ b/language/np3_ko_kr/dialogs_ko_kr.rc @@ -191,11 +191,14 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,82,164,10 CONTROL "8-bit *.&Nfo/Diz DOS-437 .",IDC_NFOASOEM, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,94,164,10 - CONTROL "ڵ ±׸ ؼ ʱ(&T).",IDC_ENCODINGFROMFILEVARS, + CONTROL "Parse encoding file &tags(&T).",IDC_ENCODINGFROMFILEVARS, +// CONTROL "ڵ ±׸ ؼ ʱ(&T).",IDC_ENCODINGFROMFILEVARS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,106,164,10 - CONTROL "ANSI ڵ Ǻ (&A).",IDC_NOANSICPDETECTION, + CONTROL "Perform &ANSI Code Page analysis(&A).",IDC_NOANSICPDETECTION, +// CONTROL "ANSI ڵ Ǻ (&A).",IDC_NOANSICPDETECTION, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,118,164,10 - CONTROL "ڵ Ǻ (&U).",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,164,10 + CONTROL "Enable &UNICODE detection(&U).",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,164,10 +// CONTROL "ڵ Ǻ (&U).",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,164,10 DEFPUSHBUTTON "Ȯ",IDOK,87,151,50,14 PUSHBUTTON "",IDCANCEL,140,151,50,14 END diff --git a/language/np3_nl_nl/dialogs_nl_nl.rc b/language/np3_nl_nl/dialogs_nl_nl.rc index 62f12093b..287f81a78 100644 --- a/language/np3_nl_nl/dialogs_nl_nl.rc +++ b/language/np3_nl_nl/dialogs_nl_nl.rc @@ -191,11 +191,11 @@ BEGIN "Button", BS_AUTOCHECKBOX | WS_TABSTOP,14,82,170,10 CONTROL "Openen 8-bit *.&nfo/diz bestanden in DOS-437 modus.",IDC_NFOASOEM, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,94,175,10 - CONTROL "Bestandsecoderings&tags niet analiseren.",IDC_ENCODINGFROMFILEVARS, + CONTROL "Parseer codering van bestands&tags.",IDC_ENCODINGFROMFILEVARS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,106,140,10 - CONTROL "Overslaan &ANSI Code Page detectie.",IDC_NOANSICPDETECTION, + CONTROL "Analyse van &ANSI-codepagina uitvoeren.",IDC_NOANSICPDETECTION, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,118,122,10 - CONTROL "Overslaan &UNICODE detectie.",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,122,10 + CONTROL "Schakel &UNICODE-detectie in.",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,122,10 DEFPUSHBUTTON "OK",IDOK,87,151,50,14 PUSHBUTTON "Annuleren",IDCANCEL,140,151,50,14 END diff --git a/language/np3_pl_pl/dialogs_pl_pl.rc b/language/np3_pl_pl/dialogs_pl_pl.rc index 77f5d9821..a4407faf7 100644 --- a/language/np3_pl_pl/dialogs_pl_pl.rc +++ b/language/np3_pl_pl/dialogs_pl_pl.rc @@ -191,11 +191,14 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,82,122,10 CONTROL "Otwrz 8-bitowe pliki *.&nfo/diz w trybie DOS-437.",IDC_NFOASOEM, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,94,155,10 - CONTROL "Nie uwzgldniaj znacznikw kodowania.",IDC_ENCODINGFROMFILEVARS, + CONTROL "Parse encoding file &tags.",IDC_ENCODINGFROMFILEVARS, +// CONTROL "Nie uwzgldniaj znacznikw kodowania.",IDC_ENCODINGFROMFILEVARS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,106,126,10 - CONTROL "Nie wykrywaj strony kodowej &ANSI.",IDC_NOANSICPDETECTION, + CONTROL "Perform &ANSI Code Page analysis.",IDC_NOANSICPDETECTION, +// CONTROL "Nie wykrywaj strony kodowej &ANSI.",IDC_NOANSICPDETECTION, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,118,122,10 - CONTROL "Pomi wykrywanie &UNICODE.",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,122,10 + CONTROL "Enable &UNICODE detection.",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,122,10 +// CONTROL "Pomi wykrywanie &UNICODE.",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,122,10 DEFPUSHBUTTON "OK",IDOK,87,151,50,14 PUSHBUTTON "Anuluj",IDCANCEL,140,151,50,14 END diff --git a/language/np3_pt_br/dialogs_pt_br.rc b/language/np3_pt_br/dialogs_pt_br.rc index 40db61fb6..0999983fc 100644 --- a/language/np3_pt_br/dialogs_pt_br.rc +++ b/language/np3_pt_br/dialogs_pt_br.rc @@ -191,11 +191,11 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,82,122,10 CONTROL "Open 8-bit *.&nfo/diz files in DOS-437 mode.",IDC_NFOASOEM, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,94,155,10 - CONTROL "Don't parse encoding file &tags.",IDC_ENCODINGFROMFILEVARS, + CONTROL "Parse encoding file &tags.",IDC_ENCODINGFROMFILEVARS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,106,126,10 - CONTROL "Skip &ANSI Code Page detection.",IDC_NOANSICPDETECTION, + CONTROL "Perform &ANSI Code Page detection.",IDC_NOANSICPDETECTION, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,118,122,10 - CONTROL "Skip &UNICODE detection.",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,122,10 + CONTROL "Enable &UNICODE detection.",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,122,10 DEFPUSHBUTTON "OK",IDOK,87,151,50,14 PUSHBUTTON "Cancel",IDCANCEL,140,151,50,14 END diff --git a/language/np3_ru_ru/dialogs_ru_ru.rc b/language/np3_ru_ru/dialogs_ru_ru.rc index 04a6ec36d..d29408510 100644 --- a/language/np3_ru_ru/dialogs_ru_ru.rc +++ b/language/np3_ru_ru/dialogs_ru_ru.rc @@ -191,11 +191,14 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,82,167,10 CONTROL " 8- *.&nfo/diz DOS-437",IDC_NFOASOEM, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,94,189,10 - CONTROL " & ",IDC_ENCODINGFROMFILEVARS, + CONTROL "Parse encoding file &tags",IDC_ENCODINGFROMFILEVARS, +// CONTROL " & ",IDC_ENCODINGFROMFILEVARS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,106,133,10 - CONTROL " &ANSI",IDC_NOANSICPDETECTION, + CONTROL "Perform &ANSI Code Page analysis",IDC_NOANSICPDETECTION, +// CONTROL " &ANSI",IDC_NOANSICPDETECTION, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,118,151,10 - CONTROL " &UNICODE",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,135,10 + CONTROL "Enable &UNICODE detection",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,135,10 +// CONTROL " &UNICODE",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,135,10 DEFPUSHBUTTON "OK",IDOK,101,151,50,14 PUSHBUTTON "",IDCANCEL,154,151,50,14 END diff --git a/language/np3_tr_tr/dialogs_tr_tr.rc b/language/np3_tr_tr/dialogs_tr_tr.rc index 6c2ccfbb7..153d4852b 100644 --- a/language/np3_tr_tr/dialogs_tr_tr.rc +++ b/language/np3_tr_tr/dialogs_tr_tr.rc @@ -191,11 +191,11 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,82,122,10 CONTROL "Open 8-bit *.&nfo/diz files in DOS-437 mode.",IDC_NFOASOEM, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,94,155,10 - CONTROL "Don't parse encoding file &tags.",IDC_ENCODINGFROMFILEVARS, + CONTROL "Parse encoding file &tags.",IDC_ENCODINGFROMFILEVARS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,106,126,10 - CONTROL "Skip &ANSI Code Page detection.",IDC_NOANSICPDETECTION, + CONTROL "Perform &ANSI Code Page detection.",IDC_NOANSICPDETECTION, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,118,122,10 - CONTROL "Skip &UNICODE detection.",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,122,10 + CONTROL "Enable &UNICODE detection.",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,122,10 DEFPUSHBUTTON "OK",IDOK,87,151,50,14 PUSHBUTTON "Cancel",IDCANCEL,140,151,50,14 END diff --git a/language/np3_zh_cn/dialogs_zh_cn.rc b/language/np3_zh_cn/dialogs_zh_cn.rc index bc30663f0..859a8fc27 100644 --- a/language/np3_zh_cn/dialogs_zh_cn.rc +++ b/language/np3_zh_cn/dialogs_zh_cn.rc @@ -191,11 +191,14 @@ BEGIN "Button", BS_AUTOCHECKBOX | WS_TABSTOP,14,82,122,10 CONTROL " DOS-437 ģʽ .nfo .diz ļ(&N)",IDC_NFOASOEM, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,94,166,10 - CONTROL "Ҫ(&T)",IDC_ENCODINGFROMFILEVARS, + CONTROL "Parse encoding file &tags(&T)",IDC_ENCODINGFROMFILEVARS, +// CONTROL "Ҫ(&T)",IDC_ENCODINGFROMFILEVARS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,106,166,10 - CONTROL " ANSI ҳ(&A)",IDC_NOANSICPDETECTION, + CONTROL "Perform &ANSI Code Page analysis(&A)",IDC_NOANSICPDETECTION, +// CONTROL " ANSI ҳ(&A)",IDC_NOANSICPDETECTION, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,118,166,10 - CONTROL " Unicode (&U)",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,166,10 + CONTROL "Enable &UNICODE detection(&U)",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,166,10 +// CONTROL " Unicode (&U)",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,166,10 DEFPUSHBUTTON "ȷ",IDOK,87,151,50,14 PUSHBUTTON "ȡ",IDCANCEL,140,151,50,14 END diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 678e0d500..5d368db75 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 RC2 diff --git a/src/VersionEx.h b/src/VersionEx.h index 4df90dce7..69a8db11b 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -7,8 +7,8 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 19 -#define VERSION_REV 808 -#define VERSION_BUILD 2523 +#define VERSION_REV 809 +#define VERSION_BUILD 2524 #define SCINTILLA_VER 420 #define ONIGURUMA_REGEX_VER 6.9.3 #define UCHARDET_VER 2018.09.27