From 7e0c03d41abd24b9fe124517341359ce1c256871 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Tue, 31 Mar 2020 14:02:04 +0200 Subject: [PATCH 1/2] Revert "MUI - Add string "IDS_MUI_ERR_DLG_FORMAT" in all languages." This reverts commit f0447667f49782ce0810fd4f9f5b73eb4f365215. --- Build/Changes.txt | 13 ++++--------- Versions/build.txt | 2 +- language/np3_af_za/strings_af_za.rc | 1 - language/np3_be_by/strings_be_by.rc | 1 - language/np3_en_gb/strings_en_gb.rc | 1 - language/np3_es_es/strings_es_es.rc | 1 - language/np3_fr_fr/strings_fr_fr.rc | 1 - language/np3_hu_hu/strings_hu_hu.rc | 1 - language/np3_it_it/strings_it_it.rc | 1 - language/np3_ja_jp/strings_ja_jp.rc | 1 - language/np3_ko_kr/strings_ko_kr.rc | 1 - language/np3_nl_nl/strings_nl_nl.rc | 1 - language/np3_pl_pl/strings_pl_pl.rc | 1 - language/np3_pt_br/strings_pt_br.rc | 1 - language/np3_ru_ru/strings_ru_ru.rc | 1 - language/np3_sk_sk/strings_sk_sk.rc | 1 - language/np3_sv_se/strings_sv_se.rc | 1 - language/np3_tr_tr/strings_tr_tr.rc | 1 - language/np3_zh_cn/strings_zh_cn.rc | 1 - res/Notepad3.exe.manifest.conf | 2 +- src/VersionEx.h | 4 ++-- .../[ita] F (Conf=88-96%) (issue #2172).txt | 14 -------------- .../Txtfiles/{deutsch_ansi.txt => deutsch.txt} | 0 .../encoding/{UTF-8 => Txtfiles}/deutsch_utf8.txt | 0 test/test_files/encoding/Txtfiles/french.txt | 1 + 25 files changed, 9 insertions(+), 44 deletions(-) delete mode 100644 test/test_files/encoding/Txtfiles/[ita] F (Conf=88-96%) (issue #2172).txt rename test/test_files/encoding/Txtfiles/{deutsch_ansi.txt => deutsch.txt} (100%) rename test/test_files/encoding/{UTF-8 => Txtfiles}/deutsch_utf8.txt (100%) create mode 100644 test/test_files/encoding/Txtfiles/french.txt diff --git a/Build/Changes.txt b/Build/Changes.txt index b47884591..b004d1afa 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -31,21 +31,19 @@ UCD - (UCD)ARDET is an Encoding Detector Library ===================================================== -Current NF Version 5.20.331.(build_#) (2020-03-31) +Current NF Version 5.20.330.(build_#) (2020-03-30) ===================================================== ----------------------------------------------------- NEW: ----------------------------------------------------- - -- Call Notepad3 with case-sensitive and dot-match-all flag (if applicable). -- Add "Overlapping Search" in Find/Replace dialog window. +- Overlapping Search - Integration on "grepWinNP3", a very Powerful and Fast Search Tool in files. ----------------------------------------------------- CHANGES: ----------------------------------------------------- - -- Add filepath to message on file locking error. ----------------------------------------------------- ENHANCEMENT: @@ -56,22 +54,19 @@ ENHANCEMENT: ----------------------------------------------------- FIXES: ----------------------------------------------------- -- -- "grepWinNP3" ordered map of languages for selection box. -- Translatable error message format (msgbox). +- - DPI scaling window on display dependent. ----------------------------------------------------- REMOVED: ----------------------------------------------------- - -- ----------------------------------------------------- TRANSLATIONS (MUI): ----------------------------------------------------- - Korean (ko-KR) (to resume). -- Portuguese Brazilian (pt-BR) (to resume). +- Portuguese Brazilian (pt-BR) (in progress). - Slovak (sk-SK) (to resume). - Turkish (tr-TR) (to resume). diff --git a/Versions/build.txt b/Versions/build.txt index 0cfbf0888..d00491fd7 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -2 +1 diff --git a/language/np3_af_za/strings_af_za.rc b/language/np3_af_za/strings_af_za.rc index 321a9107b..5d9efe7b6 100644 --- a/language/np3_af_za/strings_af_za.rc +++ b/language/np3_af_za/strings_af_za.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "Kon nie ""%s"" laai nie." IDS_MUI_ERR_SAVEFILE "Kon nie ""%s"" stoor nie." - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "Geen lêerblaaier plugin is gevind nie.\nDie MiniPath-lêerblaaier plugin kan afgelaai word vanaf https://www.rizonesoft.com." IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "Geen toegang tot die gekose lêer nie!\nWil jy dit uit die lys verwyder?" diff --git a/language/np3_be_by/strings_be_by.rc b/language/np3_be_by/strings_be_by.rc index 9e0fee880..f152c30e1 100644 --- a/language/np3_be_by/strings_be_by.rc +++ b/language/np3_be_by/strings_be_by.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "Памылка чытання «%s»." IDS_MUI_ERR_SAVEFILE "Памылка захоўвання «%s»." - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "Не знойдзены плагін аглядніка файлаў.\nПлагін MiniPath можна спампаваць з сайта https://rizonesoft.com." IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "Няма доступа да выбранага файла!\nХочаце выдаліць яго са спіску?" diff --git a/language/np3_en_gb/strings_en_gb.rc b/language/np3_en_gb/strings_en_gb.rc index cb9f35493..d8e5c8c9d 100644 --- a/language/np3_en_gb/strings_en_gb.rc +++ b/language/np3_en_gb/strings_en_gb.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "Error loading ""%s""." IDS_MUI_ERR_SAVEFILE "Error saving ""%s""." - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "No file browser plugin was found.\nThe MiniPath file browser plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "No access to the selected file!\nWould you like to remove it from the list?" diff --git a/language/np3_es_es/strings_es_es.rc b/language/np3_es_es/strings_es_es.rc index 837bfb927..d0d553dfa 100644 --- a/language/np3_es_es/strings_es_es.rc +++ b/language/np3_es_es/strings_es_es.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "Error cargando ""%s""." IDS_MUI_ERR_SAVEFILE "Error guardando ""%s""." - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "No se encontró plug-in para el navegador de archivos.\nEl plug-in de navegador de archivos MiniPath se puede descargar desde https://rizonesoft.com." IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "¡No hay acceso al archivo seleccionado!\n¿Desea eliminarlo de la lista?" diff --git a/language/np3_fr_fr/strings_fr_fr.rc b/language/np3_fr_fr/strings_fr_fr.rc index c111f7e3d..94891cf6e 100644 --- a/language/np3_fr_fr/strings_fr_fr.rc +++ b/language/np3_fr_fr/strings_fr_fr.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "Erreur de chargement ""%s""." IDS_MUI_ERR_SAVEFILE "Erreur de sauvegarde ""%s""." - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "Aucun plugin de navigateur de fichiers n'a été trouvé.\nLe plugin du navigateur de fichiers MiniPath peut être téléchargé à partir de https://rizonesoft.com." IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "Pas d'accès au fichier sélectionné!\nVoulez-vous le supprimer de la liste?" diff --git a/language/np3_hu_hu/strings_hu_hu.rc b/language/np3_hu_hu/strings_hu_hu.rc index e076ae5b9..2069b8b8a 100644 --- a/language/np3_hu_hu/strings_hu_hu.rc +++ b/language/np3_hu_hu/strings_hu_hu.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "Hiba ""%s"" betöltésekor." IDS_MUI_ERR_SAVEFILE "Hiba ""%s"" mentésekor." - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "Fájlböngésző plugin nem található.\nA MiniPath fájlböngésző plugin letölthető a https://rizonesoft.com címről." IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "A kijelölt fájlhoz nincs hozzáférésünk!\nEl szeretné távolítani a listából?" diff --git a/language/np3_it_it/strings_it_it.rc b/language/np3_it_it/strings_it_it.rc index dfba6c20f..00907890d 100644 --- a/language/np3_it_it/strings_it_it.rc +++ b/language/np3_it_it/strings_it_it.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "Errore aprendo ""%s""." IDS_MUI_ERR_SAVEFILE "Errore salvando ""%s""." - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "Nessun plugin file browser trovato.\nMiniPath può essere scaricato su https://rizonesoft.com." IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "Nessun accesso al file selezionato!\nVuoi rimuoverlo dalla lista?" diff --git a/language/np3_ja_jp/strings_ja_jp.rc b/language/np3_ja_jp/strings_ja_jp.rc index fe4cba5c3..5fc520e6f 100644 --- a/language/np3_ja_jp/strings_ja_jp.rc +++ b/language/np3_ja_jp/strings_ja_jp.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "読み込み失敗 ""%s""" IDS_MUI_ERR_SAVEFILE "保存失敗 ""%s""" - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "ファイルブラウザプラグインがありません。\nこのプラグイン MiniPath は https://rizonesoft.com からダウンロードできます。" IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "選択したファイルにアクセスできません。\n一覧から除去しますか？" diff --git a/language/np3_ko_kr/strings_ko_kr.rc b/language/np3_ko_kr/strings_ko_kr.rc index b0799dcb9..3cdf39e25 100644 --- a/language/np3_ko_kr/strings_ko_kr.rc +++ b/language/np3_ko_kr/strings_ko_kr.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE """%s"" 파일을 읽는 도중 오류가 발생하였습니다." IDS_MUI_ERR_SAVEFILE """%s"" 파일을 저장하는 도중 오류가 발생하였습니다." - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "파일 브라우저 플러그인을 찾을 수 없습니다.\nMiniPath 파일 브라우저 플러그인은 https://rizonesoft.com에서 다운로드 할 수 있습니다." IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "선택한 파일에 접근할 수 없습니다!\n목록에서 제거할까요?" diff --git a/language/np3_nl_nl/strings_nl_nl.rc b/language/np3_nl_nl/strings_nl_nl.rc index 5388b1b1c..b9d726990 100644 --- a/language/np3_nl_nl/strings_nl_nl.rc +++ b/language/np3_nl_nl/strings_nl_nl.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "Fout bij laden ""%s""." IDS_MUI_ERR_SAVEFILE "Fout bij bewaren ""%s""." - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "Geen plugin voor bestandsbrowser gevonden.\nDe plugin voor de MiniPath bestandsbrowser kan worden gedownload van https://rizonesoft.com." IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "Geen toegang tot het geselecteerde bestand!\nWilt u het uit de lijst verwijderen?" diff --git a/language/np3_pl_pl/strings_pl_pl.rc b/language/np3_pl_pl/strings_pl_pl.rc index 3c3b255ba..812e0d7cb 100644 --- a/language/np3_pl_pl/strings_pl_pl.rc +++ b/language/np3_pl_pl/strings_pl_pl.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "Błąd podczas ładowania ""%s""." IDS_MUI_ERR_SAVEFILE "Błąd podczas zapisu ""%s""." - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "Nie znaleziono wtyczki przeglądarki pliku.\nWtyczkę przeglądarki pliku do MiniPath można pobrać z https://rizonesoft.com." IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "Brak dostępu do wybranego pliku!\nCzy chcesz usunąć go z listy?" diff --git a/language/np3_pt_br/strings_pt_br.rc b/language/np3_pt_br/strings_pt_br.rc index 500161ce2..2edc06297 100644 --- a/language/np3_pt_br/strings_pt_br.rc +++ b/language/np3_pt_br/strings_pt_br.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "Error loading ""%s""." IDS_MUI_ERR_SAVEFILE "Error saving ""%s""." - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "No file browser plugin was found.\nThe MiniPath file browser plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "No access to the selected file!\nWould you like to remove it from the list?" diff --git a/language/np3_ru_ru/strings_ru_ru.rc b/language/np3_ru_ru/strings_ru_ru.rc index 789adec69..f50ae4ad3 100644 --- a/language/np3_ru_ru/strings_ru_ru.rc +++ b/language/np3_ru_ru/strings_ru_ru.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "Ошибка загрузки «%s»." IDS_MUI_ERR_SAVEFILE "Ошибка сохранения «%s»." - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "Не найден плагин браузера файлов.\nПлагин MiniPath можно загрузить с сайта https://rizonesoft.com." IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "Нет доступа к выбранному файлу!\nХотите удалить его из списка?" diff --git a/language/np3_sk_sk/strings_sk_sk.rc b/language/np3_sk_sk/strings_sk_sk.rc index f14ebaa2d..6c18eb6d6 100644 --- a/language/np3_sk_sk/strings_sk_sk.rc +++ b/language/np3_sk_sk/strings_sk_sk.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "Error loading ""%s""." IDS_MUI_ERR_SAVEFILE "Error saving ""%s""." - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "No file browser plugin was found.\nThe MiniPath file browser plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "No access to the selected file!\nWould you like to remove it from the list?" diff --git a/language/np3_sv_se/strings_sv_se.rc b/language/np3_sv_se/strings_sv_se.rc index 9fe028850..d23c14cba 100644 --- a/language/np3_sv_se/strings_sv_se.rc +++ b/language/np3_sv_se/strings_sv_se.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "Fel vid laddning ""%s""." IDS_MUI_ERR_SAVEFILE "Fel vid sparande ""%s""." - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "Inget plugin för filbläddring hittades.\nMinipath filbläddrare kan laddas ner från https://rizonesoft.com." IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "Tillgång saknas för vald fil!\nVill du ta bort den från listan?" diff --git a/language/np3_tr_tr/strings_tr_tr.rc b/language/np3_tr_tr/strings_tr_tr.rc index 3f97a44e7..250036772 100644 --- a/language/np3_tr_tr/strings_tr_tr.rc +++ b/language/np3_tr_tr/strings_tr_tr.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "Error loading ""%s""." IDS_MUI_ERR_SAVEFILE "Error saving ""%s""." - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "No file browser plugin was found.\nThe MiniPath file browser plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "No access to the selected file!\nWould you like to remove it from the list?" diff --git a/language/np3_zh_cn/strings_zh_cn.rc b/language/np3_zh_cn/strings_zh_cn.rc index bd13478de..d2c41aeab 100644 --- a/language/np3_zh_cn/strings_zh_cn.rc +++ b/language/np3_zh_cn/strings_zh_cn.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "加载“%s”时遇到错误。" IDS_MUI_ERR_SAVEFILE "保存“%s”时遇到错误。" - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "无可用文件浏览器插件。\n\nMiniPath 插件可以从 https://rizonesoft.com/ 下载。" IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "指定的文件无法访问。它可能已被改名、删除或移动。\n\n从列表中删除它吗？" diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 4cc798c48..c7bb83a23 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 NF diff --git a/src/VersionEx.h b/src/VersionEx.h index e758dcea4..e0b213391 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -9,11 +9,11 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 20 #define VERSION_REV 331 -#define VERSION_BUILD 2 +#define VERSION_BUILD 1 #define SCINTILLA_VER 432 #define ONIGURUMA_REGEX_VER 6.9.4 #define UCHARDET_VER 2018.09.27 #define TINYEXPR_VER 2018.05.11 #define UTHASH_VER 2.1.0 #define VERSION_PATCH NF -#define VERSION_COMMIT_ID dkt1-amr +#define VERSION_COMMIT_ID t7820-rk diff --git a/test/test_files/encoding/Txtfiles/[ita] F (Conf=88-96%) (issue #2172).txt b/test/test_files/encoding/Txtfiles/[ita] F (Conf=88-96%) (issue #2172).txt deleted file mode 100644 index d9194f508..000000000 --- a/test/test_files/encoding/Txtfiles/[ita] F (Conf=88-96%) (issue #2172).txt +++ /dev/null @@ -1,14 +0,0 @@ -1 -00:00:58,809 --> 00:01:04,815 -"Ho attraversato molte difficolt, -perci scrivo storie allegre." - -2 -00:04:47,371 --> 00:04:49,457 -PENSIONE -AFFITTACAMERE - -3 -00:12:07,561 --> 00:12:09,271 -7 ANNI PRIMA - diff --git a/test/test_files/encoding/Txtfiles/deutsch_ansi.txt b/test/test_files/encoding/Txtfiles/deutsch.txt similarity index 100% rename from test/test_files/encoding/Txtfiles/deutsch_ansi.txt rename to test/test_files/encoding/Txtfiles/deutsch.txt diff --git a/test/test_files/encoding/UTF-8/deutsch_utf8.txt b/test/test_files/encoding/Txtfiles/deutsch_utf8.txt similarity index 100% rename from test/test_files/encoding/UTF-8/deutsch_utf8.txt rename to test/test_files/encoding/Txtfiles/deutsch_utf8.txt diff --git a/test/test_files/encoding/Txtfiles/french.txt b/test/test_files/encoding/Txtfiles/french.txt new file mode 100644 index 000000000..6b232467d --- /dev/null +++ b/test/test_files/encoding/Txtfiles/french.txt @@ -0,0 +1 @@ +Et le développement continue! \ No newline at end of file From d832de62839de4d62211d705e20759bfead36eeb Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Tue, 31 Mar 2020 14:11:51 +0200 Subject: [PATCH 2/2] MUI - Add string "IDS_MUI_ERR_DLG_FORMAT" in all languages. --- Build/Changes.txt | 13 ++++--------- Versions/build.txt | 2 +- language/np3_af_za/strings_af_za.rc | 1 - language/np3_be_by/strings_be_by.rc | 1 - language/np3_de_de/strings_de_de.rc | 1 + language/np3_en_gb/strings_en_gb.rc | 1 - language/np3_es_es/strings_es_es.rc | 1 - language/np3_fr_fr/strings_fr_fr.rc | 1 - language/np3_hu_hu/strings_hu_hu.rc | 1 - language/np3_it_it/strings_it_it.rc | 1 - language/np3_ja_jp/strings_ja_jp.rc | 1 - language/np3_ko_kr/strings_ko_kr.rc | 1 - language/np3_nl_nl/strings_nl_nl.rc | 1 - language/np3_pl_pl/strings_pl_pl.rc | 1 - language/np3_pt_br/strings_pt_br.rc | 1 - language/np3_ru_ru/strings_ru_ru.rc | 1 - language/np3_sk_sk/strings_sk_sk.rc | 1 - language/np3_sv_se/strings_sv_se.rc | 1 - language/np3_tr_tr/strings_tr_tr.rc | 1 - language/np3_zh_cn/strings_zh_cn.rc | 1 - res/Notepad3.exe.manifest.conf | 2 +- src/VersionEx.h | 4 ++-- .../[ita] F (Conf=88-96%) (issue #2172).txt | 14 -------------- .../Txtfiles/{deutsch_ansi.txt => deutsch.txt} | 0 .../encoding/{UTF-8 => Txtfiles}/deutsch_utf8.txt | 0 test/test_files/encoding/Txtfiles/french.txt | 1 + 26 files changed, 10 insertions(+), 44 deletions(-) delete mode 100644 test/test_files/encoding/Txtfiles/[ita] F (Conf=88-96%) (issue #2172).txt rename test/test_files/encoding/Txtfiles/{deutsch_ansi.txt => deutsch.txt} (100%) rename test/test_files/encoding/{UTF-8 => Txtfiles}/deutsch_utf8.txt (100%) create mode 100644 test/test_files/encoding/Txtfiles/french.txt diff --git a/Build/Changes.txt b/Build/Changes.txt index b47884591..b004d1afa 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -31,21 +31,19 @@ UCD - (UCD)ARDET is an Encoding Detector Library ===================================================== -Current NF Version 5.20.331.(build_#) (2020-03-31) +Current NF Version 5.20.330.(build_#) (2020-03-30) ===================================================== ----------------------------------------------------- NEW: ----------------------------------------------------- - -- Call Notepad3 with case-sensitive and dot-match-all flag (if applicable). -- Add "Overlapping Search" in Find/Replace dialog window. +- Overlapping Search - Integration on "grepWinNP3", a very Powerful and Fast Search Tool in files. ----------------------------------------------------- CHANGES: ----------------------------------------------------- - -- Add filepath to message on file locking error. ----------------------------------------------------- ENHANCEMENT: @@ -56,22 +54,19 @@ ENHANCEMENT: ----------------------------------------------------- FIXES: ----------------------------------------------------- -- -- "grepWinNP3" ordered map of languages for selection box. -- Translatable error message format (msgbox). +- - DPI scaling window on display dependent. ----------------------------------------------------- REMOVED: ----------------------------------------------------- - -- ----------------------------------------------------- TRANSLATIONS (MUI): ----------------------------------------------------- - Korean (ko-KR) (to resume). -- Portuguese Brazilian (pt-BR) (to resume). +- Portuguese Brazilian (pt-BR) (in progress). - Slovak (sk-SK) (to resume). - Turkish (tr-TR) (to resume). diff --git a/Versions/build.txt b/Versions/build.txt index 0cfbf0888..d00491fd7 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -2 +1 diff --git a/language/np3_af_za/strings_af_za.rc b/language/np3_af_za/strings_af_za.rc index 321a9107b..5d9efe7b6 100644 --- a/language/np3_af_za/strings_af_za.rc +++ b/language/np3_af_za/strings_af_za.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "Kon nie ""%s"" laai nie." IDS_MUI_ERR_SAVEFILE "Kon nie ""%s"" stoor nie." - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "Geen lêerblaaier plugin is gevind nie.\nDie MiniPath-lêerblaaier plugin kan afgelaai word vanaf https://www.rizonesoft.com." IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "Geen toegang tot die gekose lêer nie!\nWil jy dit uit die lys verwyder?" diff --git a/language/np3_be_by/strings_be_by.rc b/language/np3_be_by/strings_be_by.rc index 9e0fee880..f152c30e1 100644 --- a/language/np3_be_by/strings_be_by.rc +++ b/language/np3_be_by/strings_be_by.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "Памылка чытання «%s»." IDS_MUI_ERR_SAVEFILE "Памылка захоўвання «%s»." - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "Не знойдзены плагін аглядніка файлаў.\nПлагін MiniPath можна спампаваць з сайта https://rizonesoft.com." IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "Няма доступа да выбранага файла!\nХочаце выдаліць яго са спіску?" diff --git a/language/np3_de_de/strings_de_de.rc b/language/np3_de_de/strings_de_de.rc index 60135d9fa..20f0c9927 100644 --- a/language/np3_de_de/strings_de_de.rc +++ b/language/np3_de_de/strings_de_de.rc @@ -126,6 +126,7 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "Fehler beim laden ""%s""." IDS_MUI_ERR_SAVEFILE "Fehler beim speichern ""%s""." + IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "Kein Datei-Browser-Plugin gefunden.\nDas MiniPath Datei-Browser-Plugin kann hier https://rizonesoft.com herunter geladen werden." IDS_MUI_ERR_GREPWIN "Kein Datei-Suchen-Plugin gefunden.\nDas grepWinNP3 Datei-Suchen-Plugin kann hier https://rizonesoft.com herunter geladen werden." IDS_MUI_ERR_MRUDLG "Es kann nicht auf die ausgewählte Datei zugegriffen werden!\nMöchtest Du den Eintrag aus der Liste entfernen?" diff --git a/language/np3_en_gb/strings_en_gb.rc b/language/np3_en_gb/strings_en_gb.rc index cb9f35493..d8e5c8c9d 100644 --- a/language/np3_en_gb/strings_en_gb.rc +++ b/language/np3_en_gb/strings_en_gb.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "Error loading ""%s""." IDS_MUI_ERR_SAVEFILE "Error saving ""%s""." - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "No file browser plugin was found.\nThe MiniPath file browser plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "No access to the selected file!\nWould you like to remove it from the list?" diff --git a/language/np3_es_es/strings_es_es.rc b/language/np3_es_es/strings_es_es.rc index 837bfb927..d0d553dfa 100644 --- a/language/np3_es_es/strings_es_es.rc +++ b/language/np3_es_es/strings_es_es.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "Error cargando ""%s""." IDS_MUI_ERR_SAVEFILE "Error guardando ""%s""." - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "No se encontró plug-in para el navegador de archivos.\nEl plug-in de navegador de archivos MiniPath se puede descargar desde https://rizonesoft.com." IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "¡No hay acceso al archivo seleccionado!\n¿Desea eliminarlo de la lista?" diff --git a/language/np3_fr_fr/strings_fr_fr.rc b/language/np3_fr_fr/strings_fr_fr.rc index c111f7e3d..94891cf6e 100644 --- a/language/np3_fr_fr/strings_fr_fr.rc +++ b/language/np3_fr_fr/strings_fr_fr.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "Erreur de chargement ""%s""." IDS_MUI_ERR_SAVEFILE "Erreur de sauvegarde ""%s""." - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "Aucun plugin de navigateur de fichiers n'a été trouvé.\nLe plugin du navigateur de fichiers MiniPath peut être téléchargé à partir de https://rizonesoft.com." IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "Pas d'accès au fichier sélectionné!\nVoulez-vous le supprimer de la liste?" diff --git a/language/np3_hu_hu/strings_hu_hu.rc b/language/np3_hu_hu/strings_hu_hu.rc index e076ae5b9..2069b8b8a 100644 --- a/language/np3_hu_hu/strings_hu_hu.rc +++ b/language/np3_hu_hu/strings_hu_hu.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "Hiba ""%s"" betöltésekor." IDS_MUI_ERR_SAVEFILE "Hiba ""%s"" mentésekor." - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "Fájlböngésző plugin nem található.\nA MiniPath fájlböngésző plugin letölthető a https://rizonesoft.com címről." IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "A kijelölt fájlhoz nincs hozzáférésünk!\nEl szeretné távolítani a listából?" diff --git a/language/np3_it_it/strings_it_it.rc b/language/np3_it_it/strings_it_it.rc index dfba6c20f..00907890d 100644 --- a/language/np3_it_it/strings_it_it.rc +++ b/language/np3_it_it/strings_it_it.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "Errore aprendo ""%s""." IDS_MUI_ERR_SAVEFILE "Errore salvando ""%s""." - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "Nessun plugin file browser trovato.\nMiniPath può essere scaricato su https://rizonesoft.com." IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "Nessun accesso al file selezionato!\nVuoi rimuoverlo dalla lista?" diff --git a/language/np3_ja_jp/strings_ja_jp.rc b/language/np3_ja_jp/strings_ja_jp.rc index fe4cba5c3..5fc520e6f 100644 --- a/language/np3_ja_jp/strings_ja_jp.rc +++ b/language/np3_ja_jp/strings_ja_jp.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "読み込み失敗 ""%s""" IDS_MUI_ERR_SAVEFILE "保存失敗 ""%s""" - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "ファイルブラウザプラグインがありません。\nこのプラグイン MiniPath は https://rizonesoft.com からダウンロードできます。" IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "選択したファイルにアクセスできません。\n一覧から除去しますか？" diff --git a/language/np3_ko_kr/strings_ko_kr.rc b/language/np3_ko_kr/strings_ko_kr.rc index b0799dcb9..3cdf39e25 100644 --- a/language/np3_ko_kr/strings_ko_kr.rc +++ b/language/np3_ko_kr/strings_ko_kr.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE """%s"" 파일을 읽는 도중 오류가 발생하였습니다." IDS_MUI_ERR_SAVEFILE """%s"" 파일을 저장하는 도중 오류가 발생하였습니다." - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "파일 브라우저 플러그인을 찾을 수 없습니다.\nMiniPath 파일 브라우저 플러그인은 https://rizonesoft.com에서 다운로드 할 수 있습니다." IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "선택한 파일에 접근할 수 없습니다!\n목록에서 제거할까요?" diff --git a/language/np3_nl_nl/strings_nl_nl.rc b/language/np3_nl_nl/strings_nl_nl.rc index 5388b1b1c..b9d726990 100644 --- a/language/np3_nl_nl/strings_nl_nl.rc +++ b/language/np3_nl_nl/strings_nl_nl.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "Fout bij laden ""%s""." IDS_MUI_ERR_SAVEFILE "Fout bij bewaren ""%s""." - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "Geen plugin voor bestandsbrowser gevonden.\nDe plugin voor de MiniPath bestandsbrowser kan worden gedownload van https://rizonesoft.com." IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "Geen toegang tot het geselecteerde bestand!\nWilt u het uit de lijst verwijderen?" diff --git a/language/np3_pl_pl/strings_pl_pl.rc b/language/np3_pl_pl/strings_pl_pl.rc index 3c3b255ba..812e0d7cb 100644 --- a/language/np3_pl_pl/strings_pl_pl.rc +++ b/language/np3_pl_pl/strings_pl_pl.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "Błąd podczas ładowania ""%s""." IDS_MUI_ERR_SAVEFILE "Błąd podczas zapisu ""%s""." - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "Nie znaleziono wtyczki przeglądarki pliku.\nWtyczkę przeglądarki pliku do MiniPath można pobrać z https://rizonesoft.com." IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "Brak dostępu do wybranego pliku!\nCzy chcesz usunąć go z listy?" diff --git a/language/np3_pt_br/strings_pt_br.rc b/language/np3_pt_br/strings_pt_br.rc index 500161ce2..2edc06297 100644 --- a/language/np3_pt_br/strings_pt_br.rc +++ b/language/np3_pt_br/strings_pt_br.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "Error loading ""%s""." IDS_MUI_ERR_SAVEFILE "Error saving ""%s""." - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "No file browser plugin was found.\nThe MiniPath file browser plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "No access to the selected file!\nWould you like to remove it from the list?" diff --git a/language/np3_ru_ru/strings_ru_ru.rc b/language/np3_ru_ru/strings_ru_ru.rc index 789adec69..f50ae4ad3 100644 --- a/language/np3_ru_ru/strings_ru_ru.rc +++ b/language/np3_ru_ru/strings_ru_ru.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "Ошибка загрузки «%s»." IDS_MUI_ERR_SAVEFILE "Ошибка сохранения «%s»." - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "Не найден плагин браузера файлов.\nПлагин MiniPath можно загрузить с сайта https://rizonesoft.com." IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "Нет доступа к выбранному файлу!\nХотите удалить его из списка?" diff --git a/language/np3_sk_sk/strings_sk_sk.rc b/language/np3_sk_sk/strings_sk_sk.rc index f14ebaa2d..6c18eb6d6 100644 --- a/language/np3_sk_sk/strings_sk_sk.rc +++ b/language/np3_sk_sk/strings_sk_sk.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "Error loading ""%s""." IDS_MUI_ERR_SAVEFILE "Error saving ""%s""." - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "No file browser plugin was found.\nThe MiniPath file browser plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "No access to the selected file!\nWould you like to remove it from the list?" diff --git a/language/np3_sv_se/strings_sv_se.rc b/language/np3_sv_se/strings_sv_se.rc index 9fe028850..d23c14cba 100644 --- a/language/np3_sv_se/strings_sv_se.rc +++ b/language/np3_sv_se/strings_sv_se.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "Fel vid laddning ""%s""." IDS_MUI_ERR_SAVEFILE "Fel vid sparande ""%s""." - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "Inget plugin för filbläddring hittades.\nMinipath filbläddrare kan laddas ner från https://rizonesoft.com." IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "Tillgång saknas för vald fil!\nVill du ta bort den från listan?" diff --git a/language/np3_tr_tr/strings_tr_tr.rc b/language/np3_tr_tr/strings_tr_tr.rc index 3f97a44e7..250036772 100644 --- a/language/np3_tr_tr/strings_tr_tr.rc +++ b/language/np3_tr_tr/strings_tr_tr.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "Error loading ""%s""." IDS_MUI_ERR_SAVEFILE "Error saving ""%s""." - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "No file browser plugin was found.\nThe MiniPath file browser plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "No access to the selected file!\nWould you like to remove it from the list?" diff --git a/language/np3_zh_cn/strings_zh_cn.rc b/language/np3_zh_cn/strings_zh_cn.rc index bd13478de..d2c41aeab 100644 --- a/language/np3_zh_cn/strings_zh_cn.rc +++ b/language/np3_zh_cn/strings_zh_cn.rc @@ -126,7 +126,6 @@ STRINGTABLE BEGIN IDS_MUI_ERR_LOADFILE "加载“%s”时遇到错误。" IDS_MUI_ERR_SAVEFILE "保存“%s”时遇到错误。" - IDS_MUI_ERR_DLG_FORMAT "Error '%s', cause:\n%s(ID:%d)\n" IDS_MUI_ERR_BROWSE "无可用文件浏览器插件。\n\nMiniPath 插件可以从 https://rizonesoft.com/ 下载。" IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com." IDS_MUI_ERR_MRUDLG "指定的文件无法访问。它可能已被改名、删除或移动。\n\n从列表中删除它吗？" diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 4cc798c48..c7bb83a23 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 NF diff --git a/src/VersionEx.h b/src/VersionEx.h index e758dcea4..e0b213391 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -9,11 +9,11 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 20 #define VERSION_REV 331 -#define VERSION_BUILD 2 +#define VERSION_BUILD 1 #define SCINTILLA_VER 432 #define ONIGURUMA_REGEX_VER 6.9.4 #define UCHARDET_VER 2018.09.27 #define TINYEXPR_VER 2018.05.11 #define UTHASH_VER 2.1.0 #define VERSION_PATCH NF -#define VERSION_COMMIT_ID dkt1-amr +#define VERSION_COMMIT_ID t7820-rk diff --git a/test/test_files/encoding/Txtfiles/[ita] F (Conf=88-96%) (issue #2172).txt b/test/test_files/encoding/Txtfiles/[ita] F (Conf=88-96%) (issue #2172).txt deleted file mode 100644 index d9194f508..000000000 --- a/test/test_files/encoding/Txtfiles/[ita] F (Conf=88-96%) (issue #2172).txt +++ /dev/null @@ -1,14 +0,0 @@ -1 -00:00:58,809 --> 00:01:04,815 -"Ho attraversato molte difficolt, -perci scrivo storie allegre." - -2 -00:04:47,371 --> 00:04:49,457 -PENSIONE -AFFITTACAMERE - -3 -00:12:07,561 --> 00:12:09,271 -7 ANNI PRIMA - diff --git a/test/test_files/encoding/Txtfiles/deutsch_ansi.txt b/test/test_files/encoding/Txtfiles/deutsch.txt similarity index 100% rename from test/test_files/encoding/Txtfiles/deutsch_ansi.txt rename to test/test_files/encoding/Txtfiles/deutsch.txt diff --git a/test/test_files/encoding/UTF-8/deutsch_utf8.txt b/test/test_files/encoding/Txtfiles/deutsch_utf8.txt similarity index 100% rename from test/test_files/encoding/UTF-8/deutsch_utf8.txt rename to test/test_files/encoding/Txtfiles/deutsch_utf8.txt diff --git a/test/test_files/encoding/Txtfiles/french.txt b/test/test_files/encoding/Txtfiles/french.txt new file mode 100644 index 000000000..6b232467d --- /dev/null +++ b/test/test_files/encoding/Txtfiles/french.txt @@ -0,0 +1 @@ +Et le développement continue! \ No newline at end of file