diff --git a/Build/Changes.txt b/Build/Changes.txt
index aec2a849b..15dc96e0e 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -31,15 +31,16 @@ UCD - (UCD)ARDET is an Encoding Detector Library
 
 
 =====================================================
-Current NF Version 5.20.408.(build_#) (2020-04-08)
+Current NF Version 5.20.410.(build_#) (2020-04-10)
 =====================================================
 -----------------------------------------------------
 NEW:
 -----------------------------------------------------
 - 
+- "waifu2x" scaled std toolbar bitmaps.
 - 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.
+- Integration of "grepWinNP3", a Search Tool in files (v2.1.0.2).
 
 -----------------------------------------------------
 CHANGES:
@@ -86,7 +87,7 @@ NEW:
 -----------------------------------------------------
 - Fix DPI scaling of Toolbar bitmaps (avoid slicing by rounding errors).
 - "Open with Notepad3" Right-Click in Explorer Context Menu (install/setup version). 
-- In About Resources: Data Sharing Service from https://workupload.com/. 
+- In About Resources: Data Sharing Service from https://workupload.com. 
 - Automatic scrolling when dragging selected text near window edge (SCI).
 - break rectangular selection into multiple selection on end-of-lines (move caret).
 - Infos of screen/display/dpi for "Copy Version Info" button.
@@ -102,6 +103,7 @@ NEW:
 -----------------------------------------------------
 CHANGES:
 -----------------------------------------------------
+- Change default settings for word/long-line wrapping.
 - Update "KeyboardShortcuts.txt".
 - Split undo typing sequence by line-breaks default -> true.
 - Add file history to recent docs (taskbar) jumplist.
diff --git a/Versions/build.txt b/Versions/build.txt
index d00491fd7..0cfbf0888 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-1
+2
diff --git a/grepWinNP3/lang/Afrikaans (Suid-Afrika) [af-ZA].lang b/grepWinNP3/lang/Afrikaans (Suid-Afrika) [af-ZA].lang
index 21eaf4269..9d27adc01 100644
--- a/grepWinNP3/lang/Afrikaans (Suid-Afrika) [af-ZA].lang	
+++ b/grepWinNP3/lang/Afrikaans (Suid-Afrika) [af-ZA].lang	
@@ -27,7 +27,7 @@ msgstr ""
 # e.g. "V CS+Q" == Ctrl + Shift + 'Q'
 
 # ONLY Accelerator Keys with corresponding alphanumeric characters can be
-# updated i.e. function keys (F2), special keys (Delete, HoMe) etc. will not.
+# updated i.e. function keys (F2), special keys (Delete, Home) etc. will not.
 
 # ONLY change the msgstr field. Do NOT change any other.
 # If you do not want to change an Accelerator Key, copy msgid to msgstr
@@ -39,7 +39,7 @@ msgstr "%ld meer gevonden"
 
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
-msgstr "%path% wordt vervangen door het pad van het bestand, %line% door de juiste regel"
+msgstr "%path% wordt vervangen door het pad van het bestand, %line% door de juiste regel, %pattern% met de zoekreeks."
 
 #. Resource IDs: (119)
 msgid "&About grepWinNP3..."
@@ -176,7 +176,7 @@ msgstr "Exclusief mappen (Regex):"
 
 #. Resource IDs: (1039)
 msgid "File Names match:\nuse '|' to separate multiple text match patterns, prepen&d '-' to exclude"
-msgstr "Bestand komt overeen:\nGebruik '|' om meerdere patronen te scheiden, zet '-' vooraan om uit te sluiten"
+msgstr "Bestand komt overeen:\nGebruik '|' om meerdere patronen te schei&den, zet '-' vooraan om uit te sluiten"
 
 #. Resource IDs: (1059)
 msgid "Files"
diff --git a/grepWinNP3/lang/English (United Kingdom) [en-GB].lang b/grepWinNP3/lang/English (United Kingdom) [en-GB].lang
index e6cea8020..08255a5f3 100644
--- a/grepWinNP3/lang/English (United Kingdom) [en-GB].lang	
+++ b/grepWinNP3/lang/English (United Kingdom) [en-GB].lang	
@@ -27,7 +27,7 @@ msgstr ""
 # e.g. "V CS+Q" == Ctrl + Shift + 'Q'
 
 # ONLY Accelerator Keys with corresponding alphanumeric characters can be
-# updated i.e. function keys (F2), special keys (Delete, HoMe) etc. will not.
+# updated i.e. function keys (F2), special keys (Delete, Home) etc. will not.
 
 # ONLY change the msgstr field. Do NOT change any other.
 # If you do not want to change an Accelerator Key, copy msgid to msgstr
diff --git a/grepWinNP3/lang/English (United States) [en-US].lang b/grepWinNP3/lang/English (United States) [en-US].lang
index d781548f9..d09064be4 100644
--- a/grepWinNP3/lang/English (United States) [en-US].lang	
+++ b/grepWinNP3/lang/English (United States) [en-US].lang	
@@ -27,7 +27,7 @@ msgstr ""
 # e.g. "V CS+Q" == Ctrl + Shift + 'Q'
 
 # ONLY Accelerator Keys with corresponding alphanumeric characters can be
-# updated i.e. function keys (F2), special keys (Delete, HoMe) etc. will not.
+# updated i.e. function keys (F2), special keys (Delete, Home) etc. will not.
 
 # ONLY change the msgstr field. Do NOT change any other.
 # If you do not want to change an Accelerator Key, copy msgid to msgstr
diff --git a/grepWinNP3/lang/Español (España) [es-ES].lang b/grepWinNP3/lang/Español (España) [es-ES].lang
index fd6d60f7d..e269aac6c 100644
--- a/grepWinNP3/lang/Español (España) [es-ES].lang	
+++ b/grepWinNP3/lang/Español (España) [es-ES].lang	
@@ -27,7 +27,7 @@ msgstr ""
 # e.g. "V CS+Q" == Ctrl + Shift + 'Q'
 
 # ONLY Accelerator Keys with corresponding alphanumeric characters can be
-# updated i.e. function keys (F2), special keys (Delete, HoMe) etc. will not.
+# updated i.e. function keys (F2), special keys (Delete, Home) etc. will not.
 
 # ONLY change the msgstr field. Do NOT change any other.
 # If you do not want to change an Accelerator Key, copy msgid to msgstr
@@ -35,15 +35,15 @@ msgstr ""
 #. Resource IDs: (149)
 #, c-format
 msgid "%ld more matches"
-msgstr "%ld mas resultados"
+msgstr "%ld más resultados"
 
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
-msgstr ""
+msgstr "%path% se reemplaza con la ruta del archivo, %line% por la línea a alcanzar, %pattern% con la cadena de búsqueda"."
 
 #. Resource IDs: (119)
 msgid "&About grepWinNP3..."
-msgstr "%Acerca de grepWinNP3..."
+msgstr "&Acerca de grepWinNP3..."
 
 #. Resource IDs: (1049)
 msgid "&Replace"
@@ -67,7 +67,7 @@ msgstr "Acerca de grepWinNP3"
 
 #. Resource IDs: (1021)
 msgid "Add to Presets"
-msgstr "Agregar a predefinidos"
+msgstr "Agregar predefinidos"
 
 #. Resource IDs: (155)
 msgid "All Files"
@@ -75,7 +75,7 @@ msgstr "Todos los archivos"
 
 #. Resource IDs: (1078)
 msgid "All dates"
-msgstr ""
+msgstr "Todas las fechas"
 
 #. Resource IDs: (1005)
 msgid "All sizes"
@@ -84,11 +84,11 @@ msgstr "Todos los tamaños"
 #. Resource IDs: (124)
 #, c-format
 msgid "Are you sure you want to replace\n%s\nwith\n%s\nwithout creating backups?"
-msgstr "Estas seguro de querer reemplazar\s%s\ncon\n%s\nsin crear respaldos?"
+msgstr "¿Estas seguro de querer reemplazar\s%s\ncon\n%s\nsin crear respaldos?"
 
 #. Resource IDs: (1081)
 msgid "Between"
-msgstr ""
+msgstr "Entre fechas"
 
 #. Resource IDs: (2)
 msgid "Cancel"
@@ -96,7 +96,7 @@ msgstr "Cancelar"
 
 #. Resource IDs: (1068)
 msgid "Command line to start an editor at a specific line:"
-msgstr "Linea de comandos para iniciar un editor en la linea especificada:"
+msgstr "Línea de comandos para iniciar un editor en la línea especificada:"
 
 #. Resource IDs: (1060)
 msgid "Content"
@@ -132,7 +132,7 @@ msgstr "Crear respaldo de archivos"
 
 #. Resource IDs: (1077)
 msgid "Create backup files in a separate folder"
-msgstr "Crear respaldo de archivos en una carpeta distinta"
+msgstr "Crear respaldo de archivos en una carpeta separada"
 
 #. Resource IDs: (139)
 msgid "Date modified"
@@ -140,19 +140,19 @@ msgstr "Fecha modificado"
 
 #. Resource IDs: (137)
 msgid "Dialog"
-msgstr ""
+msgstr "Diálogo"
 
 #. Resource IDs: (1051)
 msgid "Dot matches newline"
-msgstr "Punto coincide nueva linea"
+msgstr "Punto significa nueva línea"
 
 #. Resource IDs: (1056)
 msgid "Double-Click to select a preset"
-msgstr "Doble click para seleccionar predefinido"
+msgstr "Doble clic para seleccionar predefinido"
 
 #. Resource IDs: (65535 - PopupMenu)
 msgid "Dummy"
-msgstr ""
+msgstr "Facticio"
 
 #. Resource IDs: (1067)
 msgid "Editor"
@@ -176,7 +176,7 @@ msgstr "Excluir directorios (Regex):"
 
 #. Resource IDs: (1039)
 msgid "File Names match:\nuse '|' to separate multiple text match patterns, prepen&d '-' to exclude"
-msgstr "Nombres de Archivo:\nutilice 's' para separar multiples patrones, preponga%d '-' para excluir"
+msgstr "Nombres de Archivo:\nutilice '|' para separar múltiples patrones, prefija '-' para excluir"
 
 #. Resource IDs: (1059)
 msgid "Files"
@@ -184,7 +184,7 @@ msgstr "Archivos"
 
 #. Resource IDs: (109)
 msgid "GREPWINNP3"
-msgstr "REPWI"
+msgstr "GREPWINNP3"
 
 #. Resource IDs: (156)
 msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
@@ -204,11 +204,11 @@ msgstr "Incluir subcarpetas"
 
 #. Resource IDs: (1009)
 msgid "Include system items"
-msgstr "Incluir elementos de sistema"
+msgstr "Archivos del sistema"
 
 #. Resource IDs: (153)
 msgid "Invalid path!"
-msgstr "Ruta invalida!"
+msgstr "¡Ruta invalida!"
 
 #. Resource IDs: (1019)
 msgid "KB"
@@ -216,20 +216,20 @@ msgstr "KB"
 
 #. Resource IDs: (1075)
 msgid "Language:"
-msgstr "Lenguage:"
+msgstr "Idioma :"
 
 #. Resource IDs: (1017)
 msgid "Limit search"
-msgstr "Limitar busqueda"
+msgstr "Limitar búsqueda"
 
 #. Resource IDs: (134)
 msgid "Line"
-msgstr "Linea"
+msgstr "Línea"
 
 #. Resource IDs: (150)
 #, c-format
 msgid "Line %5ld : %30s\n"
-msgstr "Linea %5ld : %30s\n"
+msgstr "Línea %5ld : %30s\n"
 
 #. Resource IDs: (135)
 msgid "Matches"
@@ -241,11 +241,11 @@ msgstr "Nombre"
 
 #. Resource IDs: (1079)
 msgid "Newer than"
-msgstr ""
+msgstr "Más nuevo que"
 
 #. Resource IDs: (115)
 msgid "Newline is matched by '.'"
-msgstr "Nueva linea coincide con '.'"
+msgstr "Nueva línea coincide con '.'"
 
 #. Resource IDs: (1)
 msgid "OK"
@@ -253,7 +253,7 @@ msgstr "OK"
 
 #. Resource IDs: (1080)
 msgid "Older than"
-msgstr ""
+msgstr "Más mayor que"
 
 #. Resource IDs: (1063)
 msgid "Only one instance"
@@ -277,7 +277,7 @@ msgstr "Ruta"
 
 #. Resource IDs: (131)
 msgid "Preset name"
-msgstr "Nombre "
+msgstr "Nombre Predifinido"
 
 #. Resource IDs: (1022, 132)
 msgid "Presets"
@@ -285,7 +285,7 @@ msgstr "Predefinidos"
 
 #. Resource IDs: (1065)
 msgid "Press F1 for help"
-msgstr "Presione F1 para ayuda"
+msgstr "Presione F1 para Ayuda"
 
 #. Resource IDs: (154)
 msgid "Programs"
@@ -293,7 +293,7 @@ msgstr "Programas"
 
 #. Resource IDs: (32775 - Menu)
 msgid "Re&name Preset"
-msgstr "Re%nombre Predefinido"
+msgstr "Re&nombrar Predefinido"
 
 #. Resource IDs: (130)
 msgid "Regex Test"
@@ -301,23 +301,23 @@ msgstr "Prueba Regex"
 
 #. Resource IDs: (1046)
 msgid "Regex match"
-msgstr "Regex coincidencias"
+msgstr "Búsqueda Regex"
 
 #. Resource IDs: (65535)
 msgid "Regex replace string:"
-msgstr "Regex de reemplazo de string:"
+msgstr "Regex reemplazar cadena:"
 
 #. Resource IDs: (1001)
 msgid "Regex search"
-msgstr "Regex busqueda"
+msgstr "Búsqueda Regex"
 
 #. Resource IDs: (65535)
 msgid "Regex search string:"
-msgstr "String de busqueda Regex:"
+msgstr "Cadena de búsqueda Regex:"
 
 #. Resource IDs: (152)
 msgid "Relative paths are not allowed. Please enter an absolute path!"
-msgstr "Rutas relativas no son permitidas. Favor ingrese ruta absoluta!"
+msgstr "¡Rutas relativas no son permitidas. ¡Favor ingrese ruta absoluta!"
 
 #. Resource IDs: (32771 - Menu)
 msgid "Remo&ve Preset"
@@ -325,7 +325,7 @@ msgstr "Eliminar Predefinido"
 
 #. Resource IDs: (106)
 msgid "Replace string"
-msgstr "String reemplazo"
+msgstr "Reemplazar cadena"
 
 #. Resource IDs: (1027)
 msgid "Replace with:"
@@ -345,7 +345,7 @@ msgstr "Buscar por:"
 
 #. Resource IDs: (1042)
 msgid "Search case-sensitive"
-msgstr "Buscar sensible mayus-minus"
+msgstr "Respetar Mayús-minús"
 
 #. Resource IDs: (1015)
 msgid "Search in"
@@ -353,20 +353,20 @@ msgstr "Buscar en"
 
 #. Resource IDs: (1018)
 msgid "Search results"
-msgstr "Resultados busqueda"
+msgstr "Resultados de la búsqueda"
 
 #. Resource IDs: (105)
 msgid "Search string"
-msgstr "String de busqueda"
+msgstr "Cadena de búsqueda"
 
 #. Resource IDs: (128)
 #, c-format
 msgid "Searched %ld files, skipped %ld files. Found %ld matches in %ld files."
-msgstr "Busque %ld archivos, omitidos %ld archivos. Encontrade %ld coincidencias en %ld archivos."
+msgstr "Busque %ld archivos, omitidos %ld archivos. Encontrado %ld coincidencias en %ld archivos."
 
 #. Resource IDs: (140)
 msgid "Select Editor Application..."
-msgstr "Seleccione Aplicacion Editora..."
+msgstr "Seleccione Aplicación Editora..."
 
 #. Resource IDs: (127)
 msgid "Select path to search"
@@ -374,7 +374,7 @@ msgstr "Seleccione ruta a buscar"
 
 #. Resource IDs: (1071)
 msgid "Settings"
-msgstr "Configuracion:"
+msgstr "Configuración"
 
 #. Resource IDs: (133)
 msgid "Size"
@@ -386,7 +386,7 @@ msgstr "Tamaño es"
 
 #. Resource IDs: (1028)
 msgid "Test regex"
-msgstr "Probar regex"
+msgstr "Probar Regex"
 
 #. Resource IDs: (136)
 msgid "Text"
@@ -394,23 +394,23 @@ msgstr "Texto"
 
 #. Resource IDs: (1048)
 msgid "Text match"
-msgstr "Texto coincidencia"
+msgstr "Texto normal"
 
 #. Resource IDs: (1002)
 msgid "Text search"
-msgstr "Texto de busqueda"
+msgstr "Texto normal"
 
 #. Resource IDs: (65535)
 msgid "The regex search string matches:"
-msgstr "La busqueda regex coincide:"
+msgstr "La búsqueda regex coincide:"
 
 #. Resource IDs: (65535)
 msgid "The resulting text after replacing:"
-msgstr "El texto resultante despues de reemplazar:"
+msgstr "El texto resultante después de reemplazar:"
 
 #. Resource IDs: (1074)
 msgid "This adds a new entry to the context menu named \"Open with Editor\""
-msgstr "Esto apgrega una nueva entrada al menu de contexto llamado \"Abrir con Editor\""
+msgstr "Esto agrega una nueva entrada al menú de contexto llamado \"Abrir con Editor\""
 
 #. Resource IDs: (1053)
 msgid "Treat files as UTF-8"
@@ -422,11 +422,11 @@ msgstr "Visite nuestro sitio"
 
 #. Resource IDs: (116)
 msgid "a regular expression used for searching. Press F1 for more info."
-msgstr "una expresion regular utilizada para buscar. Presione F1 para mas info."
+msgstr "una expresión regular utilizada para buscar. Presione F1 para más info."
 
 #. Resource IDs: (125)
 msgid "an empty string"
-msgstr "una cadena vacia"
+msgstr "una cadena vacía"
 
 #. Resource IDs: (130)
 msgid "binary"
@@ -434,7 +434,7 @@ msgstr "binario"
 
 #. Resource IDs: (118)
 msgid "click to edit the text as a multiline text"
-msgstr "clcik para editar el texto como texto multilineas"
+msgstr "clic para editar el texto como texto multilíneas"
 
 #. Resource IDs: (121)
 msgid "equal to"
@@ -442,7 +442,7 @@ msgstr "igual a"
 
 #. Resource IDs: (122)
 msgid "greater than"
-msgstr "mayor a"
+msgstr "mayor que"
 
 #. Resource IDs: (103, 129)
 msgid "grepWinNP3"
@@ -454,11 +454,11 @@ msgstr "Opciones de grepWinNP3"
 
 #. Resource IDs: (157)
 msgid "hold down the shift key to find files that DO NOT contain the search string"
-msgstr "mantenga presionado la tecla shift para buscar archivos que NO contengan el string de busqueda"
+msgstr "mantenga presionado la tecla shift para buscar archivos que NO contengan la cadena de búsqueda"
 
 #. Resource IDs: (132)
 msgid "invalid regex!"
-msgstr "regex invalido!"
+msgstr "¡regex invalido!"
 
 #. Resource IDs: (120)
 msgid "less than"
@@ -478,7 +478,7 @@ msgstr "no hay texto disponible para probar"
 
 #. Resource IDs: (112)
 msgid "only files that match this pattern are searched.\r\nUse ""|"" as the delimiter.\r\nExample: *.cpp|*.h"
-msgstr "solo archivos que coincidan con el patron son utilizados.\r\nUse ""|"" como delimitador.\r\nEjemplo: *.cpp|*.h"
+msgstr "solo archivos que coincidan con el patrón  son utilizados.\r\nUsar ""|"" como delimitador.\r\nEjemplo: *.cpp|*.h"
 
 #. Resource IDs: (129)
 msgid "read error"
@@ -495,28 +495,28 @@ msgstr "reutilice instancias de grepWinNP3."
 #. Resource IDs: (151)
 #, c-format
 msgid "scanning file '%s'"
-msgstr ""
+msgstr "escanear archivo '%s'"
 
 #. Resource IDs: (108)
 msgid "search string is empty"
-msgstr "string de busqueda vacio"
+msgstr "El motivo de búsqueda está vacío"
 
 #. Resource IDs: (114)
 msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | symbol.\r\nExample: c:\\temp|d:\\logs"
-msgstr "la(s) ruta(s) que se busca(n) recursivamente.\r\nSepare rutas con el simbolo |.\r\nEjemplo: c:\\temp|d:\\logs"
+msgstr "la(s) ruta(s) que se busca(n) recursivamente.\r\nSepare rutas con el símbolo |.\r\nEjemplo: c:\\temp|d:\\logs"
 
 #. Resource IDs: (113)
 msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned."
-msgstr "puede excluir directorios,ej. CVS e imagenes.\r\nEjemplo: ^(CVS|imagenes)$\r\nNota, carpetas '.svn' estan 'ocultas' en Windows, por lo que usualmente no son analizadas."
+msgstr "puede excluir directorios, ej. CVS e imagenes.\r\nEjemplo: ^(CVS|imagenes)$\r\nNota, carpetas '.svn' están 'ocultas' en Windows, por lo que usualmente no son analizadas."
 
 #. Resource IDs: (158)
 msgid "Ext"
-msgstr ""
+msgstr "Ext"
 
 #. Resource IDs: (1061)
 msgid "Reset"
-msgstr ""
+msgstr "Reiniciar"
 
 #. Resource IDs: (1064)
 msgid "Dark mode"
-msgstr ""
+msgstr "Modo oscuro"
diff --git a/grepWinNP3/lang/Français (France) [fr-FR].lang b/grepWinNP3/lang/Français (France) [fr-FR].lang
index ed2fb0b73..84c5a56cd 100644
--- a/grepWinNP3/lang/Français (France) [fr-FR].lang	
+++ b/grepWinNP3/lang/Français (France) [fr-FR].lang	
@@ -27,7 +27,7 @@ msgstr ""
 # e.g. "V CS+Q" == Ctrl + Shift + 'Q'
 
 # ONLY Accelerator Keys with corresponding alphanumeric characters can be
-# updated i.e. function keys (F2), special keys (Delete, HoMe) etc. will not.
+# updated i.e. function keys (F2), special keys (Delete, Home) etc. will not.
 
 # ONLY change the msgstr field. Do NOT change any other.
 # If you do not want to change an Accelerator Key, copy msgid to msgstr
@@ -39,7 +39,7 @@ msgstr "%ld autres correspondances"
 
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
-msgstr "%path% est remplacé par le chemin du fichier, %line% par la ligne à atteindre"
+msgstr "%path% est remplacé par le chemin du fichier, %line% par la ligne à atteindre, %pattern% avec la chaîne de recherche."
 
 #. Resource IDs: (119)
 msgid "&About grepWinNP3..."
@@ -59,7 +59,7 @@ msgstr "..."
 
 #. Resource IDs: (1061, 1063, 1064, 1066, 1067)
 msgid "/"
-msgstr "↓"
+msgstr "/"
 
 #. Resource IDs: (1052, 135)
 msgid "About grepWinNP3"
@@ -67,7 +67,7 @@ msgstr "À propos de grepWinNP3"
 
 #. Resource IDs: (1021)
 msgid "Add to Presets"
-msgstr "Ajouter aux motifs"
+msgstr "Ajout aux prédéfinis"
 
 #. Resource IDs: (155)
 msgid "All Files"
@@ -84,7 +84,7 @@ msgstr "Toutes les tailles"
 #. Resource IDs: (124)
 #, c-format
 msgid "Are you sure you want to replace\n%s\nwith\n%s\nwithout creating backups?"
-msgstr "Ëtes-vous sür de vouloir remplacer \n%s\npar\n%s\nsans créer de backups ?"
+msgstr "Êtes-vous certain de vouloir remplacer\n%s\npar\n%s\nsans créer de backups?"
 
 #. Resource IDs: (1081)
 msgid "Between"
@@ -96,11 +96,11 @@ msgstr "Annuler"
 
 #. Resource IDs: (1068)
 msgid "Command line to start an editor at a specific line:"
-msgstr "Commande de lancement d'un éditeur à une ligne spécifique :"
+msgstr "Commande de lancement d'un éditeur à une ligne spécifique:"
 
 #. Resource IDs: (1060)
 msgid "Content"
-msgstr "Voir les lignes"
+msgstr "Contenu"
 
 #. Resource IDs: (145)
 msgid "Copy filename to clipboard"
@@ -132,7 +132,7 @@ msgstr "Créer des fichiers backups"
 
 #. Resource IDs: (1077)
 msgid "Create backup files in a separate folder"
-msgstr "Créer des fichiers backups dans un autre dossier"
+msgstr "Créer des fichiers backups dans un dossier séparé"
 
 #. Resource IDs: (139)
 msgid "Date modified"
@@ -144,15 +144,15 @@ msgstr "Dialogue"
 
 #. Resource IDs: (1051)
 msgid "Dot matches newline"
-msgstr "Un point désigne un début de ligne"
+msgstr "Point désigne nouvelle ligne"
 
 #. Resource IDs: (1056)
 msgid "Double-Click to select a preset"
-msgstr "Double-cliquer pour choisir un motif"
+msgstr "Double-clic pour choisir un prédéfini"
 
 #. Resource IDs: (65535 - PopupMenu)
 msgid "Dummy"
-msgstr "Martyr"
+msgstr "Factice"
 
 #. Resource IDs: (1067)
 msgid "Editor"
@@ -164,7 +164,7 @@ msgstr "Encodage"
 
 #. Resource IDs: (1056)
 msgid "Enter a name for the regex:"
-msgstr "Nom du motif d'expression régulière :"
+msgstr "Entrer un nom pour le Regex:"
 
 #. Resource IDs: (1062)
 msgid "Escape key closes grepWinNP3"
@@ -172,15 +172,15 @@ msgstr "La touche Esc ferme grepWinNP3"
 
 #. Resource IDs: (1041)
 msgid "Exclude dirs (Regex):"
-msgstr "Exclure des dossiers (Regex) :"
+msgstr "Exclure des dossiers (Regex):"
 
 #. Resource IDs: (1039)
 msgid "File Names match:\nuse '|' to separate multiple text match patterns, prepen&d '-' to exclude"
-msgstr "Motif des noms de fichiers :\n'|' pour ajouter des motifs.\n'-' pour exclure des motifs."
+msgstr "Fchiers correspondent:\nutiliser'|' pour séparer plusieurs motifs, préfixe '-' pour exclure"
 
 #. Resource IDs: (1059)
 msgid "Files"
-msgstr "Voir les fichiers"
+msgstr "Fichiers"
 
 #. Resource IDs: (109)
 msgid "GREPWINNP3"
@@ -188,15 +188,15 @@ msgstr "GREPWINNP3"
 
 #. Resource IDs: (156)
 msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
-msgstr "Si activé, un sous-dossier backup est créé dans le dossier où les recherches / remplacements sont réalisés, et les fichiers y sont sauvegardés"
+msgstr "Si activé, un sous-dossier backup est créé dans le dossier des recherches / les remplacements sont réalisés, et les fichiers y sont sauvegardés"
 
 #. Resource IDs: (1050)
 msgid "Include binary files"
-msgstr "Fichiers binaires"
+msgstr "Inclure fichiers binaires"
 
 #. Resource IDs: (1010)
 msgid "Include hidden items"
-msgstr "Fichiers cachés"
+msgstr "Inclure fichiers cachés"
 
 #. Resource IDs: (1011)
 msgid "Include subfolders"
@@ -208,7 +208,7 @@ msgstr "Fichiers systèmes"
 
 #. Resource IDs: (153)
 msgid "Invalid path!"
-msgstr "Chemin invalide !"
+msgstr "Chemin invalide!"
 
 #. Resource IDs: (1019)
 msgid "KB"
@@ -277,15 +277,15 @@ msgstr "Chemin"
 
 #. Resource IDs: (131)
 msgid "Preset name"
-msgstr "Nom de motif"
+msgstr "Nom du Prédéfini"
 
 #. Resource IDs: (1022, 132)
 msgid "Presets"
-msgstr "Motifs"
+msgstr "Prédéfinis"
 
 #. Resource IDs: (1065)
 msgid "Press F1 for help"
-msgstr " Appuyer sur F1 pour afficher l'aide"
+msgstr "Appuyer sur F1 pour Aide"
 
 #. Resource IDs: (154)
 msgid "Programs"
@@ -293,27 +293,27 @@ msgstr "Programmes"
 
 #. Resource IDs: (32775 - Menu)
 msgid "Re&name Preset"
-msgstr "Re&nommer le motif"
+msgstr "Re&nommer le Prédéfini"
 
 #. Resource IDs: (130)
 msgid "Regex Test"
-msgstr "Test d'expression régulière"
+msgstr "Test de Regex"
 
 #. Resource IDs: (1046)
 msgid "Regex match"
-msgstr "Expr. régulière"
+msgstr "Recherche Regex"
 
 #. Resource IDs: (65535)
 msgid "Regex replace string:"
-msgstr "Motif regex de remplacement :"
+msgstr "Motif regex de remplacement:"
 
 #. Resource IDs: (1001)
 msgid "Regex search"
-msgstr "Expression régulière"
+msgstr "Recherche Regex"
 
 #. Resource IDs: (65535)
 msgid "Regex search string:"
-msgstr "Motif regex de recherche :"
+msgstr "Motif de recherche Regex:"
 
 #. Resource IDs: (152)
 msgid "Relative paths are not allowed. Please enter an absolute path!"
@@ -321,15 +321,15 @@ msgstr "Les chemins relatifs ne sont pas autorisés. Entrer un chemin absolu."
 
 #. Resource IDs: (32771 - Menu)
 msgid "Remo&ve Preset"
-msgstr "Enle&ver le motif"
+msgstr "Suppri&mer Prédéfini"
 
 #. Resource IDs: (106)
 msgid "Replace string"
-msgstr "Motif de remplacement"
+msgstr "Remplacer la chaîne"
 
 #. Resource IDs: (1027)
 msgid "Replace with:"
-msgstr "Remplacer par :"
+msgstr "Remplacer par:"
 
 #. Resource IDs: (126)
 msgid "S&top"
@@ -341,7 +341,7 @@ msgstr "Chercher"
 
 #. Resource IDs: (1026)
 msgid "Search &for:"
-msgstr "Rec&hercher :"
+msgstr "Rec&hercher:"
 
 #. Resource IDs: (1042)
 msgid "Search case-sensitive"
@@ -374,7 +374,7 @@ msgstr "Choisir le chemin où chercher"
 
 #. Resource IDs: (1071)
 msgid "Settings"
-msgstr "Configuration"
+msgstr "Paramètres"
 
 #. Resource IDs: (133)
 msgid "Size"
@@ -382,11 +382,11 @@ msgstr "Taille"
 
 #. Resource IDs: (1006)
 msgid "Size is"
-msgstr "Taille ->"
+msgstr "Taille est"
 
 #. Resource IDs: (1028)
 msgid "Test regex"
-msgstr "Tester la regex"
+msgstr "Tester Regex"
 
 #. Resource IDs: (136)
 msgid "Text"
@@ -402,15 +402,15 @@ msgstr "Texte normal"
 
 #. Resource IDs: (65535)
 msgid "The regex search string matches:"
-msgstr "Texte correspondant au motif regex recherché :"
+msgstr "Texte correspondant au motif regex recherché:"
 
 #. Resource IDs: (65535)
 msgid "The resulting text after replacing:"
-msgstr "Texte après remplacement :"
+msgstr "Texte après remplacement:"
 
 #. Resource IDs: (1074)
 msgid "This adds a new entry to the context menu named \"Open with Editor\""
-msgstr "Ceci ajoute au menu contectuel une entrée nommée \"Ouvrir dans l'éditeur\""
+msgstr "Ceci ajoute au menu contextuel une entrée nommée \"Ouvrir dans l'éditeur\""
 
 #. Resource IDs: (1053)
 msgid "Treat files as UTF-8"
@@ -434,7 +434,7 @@ msgstr "binaire"
 
 #. Resource IDs: (118)
 msgid "click to edit the text as a multiline text"
-msgstr "Cliquer pour éditer comme texte mutiligne."
+msgstr "Cliquer pour éditer comme texte multiligne."
 
 #. Resource IDs: (121)
 msgid "equal to"
@@ -454,7 +454,7 @@ msgstr "Configuration de grepWinNP3"
 
 #. Resource IDs: (157)
 msgid "hold down the shift key to find files that DO NOT contain the search string"
-msgstr "Maintenit la touche Shift pour trouver les fichiers qui ne contiennent pas la chaîne recherchée"
+msgstr "Maintenir la touche Shift pour trouver les fichiers qui ne contiennent pas la chaîne recherchée"
 
 #. Resource IDs: (132)
 msgid "invalid regex!"
@@ -478,7 +478,7 @@ msgstr "Aucun texte à tester n'est disponible."
 
 #. Resource IDs: (112)
 msgid "only files that match this pattern are searched.\r\nUse ""|"" as the delimiter.\r\nExample: *.cpp|*.h"
-msgstr "La recherche ne sera manée que dans les fichiers qui correspondent à ce motif.\r\nUtiliser ""|"" comme séparateur\r\nExemple : *.cpp|*.h"
+msgstr "seuls les fichiers correspondant à ce modèle sont recherchés.\r\nUtiliser ""|"" comme séparateur\r\nExemple: *.cpp|*.h"
 
 #. Resource IDs: (129)
 msgid "read error"
@@ -495,7 +495,7 @@ msgstr "Réutiliser l'instance de grepWinNP3."
 #. Resource IDs: (151)
 #, c-format
 msgid "scanning file '%s'"
-msgstr Parcours du fichier '%s'"
+msgstr "Scanning du fichier '%s'"
 
 #. Resource IDs: (108)
 msgid "search string is empty"
@@ -503,20 +503,20 @@ msgstr "Le motif de recherche est vide."
 
 #. Resource IDs: (114)
 msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | symbol.\r\nExample: c:\\temp|d:\\logs"
-msgstr "Chemin(s) de recherche récursive.\r\n'|' pour ajouter un chemin.\r\nExemple : c:\\temp|d:\\logs"
+msgstr "Chemin(s) de recherche récursive.\r\n'|' pour ajouter un chemin.\r\nExemple: c:\\temp|d:\\logs"
 
 #. Resource IDs: (113)
 msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned."
-msgstr "Il est possible d'exclure des dossiers. Exemple: ^(CVS|images)$ pour exclure CVS et images.\r\nLes dossiers '.svn' sont 'cachés' sous Windows et ne sont normalment pas parcourus."
+msgstr "Il est possible d'exclure des dossiers. Exemple: ^(CVS|images)$ pour exclure CVS et images.\r\nLes dossiers '.svn' sont 'cachés' sous Windows et ne sont normalement pas parcourus."
 
 #. Resource IDs: (158)
 msgid "Ext"
-msgstr ""
+msgstr "Ext"
 
 #. Resource IDs: (1061)
 msgid "Reset"
-msgstr ""
+msgstr "Réinitialiser"
 
 #. Resource IDs: (1064)
 msgid "Dark mode"
-msgstr ""
+msgstr "Mode sombre"
diff --git a/grepWinNP3/lang/Italiano (Italia) [it-IT].lang b/grepWinNP3/lang/Italiano (Italia) [it-IT].lang
index 2a489bb93..c8d8d92d0 100644
--- a/grepWinNP3/lang/Italiano (Italia) [it-IT].lang	
+++ b/grepWinNP3/lang/Italiano (Italia) [it-IT].lang	
@@ -27,7 +27,7 @@ msgstr ""
 # e.g. "V CS+Q" == Ctrl + Shift + 'Q'
 
 # ONLY Accelerator Keys with corresponding alphanumeric characters can be
-# updated i.e. function keys (F2), special keys (Delete, HoMe) etc. will not.
+# updated i.e. function keys (F2), special keys (Delete, Home) etc. will not.
 
 # ONLY change the msgstr field. Do NOT change any other.
 # If you do not want to change an Accelerator Key, copy msgid to msgstr
@@ -39,7 +39,7 @@ msgstr "%ld ulteriori risultati"
 
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
-msgstr "%path% viene sostituito dal percorso del file, %line% dalla riga a cui saltare"
+msgstr "%path% viene sostituito dal percorso del file, %line% dalla riga a cui saltare, %pattern% with the search string."
 
 #. Resource IDs: (119)
 msgid "&About grepWinNP3..."
@@ -503,7 +503,7 @@ msgstr "la stringa di ricerca è vuota"
 
 #. Resource IDs: (114)
 msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | symbol.\r\nExample: c:\\temp|d:\\logs"
-msgstr "il percorso(i) che viene cercato in modo ricorsivo.\r\nSeparare i percorsi con il simbolo \"|\".\r\nEsempio: c:\\temp|d:\\logs"
+msgstr "il percorso(i) che viene cercato in modo ricorsivo.\r\nSeparare i percorsi con il | simbolo.\r\nEsempio: c:\\temp|d:\\logs"
 
 #. Resource IDs: (113)
 msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned."
diff --git a/grepWinNP3/lang/Magyar (Magyarország) [hu-HU].lang b/grepWinNP3/lang/Magyar (Magyarország) [hu-HU].lang
index b28dde85e..114845fca 100644
--- a/grepWinNP3/lang/Magyar (Magyarország) [hu-HU].lang	
+++ b/grepWinNP3/lang/Magyar (Magyarország) [hu-HU].lang	
@@ -27,7 +27,7 @@ msgstr ""
 # e.g. "V CS+Q" == Ctrl + Shift + 'Q'
 
 # ONLY Accelerator Keys with corresponding alphanumeric characters can be
-# updated i.e. function keys (F2), special keys (Delete, HoMe) etc. will not.
+# updated i.e. function keys (F2), special keys (Delete, Home) etc. will not.
 
 # ONLY change the msgstr field. Do NOT change any other.
 # If you do not want to change an Accelerator Key, copy msgid to msgstr
diff --git a/grepWinNP3/lang/Nederlands (Nederland) [nl-NL].lang b/grepWinNP3/lang/Nederlands (Nederland) [nl-NL].lang
index 2e17e50b7..be2e8f4c0 100644
--- a/grepWinNP3/lang/Nederlands (Nederland) [nl-NL].lang	
+++ b/grepWinNP3/lang/Nederlands (Nederland) [nl-NL].lang	
@@ -27,7 +27,7 @@ msgstr ""
 # e.g. "V CS+Q" == Ctrl + Shift + 'Q'
 
 # ONLY Accelerator Keys with corresponding alphanumeric characters can be
-# updated i.e. function keys (F2), special keys (Delete, HoMe) etc. will not.
+# updated i.e. function keys (F2), special keys (Delete, Home) etc. will not.
 
 # ONLY change the msgstr field. Do NOT change any other.
 # If you do not want to change an Accelerator Key, copy msgid to msgstr
@@ -39,7 +39,7 @@ msgstr "%ld meer gevonden"
 
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
-msgstr "%path% wordt vervangen door het pad van het bestand, %line% door de juiste regel"
+msgstr "%path% wordt vervangen door het pad van het bestand, %line% door de juiste regel, %pattern% met de zoekreeks."
 
 #. Resource IDs: (119)
 msgid "&About grepWinNP3..."
@@ -67,15 +67,15 @@ msgstr "Over grepWinNP3"
 
 #. Resource IDs: (1021)
 msgid "Add to Presets"
-msgstr "Naar Favorieten"
+msgstr "Toev. Vooringesteld"
 
 #. Resource IDs: (155)
 msgid "All Files"
-msgstr ""
+msgstr "Alle bestanden"
 
 #. Resource IDs: (1078)
 msgid "All dates"
-msgstr ""
+msgstr "Alle data"
 
 #. Resource IDs: (1005)
 msgid "All sizes"
@@ -84,11 +84,11 @@ msgstr "Alle afmetingen"
 #. Resource IDs: (124)
 #, c-format
 msgid "Are you sure you want to replace\n%s\nwith\n%s\nwithout creating backups?"
-msgstr "Wilt u echt \n%s\ndoor\n%s\n vervangen zonder een backup te maken?"
+msgstr "Wilt u echt\n%s\ndoor\n%s\nvervangen zonder een backup te maken?"
 
 #. Resource IDs: (1081)
 msgid "Between"
-msgstr ""
+msgstr "Tussen datum"
 
 #. Resource IDs: (2)
 msgid "Cancel"
@@ -112,7 +112,7 @@ msgstr "Kopieer bestanden naar klembord"
 
 #. Resource IDs: (143)
 msgid "Copy path to clipboard"
-msgstr "Kopieer Padnaam"
+msgstr "Kopieer padnaam"
 
 #. Resource IDs: (144)
 msgid "Copy paths to clipboard"
@@ -120,7 +120,7 @@ msgstr "Kopieer padnamen"
 
 #. Resource IDs: (147)
 msgid "Copy text result to clipboard"
-msgstr "Kopieer tekst"
+msgstr "Kopieer tekstresultaat"
 
 #. Resource IDs: (148)
 msgid "Copy text results to clipboard"
@@ -132,7 +132,7 @@ msgstr "Maak backup bestanden"
 
 #. Resource IDs: (1077)
 msgid "Create backup files in a separate folder"
-msgstr ""
+msgstr "Maak backup bestanden in een aparte map"
 
 #. Resource IDs: (139)
 msgid "Date modified"
@@ -144,11 +144,11 @@ msgstr "Dialoog"
 
 #. Resource IDs: (1051)
 msgid "Dot matches newline"
-msgstr "Is geen nieuwe regel"
+msgstr "Punt betekent nieuwe lijn"
 
 #. Resource IDs: (1056)
 msgid "Double-Click to select a preset"
-msgstr ""
+msgstr "Dubbelklik om te selecteren"
 
 #. Resource IDs: (65535 - PopupMenu)
 msgid "Dummy"
@@ -164,7 +164,7 @@ msgstr "Codering"
 
 #. Resource IDs: (1056)
 msgid "Enter a name for the regex:"
-msgstr "Naam voor de Regex:"
+msgstr "Voer een naam in voor de Regex:"
 
 #. Resource IDs: (1062)
 msgid "Escape key closes grepWinNP3"
@@ -176,11 +176,11 @@ msgstr "Exclusief mappen (Regex):"
 
 #. Resource IDs: (1039)
 msgid "File Names match:\nuse '|' to separate multiple text match patterns, prepen&d '-' to exclude"
-msgstr "Bestand komt overeen:\nGebruik '|' om meerdere patronen te scheiden, zet '-' vooraan om uit te sluiten"
+msgstr "Bestand komt overeen:\ngebruik '|' om meerdere patronen te scheiden, prefix '-' om uit te sluiten"
 
 #. Resource IDs: (1059)
 msgid "Files"
-msgstr "Bestand"
+msgstr "Bestanden"
 
 #. Resource IDs: (109)
 msgid "GREPWINNP3"
@@ -188,15 +188,15 @@ msgstr "GREPWINNP3"
 
 #. Resource IDs: (156)
 msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
-msgstr ""
+msgstr "Indien ingeschakeld, wordt er een backup map gemaakt in de map die wordt doorzocht/vervangen en van de bestanden wordt een backup gemaakt in die map"
 
 #. Resource IDs: (1050)
 msgid "Include binary files"
-msgstr "Inclusief binaire bestanden"
+msgstr "Binaire bestanden"
 
 #. Resource IDs: (1010)
 msgid "Include hidden items"
-msgstr "Inclusief verborgen bestanden"
+msgstr "Verborgen bestanden"
 
 #. Resource IDs: (1011)
 msgid "Include subfolders"
@@ -241,7 +241,7 @@ msgstr "Naam"
 
 #. Resource IDs: (1079)
 msgid "Newer than"
-msgstr ""
+msgstr "Nieuwer dan"
 
 #. Resource IDs: (115)
 msgid "Newline is matched by '.'"
@@ -253,7 +253,7 @@ msgstr "OK"
 
 #. Resource IDs: (1080)
 msgid "Older than"
-msgstr ""
+msgstr "Ouder dan"
 
 #. Resource IDs: (1063)
 msgid "Only one instance"
@@ -277,11 +277,11 @@ msgstr "Pad"
 
 #. Resource IDs: (131)
 msgid "Preset name"
-msgstr "Favoriet naam"
+msgstr "Vooringesteld naam"
 
 #. Resource IDs: (1022, 132)
 msgid "Presets"
-msgstr "Favorieten"
+msgstr "Vooringesteld"
 
 #. Resource IDs: (1065)
 msgid "Press F1 for help"
@@ -289,11 +289,11 @@ msgstr "Druk op F1 voor Help"
 
 #. Resource IDs: (154)
 msgid "Programs"
-msgstr ""
+msgstr "Programma's"
 
 #. Resource IDs: (32775 - Menu)
 msgid "Re&name Preset"
-msgstr "Hernoem Favorieten"
+msgstr "Hernoem Vooringesteld"
 
 #. Resource IDs: (130)
 msgid "Regex Test"
@@ -321,11 +321,11 @@ msgstr "Relatieve paden niet toegestaan. Geef een absoluut pad!"
 
 #. Resource IDs: (32771 - Menu)
 msgid "Remo&ve Preset"
-msgstr "Favorieten Wissen"
+msgstr "Vooringesteld Wissen"
 
 #. Resource IDs: (106)
 msgid "Replace string"
-msgstr "Vervang String"
+msgstr "Vervangen String"
 
 #. Resource IDs: (1027)
 msgid "Replace with:"
@@ -345,7 +345,7 @@ msgstr "Zoeken naar:"
 
 #. Resource IDs: (1042)
 msgid "Search case-sensitive"
-msgstr "HOOFD/klein gevoelig"
+msgstr "Hoofd-kleinletter gevoelig"
 
 #. Resource IDs: (1015)
 msgid "Search in"
@@ -386,7 +386,7 @@ msgstr "Grootte is"
 
 #. Resource IDs: (1028)
 msgid "Test regex"
-msgstr "Test Regex"
+msgstr "Regex testen"
 
 #. Resource IDs: (136)
 msgid "Text"
@@ -454,7 +454,7 @@ msgstr "grepWinNP3 instellingen"
 
 #. Resource IDs: (157)
 msgid "hold down the shift key to find files that DO NOT contain the search string"
-msgstr ""
+msgstr "houd de shift-toets ingedrukt om bestanden te vinden die de zoekreeks NIET bevatten"
 
 #. Resource IDs: (132)
 msgid "invalid regex!"
@@ -511,12 +511,12 @@ msgstr "Je kunt mappen uitsluiten, bv. CVS en afbeeldingen.\r\nVoorbeeld: ^(CVS|
 
 #. Resource IDs: (158)
 msgid "Ext"
-msgstr ""
+msgstr "Ext"
 
 #. Resource IDs: (1061)
 msgid "Reset"
-msgstr ""
+msgstr "Reset"
 
 #. Resource IDs: (1064)
 msgid "Dark mode"
-msgstr ""
+msgstr "Donkere modus"
diff --git a/grepWinNP3/lang/Polski (Polska)Polski [pl-PL].lang b/grepWinNP3/lang/Polski (Polska)Polski [pl-PL].lang
index f4cdb547a..79e9c9a19 100644
--- a/grepWinNP3/lang/Polski (Polska)Polski [pl-PL].lang	
+++ b/grepWinNP3/lang/Polski (Polska)Polski [pl-PL].lang	
@@ -27,7 +27,7 @@ msgstr ""
 # e.g. "V CS+Q" == Ctrl + Shift + 'Q'
 
 # ONLY Accelerator Keys with corresponding alphanumeric characters can be
-# updated i.e. function keys (F2), special keys (Delete, HoMe) etc. will not.
+# updated i.e. function keys (F2), special keys (Delete, Home) etc. will not.
 
 # ONLY change the msgstr field. Do NOT change any other.
 # If you do not want to change an Accelerator Key, copy msgid to msgstr
@@ -39,7 +39,7 @@ msgstr "... %ld więcej dopasowań"
 
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
-msgstr "%path% jest zastępowana ścieżką pliku, %line% z linią, aby przejść do."
+msgstr "%path% jest zastępowana ścieżką pliku, %line% z linią, aby przejść do, %pattern% with the search string."
 
 #. Resource IDs: (119)
 msgid "&About grepWinNP3..."
diff --git a/grepWinNP3/lang/Português (Brasil) [pt-BR].lang b/grepWinNP3/lang/Português (Brasil) [pt-BR].lang
index 33c1cfc56..b0f370fee 100644
--- a/grepWinNP3/lang/Português (Brasil) [pt-BR].lang	
+++ b/grepWinNP3/lang/Português (Brasil) [pt-BR].lang	
@@ -27,7 +27,7 @@ msgstr ""
 # e.g. "V CS+Q" == Ctrl + Shift + 'Q'
 
 # ONLY Accelerator Keys with corresponding alphanumeric characters can be
-# updated i.e. function keys (F2), special keys (Delete, HoMe) etc. will not.
+# updated i.e. function keys (F2), special keys (Delete, Home) etc. will not.
 
 # ONLY change the msgstr field. Do NOT change any other.
 # If you do not want to change an Accelerator Key, copy msgid to msgstr
@@ -39,7 +39,7 @@ msgstr "%ld mais encontrados"
 
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
-msgstr "%path% é substituído com o caminho do arquivo, %line% a linha para saltar"
+msgstr "%path% é substituído com o caminho do arquivo, %line% a linha para saltar, %pattern% with the search string."
 
 #. Resource IDs: (119)
 msgid "&About grepWinNP3..."
@@ -503,7 +503,7 @@ msgstr "Sequência de pesquisa está vazia"
 
 #. Resource IDs: (114)
 msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | symbol.\r\nExample: c:\\temp|d:\\logs"
-msgstr "O caminhos serão pesquisados recursivamente.\r\nSepare os caminhos com o símbolo |.\r\nExemplo: c:\\temp|d:\\logs"
+msgstr "O caminhos serão pesquisados recursivamente.\r\nSepare os caminhos com o | símbolo.\r\nExemplo: c:\\temp|d:\\logs"
 
 #. Resource IDs: (113)
 msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned."
diff --git a/grepWinNP3/lang/Slovenčina (Slovensko) [sk-SK].lang b/grepWinNP3/lang/Slovenčina (Slovensko) [sk-SK].lang
index d55c0d53a..5fe49f96f 100644
--- a/grepWinNP3/lang/Slovenčina (Slovensko) [sk-SK].lang	
+++ b/grepWinNP3/lang/Slovenčina (Slovensko) [sk-SK].lang	
@@ -27,7 +27,7 @@ msgstr ""
 # e.g. "V CS+Q" == Ctrl + Shift + 'Q'
 
 # ONLY Accelerator Keys with corresponding alphanumeric characters can be
-# updated i.e. function keys (F2), special keys (Delete, HoMe) etc. will not.
+# updated i.e. function keys (F2), special keys (Delete, Home) etc. will not.
 
 # ONLY change the msgstr field. Do NOT change any other.
 # If you do not want to change an Accelerator Key, copy msgid to msgstr
diff --git a/grepWinNP3/lang/Svenska (Sverige) [sv-SE].lang b/grepWinNP3/lang/Svenska (Sverige) [sv-SE].lang
index 3435bcfe7..91ab43cc6 100644
--- a/grepWinNP3/lang/Svenska (Sverige) [sv-SE].lang	
+++ b/grepWinNP3/lang/Svenska (Sverige) [sv-SE].lang	
@@ -27,7 +27,7 @@ msgstr ""
 # e.g. "V CS+Q" == Ctrl + Shift + 'Q'
 
 # ONLY Accelerator Keys with corresponding alphanumeric characters can be
-# updated i.e. function keys (F2), special keys (Delete, HoMe) etc. will not.
+# updated i.e. function keys (F2), special keys (Delete, Home) etc. will not.
 
 # ONLY change the msgstr field. Do NOT change any other.
 # If you do not want to change an Accelerator Key, copy msgid to msgstr
diff --git a/grepWinNP3/lang/Türkçe (Türkiye) [tr-TR].lang b/grepWinNP3/lang/Türkçe (Türkiye) [tr-TR].lang
index 960f46f4c..0b6778b63 100644
--- a/grepWinNP3/lang/Türkçe (Türkiye) [tr-TR].lang	
+++ b/grepWinNP3/lang/Türkçe (Türkiye) [tr-TR].lang	
@@ -27,7 +27,7 @@ msgstr ""
 # e.g. "V CS+Q" == Ctrl + Shift + 'Q'
 
 # ONLY Accelerator Keys with corresponding alphanumeric characters can be
-# updated i.e. function keys (F2), special keys (Delete, HoMe) etc. will not.
+# updated i.e. function keys (F2), special keys (Delete, Home) etc. will not.
 
 # ONLY change the msgstr field. Do NOT change any other.
 # If you do not want to change an Accelerator Key, copy msgid to msgstr
@@ -39,7 +39,7 @@ msgstr "%ld daha fazla eşleşme"
 
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
-msgstr "%path% dosyanın yolu, %line% ile atlanacak satırla değiştirilir"
+msgstr "%path% dosyanın yolu, %line% ile atlanacak satırla değiştirilir, %pattern% with the search string."
 
 #. Resource IDs: (119)
 msgid "&About grepWinNP3..."
diff --git a/grepWinNP3/lang/Беларуская (Беларусь) [be-BY].lang b/grepWinNP3/lang/Беларуская (Беларусь) [be-BY].lang
index 1a8442772..ad3eb81f5 100644
--- a/grepWinNP3/lang/Беларуская (Беларусь) [be-BY].lang	
+++ b/grepWinNP3/lang/Беларуская (Беларусь) [be-BY].lang	
@@ -27,7 +27,7 @@ msgstr ""
 # e.g. "V CS+Q" == Ctrl + Shift + 'Q'
 
 # ONLY Accelerator Keys with corresponding alphanumeric characters can be
-# updated i.e. function keys (F2), special keys (Delete, HoMe) etc. will not.
+# updated i.e. function keys (F2), special keys (Delete, Home) etc. will not.
 
 # ONLY change the msgstr field. Do NOT change any other.
 # If you do not want to change an Accelerator Key, copy msgid to msgstr
@@ -39,7 +39,7 @@ msgstr "больше %ld совпадений"
 
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
-msgstr "%path% заменяется на путь к файлу, %line% на соответствующую строку."
+msgstr "%path% заменяется на путь к файлу, %line% на соответствующую строку, %pattern% with the search string."
 
 #. Resource IDs: (119)
 msgid "&About grepWinNP3..."
@@ -477,7 +477,7 @@ msgid "no text to test with available"
 msgstr "Тестировать нечего"
 
 #. Resource IDs: (112)
-msgid "only files that match this pattern are searched.\r\nUse \"|\" as the delimiter.\r\nExample: *.cpp|*.h"
+msgid "only files that match this pattern are searched.\r\nUse ""|"" as the delimiter.\r\nExample: *.cpp|*.h"
 msgstr "Поиск файлов, только соответствующих шаблону.\r\nЧерта '|' как разделитель.\r\nПример: *.cpp|*.h"
 
 #. Resource IDs: (129)
@@ -503,7 +503,7 @@ msgstr "Строка поиска пуста"
 
 #. Resource IDs: (114)
 msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | symbol.\r\nExample: c:\\temp|d:\\logs"
-msgstr "Рекурсивный поиск путей.\r\nРазделение путей знаком \"|\".\r\nПример: c:\\temp|d:\\logs"
+msgstr "Рекурсивный поиск путей.\r\nРазделение путей знаком |.\r\nПример: c:\\temp|d:\\logs"
 
 #. Resource IDs: (113)
 msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned."
diff --git a/grepWinNP3/lang/Русский (Pоссия) [ru-RU].lang b/grepWinNP3/lang/Русский (Pоссия) [ru-RU].lang
index f9354f7de..c97c54e60 100644
--- a/grepWinNP3/lang/Русский (Pоссия) [ru-RU].lang	
+++ b/grepWinNP3/lang/Русский (Pоссия) [ru-RU].lang	
@@ -27,7 +27,7 @@ msgstr ""
 # e.g. "V CS+Q" == Ctrl + Shift + 'Q'
 
 # ONLY Accelerator Keys with corresponding alphanumeric characters can be
-# updated i.e. function keys (F2), special keys (Delete, HoMe) etc. will not.
+# updated i.e. function keys (F2), special keys (Delete, Home) etc. will not.
 
 # ONLY change the msgstr field. Do NOT change any other.
 # If you do not want to change an Accelerator Key, copy msgid to msgstr
@@ -39,7 +39,7 @@ msgstr "больше %ld совпадений"
 
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
-msgstr "%path% заменяется на путь к файлу, %line% на соответствующую строку."
+msgstr "%path% заменяется на путь к файлу, %line% на соответствующую строку, %pattern% with the search string."
 
 #. Resource IDs: (119)
 msgid "&About grepWinNP3..."
@@ -134,10 +134,6 @@ msgstr "Создавать бэкапы"
 msgid "Create backup files in a separate folder"
 msgstr "Создавать бэкапы файлов в отдельной папке"
 
-#. Resource IDs: (1064)
-msgid "Dark mode"
-msgstr "Темная тема"
-
 #. Resource IDs: (139)
 msgid "Date modified"
 msgstr "Изменен"
@@ -178,10 +174,6 @@ msgstr "Esc для выхода из grepWinNP3"
 msgid "Exclude dirs (Regex):"
 msgstr "Исключить папки (Regex):"
 
-#. Resource IDs: (158)
-msgid "Ext"
-msgstr ".рсш"
-
 #. Resource IDs: (1039)
 msgid "File Names match:\nuse '|' to separate multiple text match patterns, prepen&d '-' to exclude"
 msgstr "Совпадения имен:\n'|' для разделения,\n'-' спереди, для исключения"
@@ -421,8 +413,8 @@ msgid "This adds a new entry to the context menu named \"Open with Editor\""
 msgstr "Добавить пункт в контекстное меню 'Открыть в редакторе'"
 
 #. Resource IDs: (1053)
-msgid "Treat files as UTF-8"
-msgstr "Файлы как UTF-8"
+msgid "Treat files as UTF8"
+msgstr "Файлы как UTF8"
 
 #. Resource IDs: (1045)
 msgid "Visit our website"
@@ -485,7 +477,7 @@ msgid "no text to test with available"
 msgstr "Тестировать нечего"
 
 #. Resource IDs: (112)
-msgid "only files that match this pattern are searched.\r\nUse \"|\" as the delimiter.\r\nExample: *.cpp|*.h"
+msgid "only files that match this pattern are searched.\r\nUse ""|"" as the delimiter.\r\nExample: *.cpp|*.h"
 msgstr "Поиск файлов, только соответствующих шаблону.\r\nЧерта '|' как разделитель.\r\nПример: *.cpp|*.h"
 
 #. Resource IDs: (129)
@@ -511,12 +503,20 @@ msgstr "Строка поиска пуста"
 
 #. Resource IDs: (114)
 msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | symbol.\r\nExample: c:\\temp|d:\\logs"
-msgstr "Рекурсивный поиск путей.\r\nРазделение путей знаком \"|\".\r\nПример: c:\\temp|d:\\logs"
+msgstr "Рекурсивный поиск путей.\r\nРазделение путей знаком |.\r\nПример: c:\\temp|d:\\logs"
 
 #. Resource IDs: (113)
 msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned."
 msgstr "Вы можете исключить, например, CVS и изображения.\r\nПример: ^(CVS|images)$\r\nВнимание: папки '.svn', как правило, скрыты в Windows, поэтому они обычно не сканируются."
 
+#. Resource IDs: (158)
+msgid "Ext"
+msgstr ".рсш"
+
 #. Resource IDs: (1061)
 msgid "Reset"
 msgstr ""
+
+#. Resource IDs: (1064)
+msgid "Dark mode"
+msgstr "Темная тема"
diff --git a/grepWinNP3/lang/日本語 （日本） [ja-JP].lang b/grepWinNP3/lang/日本語 （日本） [ja-JP].lang
index 68b44037d..e23132a9b 100644
--- a/grepWinNP3/lang/日本語 （日本） [ja-JP].lang	
+++ b/grepWinNP3/lang/日本語 （日本） [ja-JP].lang	
@@ -27,7 +27,7 @@ msgstr ""
 # e.g. "V CS+Q" == Ctrl + Shift + 'Q'
 
 # ONLY Accelerator Keys with corresponding alphanumeric characters can be
-# updated i.e. function keys (F2), special keys (Delete, HoMe) etc. will not.
+# updated i.e. function keys (F2), special keys (Delete, Home) etc. will not.
 
 # ONLY change the msgstr field. Do NOT change any other.
 # If you do not want to change an Accelerator Key, copy msgid to msgstr
@@ -39,7 +39,7 @@ msgstr "%ld 以上の一致"
 
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
-msgstr "%path% でファイルのパスと置き換え - %line% で指定した行に移動"
+msgstr "%path% でファイルのパスと置き換え - %line% で指定した行に移動, %pattern% with the search string."
 
 #. Resource IDs: (119)
 msgid "&About grepWinNP3..."
@@ -503,7 +503,7 @@ msgstr "検索文字列が空白です"
 
 #. Resource IDs: (114)
 msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | symbol.\r\nExample: c:\\temp|d:\\logs"
-msgstr "現在のパスは再帰的に検索されます.\r\nパスは \"|\" で区切ることができます.\r\n指定例:  c:\\temp|d:\\logs"
+msgstr "現在のパスは再帰的に検索されます.\r\nパスは | で区切ることができます.\r\n指定例:  c:\\temp|d:\\logs"
 
 #. Resource IDs: (113)
 msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned."
diff --git a/grepWinNP3/lang/简体中文 （中国） [zh-CN].lang b/grepWinNP3/lang/简体中文 （中国） [zh-CN].lang
index ad680c1ec..bc920ea7d 100644
--- a/grepWinNP3/lang/简体中文 （中国） [zh-CN].lang	
+++ b/grepWinNP3/lang/简体中文 （中国） [zh-CN].lang	
@@ -27,7 +27,7 @@ msgstr ""
 # e.g. "V CS+Q" == Ctrl + Shift + 'Q'
 
 # ONLY Accelerator Keys with corresponding alphanumeric characters can be
-# updated i.e. function keys (F2), special keys (Delete, HoMe) etc. will not.
+# updated i.e. function keys (F2), special keys (Delete, Home) etc. will not.
 
 # ONLY change the msgstr field. Do NOT change any other.
 # If you do not want to change an Accelerator Key, copy msgid to msgstr
@@ -39,7 +39,7 @@ msgstr "还有 %ld 个匹配"
 
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
-msgstr "%path% 将被替换为文件的路径, %line% 将被替换为要转至的行号."
+msgstr "%path% 将被替换为文件的路径, %line% 将被替换为要转至的行号, %pattern% with the search string."
 
 #. Resource IDs: (119)
 msgid "&About grepWinNP3..."
@@ -108,7 +108,7 @@ msgstr "复制文件名称到剪贴板"
 
 #. Resource IDs: (146)
 msgid "Copy filenames to clipboard"
-msgstr ""复制文件名称到剪贴"
+msgstr "复制文件名称到剪贴"
 
 #. Resource IDs: (143)
 msgid "Copy path to clipboard"
@@ -176,7 +176,7 @@ msgstr "排除目录(正则):"
 
 #. Resource IDs: (1039)
 msgid "File Names match:\nuse '|' to separate multiple text match patterns, prepen&d '-' to exclude"
-msgstr "文件名称匹配:\n使用 \"|\" 号来分隔多个文本匹配规则, 前置 \"-\" 用于排除(&D)"
+msgstr "文件名称匹配:\n使用 '|' 号来分隔多个文本匹配规则, 前置 '-' 用于排除(&D)"
 
 #. Resource IDs: (1059)
 msgid "Files"
@@ -503,7 +503,7 @@ msgstr "搜索字符串为空"
 
 #. Resource IDs: (114)
 msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | symbol.\r\nExample: c:\\temp|d:\\logs"
-msgstr "将被递归搜索的路径.\r\n使用 \"|\" 符号来分隔路径.\r\n比如:  c:\\temp|d:\\logs"
+msgstr "将被递归搜索的路径.\r\n使用 | 符号来分隔路径.\r\n比如:  c:\\temp|d:\\logs"
 
 #. Resource IDs: (113)
 msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned."
diff --git a/grepWinNP3/lang/한국어 (대한민국) [ko-KR].lang b/grepWinNP3/lang/한국어 (대한민국) [ko-KR].lang
index 5112b410d..be3ca1be4 100644
--- a/grepWinNP3/lang/한국어 (대한민국) [ko-KR].lang	
+++ b/grepWinNP3/lang/한국어 (대한민국) [ko-KR].lang	
@@ -27,7 +27,7 @@ msgstr ""
 # e.g. "V CS+Q" == Ctrl + Shift + 'Q'
 
 # ONLY Accelerator Keys with corresponding alphanumeric characters can be
-# updated i.e. function keys (F2), special keys (Delete, HoMe) etc. will not.
+# updated i.e. function keys (F2), special keys (Delete, Home) etc. will not.
 
 # ONLY change the msgstr field. Do NOT change any other.
 # If you do not want to change an Accelerator Key, copy msgid to msgstr
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 01edc8e09..fc16095f4 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.20.410.1"
+    version="5.20.410.2"
     type="win32"
   />
   <description>Notepad3 NF</description>
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 5ba96b76e..1b8ffa09c 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -9,11 +9,11 @@
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 20
 #define VERSION_REV 410
-#define VERSION_BUILD 1
+#define VERSION_BUILD 2
 #define SCINTILLA_VER 432
 #define ONIGURUMA_REGEX_VER 6.9.5
 #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 nebukadn
+#define VERSION_COMMIT_ID dkt1-amr