diff --git a/Build/Changes.txt b/Build/Changes.txt
index b004d1afa..cd7976b02 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -31,19 +31,21 @@ UCD - (UCD)ARDET is an Encoding Detector Library
=====================================================
-Current NF Version 5.20.330.(build_#) (2020-03-30)
+Current NF Version 5.20.331.(build_#) (2020-03-31)
=====================================================
-----------------------------------------------------
NEW:
-----------------------------------------------------
-
-- Overlapping Search
+- Call Notepad3 with case-sensitive and dot-match-all flag (if applicable).
+- Add "Overlapping Search" in Find/Replace dialog window.
- Integration on "grepWinNP3", a very Powerful and Fast Search Tool in files.
-----------------------------------------------------
CHANGES:
-----------------------------------------------------
-
+- Add filepath to message on file locking error.
-----------------------------------------------------
ENHANCEMENT:
@@ -54,21 +56,22 @@ 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) (in progress).
-- Slovak (sk-SK) (to resume).
-- Turkish (tr-TR) (to resume).
+-
+-
=====================================================
@@ -235,11 +238,7 @@ REMOVED:
-----------------------------------------------------
TRANSLATIONS (MUI):
-----------------------------------------------------
-- Korean (ko-KR) (to resume).
-- Portuguese Brazilian (pt-BR) (in progress).
-- Slovak (sk-SK) (to resume).
- Swedish (sv-SE).
-- Turkish (tr-TR) (to resume).
=====================================================
@@ -309,8 +308,6 @@ REMOVED:
TRANSLATIONS (MUI):
-----------------------------------------------------
- Polish (pl-PL).
-- Portuguese Brazilian (pt-BR) (in progress).
-- Turkish (tr-TR) (in progress).
=====================================================
@@ -419,7 +416,6 @@ TRANSLATIONS (MUI):
- Hungarian (hu-HU).
- Italian (it-IT).
- Korean (ko-KR).
-- Polish (pl-PL) (in progress).
=====================================================
@@ -1501,47 +1497,3 @@ Version 1 Build 330 (24 June 2016)
------------------------------------------------------
-MAIN KNOWN ISSUES AND TO DO LIST:
------------------------------------------------------
-- Support for Fortran syntax scheme (#1766).
-- Support for kotlin syntax scheme (#1761).
-- Support for REXX syntax scheme (#1610).
-- Support for TypeScript syntax (#911).
-- Support for TOML syntax scheme (#832).
-- Selection of complex script is not properly handled (#2019).
-- Search multifiles or path (#2018).
-- Add text to multi-line to the end of another text after select with ALT+Mouse (#1911).
-- Ability to make our own language similar to notepad++ (#1902).
-- Detect Dark mode of Win10 (#1811).
-- Restore selection when reopen file (#1793).
-- Search the content of the files in a directory (#1728).
-- Can't handle files >=4GB (#1713).
-- Is there any autosave option? (#1665).
-- Make Lexer's Keyword-Lists Case Sensitive (#1647).
-- Enhancement Request: CSV Syntax Scheme (#1603).
-- Right-to-Left (RTL) Alignment (#1558).
-- Insert HTML/XML tag - remembering last inserted tag (#1532).
-- Highlight matches position in the scroll bar (#1466).
-- Custom keywords for syntax highlighter (#1336).
-- Add a Tools menu to call external programs from Notepad3 (#1332).
-- Snippets engine (#1306).
-- Multiple word editing (#1126).
-- Easy syntax customizer (#916).
-- Minimal Find/Replace with advanced expand (#914).
-- Add support to create/modify keyboard shortcuts (#595).
-- Periodic backup of unsaved documents (#512).
-- Intellegent Backup with optional versioning (#370).
-- Change of behaviour for handling folded blocks (#331).
-
------------------------------------------------------
-TRANSLATIONS (MUI):
------------------------------------------------------
-- Korean (ko-KR) (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..00750edc0 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-2
+3
diff --git a/language/np3_af_za/strings_af_za.rc b/language/np3_af_za/strings_af_za.rc
index 5d9efe7b6..321a9107b 100644
--- a/language/np3_af_za/strings_af_za.rc
+++ b/language/np3_af_za/strings_af_za.rc
@@ -126,6 +126,7 @@ 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 f152c30e1..9e0fee880 100644
--- a/language/np3_be_by/strings_be_by.rc
+++ b/language/np3_be_by/strings_be_by.rc
@@ -126,6 +126,7 @@ 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 d8e5c8c9d..cb9f35493 100644
--- a/language/np3_en_gb/strings_en_gb.rc
+++ b/language/np3_en_gb/strings_en_gb.rc
@@ -126,6 +126,7 @@ 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 d0d553dfa..837bfb927 100644
--- a/language/np3_es_es/strings_es_es.rc
+++ b/language/np3_es_es/strings_es_es.rc
@@ -126,6 +126,7 @@ 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 94891cf6e..c111f7e3d 100644
--- a/language/np3_fr_fr/strings_fr_fr.rc
+++ b/language/np3_fr_fr/strings_fr_fr.rc
@@ -126,6 +126,7 @@ 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 2069b8b8a..e076ae5b9 100644
--- a/language/np3_hu_hu/strings_hu_hu.rc
+++ b/language/np3_hu_hu/strings_hu_hu.rc
@@ -126,6 +126,7 @@ 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 00907890d..dfba6c20f 100644
--- a/language/np3_it_it/strings_it_it.rc
+++ b/language/np3_it_it/strings_it_it.rc
@@ -126,6 +126,7 @@ 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 5fc520e6f..fe4cba5c3 100644
--- a/language/np3_ja_jp/strings_ja_jp.rc
+++ b/language/np3_ja_jp/strings_ja_jp.rc
@@ -126,6 +126,7 @@ 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 3cdf39e25..b0799dcb9 100644
--- a/language/np3_ko_kr/strings_ko_kr.rc
+++ b/language/np3_ko_kr/strings_ko_kr.rc
@@ -126,6 +126,7 @@ 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 b9d726990..5388b1b1c 100644
--- a/language/np3_nl_nl/strings_nl_nl.rc
+++ b/language/np3_nl_nl/strings_nl_nl.rc
@@ -126,6 +126,7 @@ 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 812e0d7cb..3c3b255ba 100644
--- a/language/np3_pl_pl/strings_pl_pl.rc
+++ b/language/np3_pl_pl/strings_pl_pl.rc
@@ -126,6 +126,7 @@ 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 2edc06297..500161ce2 100644
--- a/language/np3_pt_br/strings_pt_br.rc
+++ b/language/np3_pt_br/strings_pt_br.rc
@@ -126,6 +126,7 @@ 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 f50ae4ad3..789adec69 100644
--- a/language/np3_ru_ru/strings_ru_ru.rc
+++ b/language/np3_ru_ru/strings_ru_ru.rc
@@ -126,6 +126,7 @@ 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 6c18eb6d6..f14ebaa2d 100644
--- a/language/np3_sk_sk/strings_sk_sk.rc
+++ b/language/np3_sk_sk/strings_sk_sk.rc
@@ -126,6 +126,7 @@ 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 d23c14cba..9fe028850 100644
--- a/language/np3_sv_se/strings_sv_se.rc
+++ b/language/np3_sv_se/strings_sv_se.rc
@@ -126,6 +126,7 @@ 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 250036772..3f97a44e7 100644
--- a/language/np3_tr_tr/strings_tr_tr.rc
+++ b/language/np3_tr_tr/strings_tr_tr.rc
@@ -126,6 +126,7 @@ 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 d2c41aeab..bd13478de 100644
--- a/language/np3_zh_cn/strings_zh_cn.rc
+++ b/language/np3_zh_cn/strings_zh_cn.rc
@@ -126,6 +126,7 @@ 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..e75ef25f3 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 ac64fac57..f505f1887 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 3
#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 t7820-rk
+#define VERSION_COMMIT_ID dkt1-amr
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
new file mode 100644
index 000000000..d9194f508
--- /dev/null
+++ b/test/test_files/encoding/Txtfiles/[ita] F (Conf=88-96%) (issue #2172).txt
@@ -0,0 +1,14 @@
+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.txt b/test/test_files/encoding/Txtfiles/deutsch_ansi.txt
similarity index 100%
rename from test/test_files/encoding/Txtfiles/deutsch.txt
rename to test/test_files/encoding/Txtfiles/deutsch_ansi.txt
diff --git a/test/test_files/encoding/Txtfiles/french.txt b/test/test_files/encoding/Txtfiles/french.txt
deleted file mode 100644
index 6b232467d..000000000
--- a/test/test_files/encoding/Txtfiles/french.txt
+++ /dev/null
@@ -1 +0,0 @@
-Et le développement continue!
\ No newline at end of file
diff --git a/test/test_files/encoding/Txtfiles/deutsch_utf8.txt b/test/test_files/encoding/UTF-8/deutsch_utf8.txt
similarity index 100%
rename from test/test_files/encoding/Txtfiles/deutsch_utf8.txt
rename to test/test_files/encoding/UTF-8/deutsch_utf8.txt