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/Versions/day.txt b/Versions/day.txt
index 066cbfe90..52f22458d 100644
--- a/Versions/day.txt
+++ b/Versions/day.txt
@@ -1 +1 @@
-401
+402
diff --git a/grepWinNP3/grepWinNP3.exe b/grepWinNP3/grepWinNP3.exe
index 662f1c0e3..6da7f0f5f 100644
Binary files a/grepWinNP3/grepWinNP3.exe and b/grepWinNP3/grepWinNP3.exe differ
diff --git a/grepWinNP3/grepWinNP3_x64.exe b/grepWinNP3/grepWinNP3_x64.exe
index 53c9e1ee4..ffb9e3329 100644
Binary files a/grepWinNP3/grepWinNP3_x64.exe and b/grepWinNP3/grepWinNP3_x64.exe differ
diff --git a/grepWinNP3/lang/Afrikaans (Suid-Afrika) [af-ZA].lang b/grepWinNP3/lang/Afrikaans (Suid-Afrika) [af-ZA].lang
index ca2724718..74893fb76 100644
--- a/grepWinNP3/lang/Afrikaans (Suid-Afrika) [af-ZA].lang	
+++ b/grepWinNP3/lang/Afrikaans (Suid-Afrika) [af-ZA].lang	
@@ -1,4 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
+# encoding: UTF-8
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -414,8 +415,8 @@ msgid "This adds a new entry to the context menu named \"Open with Editor\""
 msgstr "Dit voegt in het Context menu toe: \"Openen in Editor\""
 
 #. Resource IDs: (1053)
-msgid "Treat files as UTF8"
-msgstr "Bestanden als UTF8"
+msgid "Treat files as UTF-8"
+msgstr "Bestanden als UTF-8"
 
 #. Resource IDs: (1045)
 msgid "Visit our website"
@@ -478,8 +479,8 @@ msgid "no text to test with available"
 msgstr "geen tekst om te testen beschikbaar"
 
 #. Resource IDs: (112)
-msgid "only files that match this pattern are searched.\r\nUse \"|\" as the delimiter.\r\nExample: *.cpp|*.h"
-msgstr "alleen bestanden die overeenkomen met dit patroon, worden doorzocht.\r\nGebruik \"|\" als scheidingsteken.\r\nVoorbeeld: *.cpp|*.h"
+msgid "only files that match this pattern are searched.\r\nUse ""|"" as the delimiter.\r\nExample: *.cpp|*.h"
+msgstr "alleen bestanden die overeenkomen met dit patroon, worden doorzocht.\r\nGebruik ""|"" als scheidingsteken.\r\nVoorbeeld: *.cpp|*.h"
 
 #. Resource IDs: (129)
 msgid "read error"
@@ -513,3 +514,4 @@ msgstr "Je kunt mappen uitsluiten, bv. CVS en afbeeldingen.\r\nVoorbeeld: ^(CVS|
 #. Resource IDs: (1061)
 msgid "Reset"
 msgstr "Reset"
+
diff --git a/grepWinNP3/lang/Deutsch (Deutschland) [de-DE].lang b/grepWinNP3/lang/Deutsch (Deutschland) [de-DE].lang
index 1e7796cd6..539420e9f 100644
--- a/grepWinNP3/lang/Deutsch (Deutschland) [de-DE].lang	
+++ b/grepWinNP3/lang/Deutsch (Deutschland) [de-DE].lang	
@@ -1,4 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
+# encoding: UTF-8
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -28,7 +29,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
@@ -97,7 +98,7 @@ msgstr "Abbrechen"
 
 #. Resource IDs: (1068)
 msgid "Command line to start an editor at a specific line:"
-msgstr "Kommandozeile um einen Editor an einer spezifischen Linie zu öffnen"
+msgstr "Kommando um einen Editor an spezifizierter Zeile zu öffnen"
 
 #. Resource IDs: (1060)
 msgid "Content"
@@ -414,8 +415,8 @@ msgid "This adds a new entry to the context menu named \"Open with Editor\""
 msgstr "Dies fügt einen Eintrag \"Öffne in Editor\" im Kontextmenu hinzu"
 
 #. Resource IDs: (1053)
-msgid "Treat files as UTF8"
-msgstr "Dateien als UTF8 behandeln"
+msgid "Treat files as UTF-8"
+msgstr "Dateien als UTF-8 behandeln"
 
 #. Resource IDs: (1045)
 msgid "Visit our website"
@@ -478,8 +479,8 @@ msgid "no text to test with available"
 msgstr "kein Text zum Testen vorhanden"
 
 #. Resource IDs: (112)
-msgid "only files that match this pattern are searched.\r\nUse \"|\" as the delimiter.\r\nExample: *.cpp|*.h"
-msgstr "Nur Dateien welche zum Muster passen werden durchsucht.\r\nBenütze \"|\" als Trennzeichen.\r\nBeispiel: *.cpp|*.h"
+msgid "only files that match this pattern are searched.\r\nUse ""|"" as the delimiter.\r\nExample: *.cpp|*.h"
+msgstr "Nur Dateien welche zum Muster passen werden durchsucht.\r\nBenütze ""|"" als Trennzeichen.\r\nBeispiel: *.cpp|*.h"
 
 #. Resource IDs: (129)
 msgid "read error"
@@ -513,3 +514,4 @@ msgstr "Sie können Ordner ausschlissen, z.B. CVS und Bilder.\r\nBeispiel: ^(CVS
 #. Resource IDs: (1061)
 msgid "Reset"
 msgstr "Standard"
+
diff --git a/grepWinNP3/lang/English (United Kingdom) [en-GB].lang b/grepWinNP3/lang/English (United Kingdom) [en-GB].lang
index 02c4b34b5..136e4158f 100644
--- a/grepWinNP3/lang/English (United Kingdom) [en-GB].lang	
+++ b/grepWinNP3/lang/English (United Kingdom) [en-GB].lang	
@@ -1,4 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
+# encoding: UTF-8
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -414,7 +415,7 @@ msgid "This adds a new entry to the context menu named \"Open with Editor\""
 msgstr ""
 
 #. Resource IDs: (1053)
-msgid "Treat files as UTF8"
+msgid "Treat files as UTF-8"
 msgstr ""
 
 #. Resource IDs: (1045)
@@ -478,7 +479,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 ""
 
 #. Resource IDs: (129)
@@ -513,3 +514,4 @@ msgstr ""
 #. Resource IDs: (1061)
 msgid "Reset"
 msgstr ""
+
diff --git a/grepWinNP3/lang/English (United States) [en-US].lang b/grepWinNP3/lang/English (United States) [en-US].lang
index 02c4b34b5..136e4158f 100644
--- a/grepWinNP3/lang/English (United States) [en-US].lang	
+++ b/grepWinNP3/lang/English (United States) [en-US].lang	
@@ -1,4 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
+# encoding: UTF-8
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -414,7 +415,7 @@ msgid "This adds a new entry to the context menu named \"Open with Editor\""
 msgstr ""
 
 #. Resource IDs: (1053)
-msgid "Treat files as UTF8"
+msgid "Treat files as UTF-8"
 msgstr ""
 
 #. Resource IDs: (1045)
@@ -478,7 +479,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 ""
 
 #. Resource IDs: (129)
@@ -513,3 +514,4 @@ msgstr ""
 #. Resource IDs: (1061)
 msgid "Reset"
 msgstr ""
+
diff --git a/grepWinNP3/lang/Español (España) [es-ES].lang b/grepWinNP3/lang/Español (España) [es-ES].lang
index 5b9d241c8..25930975b 100644
--- a/grepWinNP3/lang/Español (España) [es-ES].lang	
+++ b/grepWinNP3/lang/Español (España) [es-ES].lang	
@@ -1,4 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
+# encoding: UTF-8
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -414,7 +415,7 @@ 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\""
 
 #. Resource IDs: (1053)
-msgid "Treat files as UTF8"
+msgid "Treat files as UTF-8"
 msgstr "Tratar archivos como UTF-8"
 
 #. Resource IDs: (1045)
@@ -478,8 +479,8 @@ msgid "no text to test with available"
 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"
+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"
 
 #. Resource IDs: (129)
 msgid "read error"
@@ -513,3 +514,4 @@ msgstr "puede excluir directorios,ej. CVS e imagenes.\r\nEjemplo: ^(CVS|imagenes
 #. Resource IDs: (1061)
 msgid "Reset"
 msgstr "[es-ES]"
+
diff --git a/grepWinNP3/lang/Français (France) [fr-FR].lang b/grepWinNP3/lang/Français (France) [fr-FR].lang
index ea5104b37..249ef9894 100644
--- a/grepWinNP3/lang/Français (France) [fr-FR].lang	
+++ b/grepWinNP3/lang/Français (France) [fr-FR].lang	
@@ -1,4 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
+# encoding: UTF-8
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -414,8 +415,8 @@ 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\""
 
 #. Resource IDs: (1053)
-msgid "Treat files as UTF8"
-msgstr "Traiter les fichiers comme UTF8"
+msgid "Treat files as UTF-8"
+msgstr "Traiter les fichiers comme UTF-8"
 
 #. Resource IDs: (1045)
 msgid "Visit our website"
@@ -478,8 +479,8 @@ msgid "no text to test with available"
 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.\nUtiliser '|' comme séparateur\nExemple : *.cpp|*.h"
+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"
 
 #. Resource IDs: (129)
 msgid "read error"
@@ -504,12 +505,13 @@ 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.\n'|' pour ajouter un chemin.\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\\.\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 normalment pas parcourus."
 
 #. Resource IDs: (1061)
 msgid "Reset"
 msgstr "[fr-FR]"
+
diff --git a/grepWinNP3/lang/Italiano (Italia) [it-IT].lang b/grepWinNP3/lang/Italiano (Italia) [it-IT].lang
index 77e553d8b..597d7482b 100644
--- a/grepWinNP3/lang/Italiano (Italia) [it-IT].lang	
+++ b/grepWinNP3/lang/Italiano (Italia) [it-IT].lang	
@@ -1,4 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
+# encoding: UTF-8
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -414,8 +415,8 @@ msgid "This adds a new entry to the context menu named \"Open with Editor\""
 msgstr "Questo aggiunge una nuova voce al menu contestuale denominato \"Apri con l'Editor\""
 
 #. Resource IDs: (1053)
-msgid "Treat files as UTF8"
-msgstr "Tratta i file come UTF8"
+msgid "Treat files as UTF-8"
+msgstr "Tratta i file come UTF-8"
 
 #. Resource IDs: (1045)
 msgid "Visit our website"
@@ -478,8 +479,8 @@ msgid "no text to test with available"
 msgstr "nessun testo disponibile da provare"
 
 #. Resource IDs: (112)
-msgid "only files that match this pattern are searched.\r\nUse \"|\" as the delimiter.\r\nExample: *.cpp|*.h"
-msgstr "vengono cercati solo i file che corrispondono a questo modello.\nUsa \"|\" come delimitatore.\nEsempio: *.cpp|*.h"
+msgid "only files that match this pattern are searched.\r\nUse ""|"" as the delimiter.\r\nExample: *.cpp|*.h"
+msgstr "vengono cercati solo i file che corrispondono a questo modello.\r\nUsa ""|"" come delimitatore.\r\nEsempio: *.cpp|*.h"
 
 #. Resource IDs: (129)
 msgid "read error"
@@ -504,12 +505,13 @@ 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.\nSeparare i percorsi con il simbolo \"|\".\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."
-msgstr "puoi escludere le cartelle, ad es. CVS e immagini.\nEsempio: ^(CVS|immagini)$\nNota, le cartelle '.svn' sono 'nascoste' su Windows, quindi di solito non vengono scansionate."
+msgstr "puoi escludere le cartelle, ad es. CVS e immagini.\r\nEsempio: ^(CVS|immagini)$\r\nNota, le cartelle '.svn' sono 'nascoste' su Windows, quindi di solito non vengono scansionate."
 
 #. Resource IDs: (1061)
 msgid "Reset"
 msgstr "[it-IT]"
+
diff --git a/grepWinNP3/lang/Magyar (Magyarország) [hu-HU].lang b/grepWinNP3/lang/Magyar (Magyarország) [hu-HU].lang
index 487868ec2..8604399ea 100644
--- a/grepWinNP3/lang/Magyar (Magyarország) [hu-HU].lang	
+++ b/grepWinNP3/lang/Magyar (Magyarország) [hu-HU].lang	
@@ -1,4 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
+# encoding: UTF-8
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -414,7 +415,7 @@ msgid "This adds a new entry to the context menu named \"Open with Editor\""
 msgstr ""
 
 #. Resource IDs: (1053)
-msgid "Treat files as UTF8"
+msgid "Treat files as UTF-8"
 msgstr ""
 
 #. Resource IDs: (1045)
@@ -478,7 +479,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 ""
 
 #. Resource IDs: (129)
@@ -513,3 +514,4 @@ msgstr ""
 #. Resource IDs: (1061)
 msgid "Reset"
 msgstr "[hu-HU]"
+
diff --git a/grepWinNP3/lang/Nederlands (Nederland) [nl-NL].lang b/grepWinNP3/lang/Nederlands (Nederland) [nl-NL].lang
index 9d48a932d..74893fb76 100644
--- a/grepWinNP3/lang/Nederlands (Nederland) [nl-NL].lang	
+++ b/grepWinNP3/lang/Nederlands (Nederland) [nl-NL].lang	
@@ -1,4 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
+# encoding: UTF-8
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -414,8 +415,8 @@ msgid "This adds a new entry to the context menu named \"Open with Editor\""
 msgstr "Dit voegt in het Context menu toe: \"Openen in Editor\""
 
 #. Resource IDs: (1053)
-msgid "Treat files as UTF8"
-msgstr "Bestanden als UTF8"
+msgid "Treat files as UTF-8"
+msgstr "Bestanden als UTF-8"
 
 #. Resource IDs: (1045)
 msgid "Visit our website"
@@ -478,8 +479,8 @@ msgid "no text to test with available"
 msgstr "geen tekst om te testen beschikbaar"
 
 #. Resource IDs: (112)
-msgid "only files that match this pattern are searched.\r\nUse \"|\" as the delimiter.\r\nExample: *.cpp|*.h"
-msgstr "alleen bestanden die overeenkomen met dit patroon, worden doorzocht.\r\nGebruik \"|\" als scheidingsteken.\r\nVoorbeeld: *.cpp|*.h"
+msgid "only files that match this pattern are searched.\r\nUse ""|"" as the delimiter.\r\nExample: *.cpp|*.h"
+msgstr "alleen bestanden die overeenkomen met dit patroon, worden doorzocht.\r\nGebruik ""|"" als scheidingsteken.\r\nVoorbeeld: *.cpp|*.h"
 
 #. Resource IDs: (129)
 msgid "read error"
@@ -512,4 +513,5 @@ msgstr "Je kunt mappen uitsluiten, bv. CVS en afbeeldingen.\r\nVoorbeeld: ^(CVS|
 
 #. Resource IDs: (1061)
 msgid "Reset"
-msgstr "[nl-NL]"
+msgstr "Reset"
+
diff --git a/grepWinNP3/lang/Polski (Polska)Polski [pl-PL].lang b/grepWinNP3/lang/Polski (Polska)Polski [pl-PL].lang
index ab9f38850..68d6aefca 100644
--- a/grepWinNP3/lang/Polski (Polska)Polski [pl-PL].lang	
+++ b/grepWinNP3/lang/Polski (Polska)Polski [pl-PL].lang	
@@ -1,4 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
+# encoding: UTF-8
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -414,8 +415,8 @@ msgid "This adds a new entry to the context menu named \"Open with Editor\""
 msgstr "Spowoduje to dodanie nowego wpisu do menu kontekstowego o nazwie \"Otwórz za pomocą edytora""
 
 #. Resource IDs: (1053)
-msgid "Treat files as UTF8"
-msgstr "Traktuj pliki jako UTF8"
+msgid "Treat files as UTF-8"
+msgstr "Traktuj pliki jako UTF-8"
 
 #. Resource IDs: (1045)
 msgid "Visit our website"
@@ -478,8 +479,8 @@ msgid "no text to test with available"
 msgstr "brak tekstu do przetestowania z dostępnymi"
 
 #. Resource IDs: (112)
-msgid "only files that match this pattern are searched.\r\nUse \"|\" as the delimiter.\r\nExample: *.cpp|*.h"
-msgstr "Wyszukiwane są tylko pliki odpowiadające temu wzorcowi.\r\nJako separatora użyj \"|\" \r\nPrzykład: *.cpp|*."
+msgid "only files that match this pattern are searched.\r\nUse ""|"" as the delimiter.\r\nExample: *.cpp|*.h"
+msgstr "Wyszukiwane są tylko pliki odpowiadające temu wzorcowi.\r\nJako separatora użyj ""|"" \r\nPrzykład: *.cpp|*."
 
 #. Resource IDs: (129)
 msgid "read error"
@@ -513,3 +514,4 @@ msgstr "Można wykluczyć katalogi, np. CVS i obrazy.\r\nPrzykład: ^(CVS|obrazy
 #. Resource IDs: (1061)
 msgid "Reset"
 msgstr "[pl-PL]"
+
diff --git a/grepWinNP3/lang/Português (Brasil) [pt-BR].lang b/grepWinNP3/lang/Português (Brasil) [pt-BR].lang
index caa16215c..d8d9cade3 100644
--- a/grepWinNP3/lang/Português (Brasil) [pt-BR].lang	
+++ b/grepWinNP3/lang/Português (Brasil) [pt-BR].lang	
@@ -1,4 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
+# encoding: UTF-8
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -414,8 +415,8 @@ msgid "This adds a new entry to the context menu named \"Open with Editor\""
 msgstr "Isso adiciona uma nova entrada para o menu de contexto, chamada: \"Abrir com o Editor\""
 
 #. Resource IDs: (1053)
-msgid "Treat files as UTF8"
-msgstr "Tratar arquivos como UTF8"
+msgid "Treat files as UTF-8"
+msgstr "Tratar arquivos como UTF-8"
 
 #. Resource IDs: (1045)
 msgid "Visit our website"
@@ -478,8 +479,8 @@ msgid "no text to test with available"
 msgstr "nenhum texto para testar disponível"
 
 #. Resource IDs: (112)
-msgid "only files that match this pattern are searched.\r\nUse \"|\" as the delimiter.\r\nExample: *.cpp|*.h"
-msgstr "Somente os arquivos correspondentes a esse padrão serão procurados.\r\nUse \"|\" como delimitador.\r\nExemplo: *.cpp|*.h"
+msgid "only files that match this pattern are searched.\r\nUse ""|"" as the delimiter.\r\nExample: *.cpp|*.h"
+msgstr "Somente os arquivos correspondentes a esse padrão serão procurados.\r\nUse ""|"" como delimitador.\r\nExemplo: *.cpp|*.h"
 
 #. Resource IDs: (129)
 msgid "read error"
@@ -513,3 +514,4 @@ msgstr "Você pode excluir diretórios, ex. CVS e images.\r\nExemplo: ^(CVS|imag
 #. Resource IDs: (1061)
 msgid "Reset"
 msgstr "[pt-BR]"
+
diff --git a/grepWinNP3/lang/Slovenčina (Slovensko) [sk-SK].lang b/grepWinNP3/lang/Slovenčina (Slovensko) [sk-SK].lang
index ec80b2058..a296a931c 100644
--- a/grepWinNP3/lang/Slovenčina (Slovensko) [sk-SK].lang	
+++ b/grepWinNP3/lang/Slovenčina (Slovensko) [sk-SK].lang	
@@ -414,7 +414,7 @@ msgid "This adds a new entry to the context menu named \"Open with Editor\""
 msgstr ""
 
 #. Resource IDs: (1053)
-msgid "Treat files as UTF8"
+msgid "Treat files as UTF-8"
 msgstr ""
 
 #. Resource IDs: (1045)
@@ -478,7 +478,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 ""
 
 #. Resource IDs: (129)
@@ -513,3 +513,4 @@ msgstr ""
 #. Resource IDs: (1061)
 msgid "Reset"
 msgstr "[sk-SK]"
+
diff --git a/grepWinNP3/lang/Svenska (Sverige) [sv-SE].lang b/grepWinNP3/lang/Svenska (Sverige) [sv-SE].lang
index 1974d7569..0ba320901 100644
--- a/grepWinNP3/lang/Svenska (Sverige) [sv-SE].lang	
+++ b/grepWinNP3/lang/Svenska (Sverige) [sv-SE].lang	
@@ -1,4 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
+# encoding: UTF-8
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -414,7 +415,7 @@ msgid "This adds a new entry to the context menu named \"Open with Editor\""
 msgstr ""
 
 #. Resource IDs: (1053)
-msgid "Treat files as UTF8"
+msgid "Treat files as UTF-8"
 msgstr ""
 
 #. Resource IDs: (1045)
@@ -478,7 +479,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 ""
 
 #. Resource IDs: (129)
@@ -513,3 +514,4 @@ msgstr ""
 #. Resource IDs: (1061)
 msgid "Reset"
 msgstr "[sv-SE]"
+
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 90e435d3c..c09703788 100644
--- a/grepWinNP3/lang/Türkçe (Türkiye) [tr-TR].lang	
+++ b/grepWinNP3/lang/Türkçe (Türkiye) [tr-TR].lang	
@@ -1,4 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
+# encoding: UTF-8
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -414,8 +415,8 @@ msgid "This adds a new entry to the context menu named \"Open with Editor\""
 msgstr ""Editörle Aç" içerik menüsüne yeni bir giriş ekler."
 
 #. Resource IDs: (1053)
-msgid "Treat files as UTF8"
-msgstr "Dosyaları UTF8 Olarak Kabul Et"
+msgid "Treat files as UTF-8"
+msgstr "Dosyaları UTF-8 Olarak Kabul Et"
 
 #. Resource IDs: (1045)
 msgid "Visit our website"
@@ -478,8 +479,8 @@ msgid "no text to test with available"
 msgstr "test edilecek metin yok"
 
 #. Resource IDs: (112)
-msgid "only files that match this pattern are searched.\r\nUse \"|\" as the delimiter.\r\nExample: *.cpp|*.h"
-msgstr "yalnızca bu şablonla eşleşen dosyalar aranır.\r\nSınırlayıcı olarak \"|\" kullanın.\r\nÖrnek: *.cpp|*.h"
+msgid "only files that match this pattern are searched.\r\nUse ""|"" as the delimiter.\r\nExample: *.cpp|*.h"
+msgstr "yalnızca bu şablonla eşleşen dosyalar aranır.\r\nSınırlayıcı olarak ""|"" kullanın.\r\nÖrnek: *.cpp|*.h"
 
 #. Resource IDs: (129)
 msgid "read error"
@@ -508,8 +509,9 @@ msgstr "özyinelemede aranan yollar.\r\n| sembolü ile ayrı yollar.\r\nÖrnek:
 
 #. 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 "dizinleri hariç tutabilirsiniz, ör. CVS ve Resimler.\r\nÖrnek: ^(CVS|images)$\r\nNot: klasörlerinin Windows\'ta 'gizli' olduğuna dikkat edin, bu nedenle genellikle taranmazlar."
+msgstr "dizinleri hariç tutabilirsiniz, ör. CVS ve Resimler.\r\nÖrnek: ^(CVS|images)$\r\nNot: '.svn' klasörlerinin Windows\'ta 'gizli' olduğuna dikkat edin, bu nedenle genellikle taranmazlar."
 
 #. Resource IDs: (1061)
 msgid "Reset"
 msgstr "[tr-TR]"
+
diff --git a/grepWinNP3/lang/Беларуская (Беларусь) [be-BY].lang b/grepWinNP3/lang/Беларуская (Беларусь) [be-BY].lang
index 864993a87..8a018272e 100644
--- a/grepWinNP3/lang/Беларуская (Беларусь) [be-BY].lang	
+++ b/grepWinNP3/lang/Беларуская (Беларусь) [be-BY].lang	
@@ -1,4 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
+# encoding: UTF-8
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -414,7 +415,7 @@ msgid "This adds a new entry to the context menu named \"Open with Editor\""
 msgstr "Функция добавляет в контекстное меню результатов пункт \"Открыть в редакторе\""
 
 #. Resource IDs: (1053)
-msgid "Treat files as UTF8"
+msgid "Treat files as UTF-8"
 msgstr "Файлы как UTF-8"
 
 #. Resource IDs: (1045)
@@ -478,8 +479,8 @@ 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"
-msgstr "Искать только соответствующие шаблону файлы.\r\nВертикальная черта \"|\" как разделитель.\r\nПример: *.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)
 msgid "read error"
@@ -513,3 +514,4 @@ msgstr "Вы можете исключить, например, CVS и изоб
 #. Resource IDs: (1061)
 msgid "Reset"
 msgstr "[be-BY]"
+
diff --git a/grepWinNP3/lang/Русский (Pоссия) [ru-RU].lang b/grepWinNP3/lang/Русский (Pоссия) [ru-RU].lang
index b6b2eef6f..88e522ea0 100644
--- a/grepWinNP3/lang/Русский (Pоссия) [ru-RU].lang	
+++ b/grepWinNP3/lang/Русский (Pоссия) [ru-RU].lang	
@@ -1,4 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
+# encoding: UTF-8
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -414,7 +415,7 @@ msgid "This adds a new entry to the context menu named \"Open with Editor\""
 msgstr "Функция добавляет в контекстное меню результатов пункт \"Открыть в редакторе\""
 
 #. Resource IDs: (1053)
-msgid "Treat files as UTF8"
+msgid "Treat files as UTF-8"
 msgstr "Файлы как UTF-8"
 
 #. Resource IDs: (1045)
@@ -478,8 +479,8 @@ 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"
-msgstr "Искать только соответствующие шаблону файлы.\r\nВертикальная черта \"|\" как разделитель.\r\nПример: *.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)
 msgid "read error"
@@ -513,3 +514,4 @@ msgstr "Вы можете исключить, например, CVS и изоб
 #. Resource IDs: (1061)
 msgid "Reset"
 msgstr "[ru-RU]"
+
diff --git a/grepWinNP3/lang/日本語 （日本） [ja-JP].lang b/grepWinNP3/lang/日本語 （日本） [ja-JP].lang
index c0380726d..ca3a88bed 100644
--- a/grepWinNP3/lang/日本語 （日本） [ja-JP].lang	
+++ b/grepWinNP3/lang/日本語 （日本） [ja-JP].lang	
@@ -1,4 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
+# encoding: UTF-8
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -414,7 +415,7 @@ msgid "This adds a new entry to the context menu named \"Open with Editor\""
 msgstr "コンテキストメニュー項目に新規エントリを追加 - \"エディタで開く\""
 
 #. Resource IDs: (1053)
-msgid "Treat files as UTF8"
+msgid "Treat files as UTF-8"
 msgstr "ファイルを UTF-8 として扱う"
 
 #. Resource IDs: (1045)
@@ -478,8 +479,8 @@ 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"
-msgstr "このパターンに一致するファイルのみ検索.\r\n区切り記号として \"|\" を使用します.\r\n指定例: *.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)
 msgid "read error"
@@ -508,8 +509,9 @@ msgstr "現在のパスは再帰的に検索されます.\r\nパスは \"|\" で
 
 #. 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 および images.\r\n指定例: ^(CVS|images)$\r\n注意, \".svn\" フォルダは通常の Windows では非表示のため、通常はスキャンの対象外になります.."
+msgstr "特定のディレクトリを除外できます。指定例: CVS および images.\r\n指定例: ^(CVS|images)$\r\n注意, '.svn' フォルダは通常の Windows では非表示のため、通常はスキャンの対象外になります.."
 
 #. Resource IDs: (1061)
 msgid "Reset"
 msgstr "[ja-JP]"
+
diff --git a/grepWinNP3/lang/简体中文 （中国） [zh-CN].lang b/grepWinNP3/lang/简体中文 （中国） [zh-CN].lang
index 1d46328ba..180b42f28 100644
--- a/grepWinNP3/lang/简体中文 （中国） [zh-CN].lang	
+++ b/grepWinNP3/lang/简体中文 （中国） [zh-CN].lang	
@@ -1,4 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
+# encoding: UTF-8
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -414,8 +415,8 @@ msgid "This adds a new entry to the context menu named \"Open with Editor\""
 msgstr "这将在上下文菜单中添加一个名为\"使用编辑器打开\"的条目."
 
 #. Resource IDs: (1053)
-msgid "Treat files as UTF8"
-msgstr "将文件视为 UTF8"
+msgid "Treat files as UTF-8"
+msgstr "将文件视为 UTF-8"
 
 #. Resource IDs: (1045)
 msgid "Visit our website"
@@ -478,8 +479,8 @@ 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"
-msgstr "仅匹配此样式的文件被搜索.\r\n使用 \"|\" 作为分隔符.\r\n例如: *.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)
 msgid "read error"
@@ -508,8 +509,9 @@ msgstr "将被递归搜索的路径.\r\n使用 \"|\" 符号来分隔路径.\r\n
 
 #. 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 和 images.\r\n例如: ^(CVS|images)$\r\n注意, \".svn\" 目录在Windows中是隐藏的, 所以通常不扫描它们."
+msgstr "你可以排除目录, 比如: CVS 和 images.\r\n例如: ^(CVS|images)$\r\n注意, '.svn' 目录在Windows中是隐藏的, 所以通常不扫描它们."
 
 #. Resource IDs: (1061)
 msgid "Reset"
 msgstr "[zh-CN]"
+
diff --git a/grepWinNP3/lang/한국어 (대한민국) [ko-KR].lang b/grepWinNP3/lang/한국어 (대한민국) [ko-KR].lang
index ac63eb80d..0214d884e 100644
--- a/grepWinNP3/lang/한국어 (대한민국) [ko-KR].lang	
+++ b/grepWinNP3/lang/한국어 (대한민국) [ko-KR].lang	
@@ -1,4 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
+# encoding: UTF-8
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -414,7 +415,7 @@ msgid "This adds a new entry to the context menu named \"Open with Editor\""
 msgstr ""
 
 #. Resource IDs: (1053)
-msgid "Treat files as UTF8"
+msgid "Treat files as UTF-8"
 msgstr ""
 
 #. Resource IDs: (1045)
@@ -478,7 +479,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 ""
 
 #. Resource IDs: (129)
@@ -513,3 +514,4 @@ msgstr ""
 #. Resource IDs: (1061)
 msgid "Reset"
 msgstr "[ko-KR]"
+
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index a767b5f8e..6029a9599 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.20.401.2"
+    version="5.20.402.1"
     type="win32"
   />
   <description>Notepad3 NF</description>
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 169477467..a0ce2fb28 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -8,12 +8,12 @@
 #define SAPPNAME "Notepad3"
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 20
-#define VERSION_REV 401
-#define VERSION_BUILD 2
+#define VERSION_REV 402
+#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 t7820-rk
+#define VERSION_COMMIT_ID nebukadn