diff --git a/Versions/build.txt b/Versions/build.txt
index b8626c4cf..d00491fd7 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-4
+1
diff --git a/Versions/day.txt b/Versions/day.txt
index d1e85f890..27a69f601 100644
--- a/Versions/day.txt
+++ b/Versions/day.txt
@@ -1 +1 @@
-326
+327
diff --git a/grepWinNP3/grepWinNP3.exe b/grepWinNP3/grepWinNP3.exe
index 7fa860553..921151161 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 e46ec66c0..295de8070 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 4b8978420..ca2724718 100644
--- a/grepWinNP3/lang/Afrikaans (Suid-Afrika) [af-ZA].lang
+++ b/grepWinNP3/lang/Afrikaans (Suid-Afrika) [af-ZA].lang
@@ -39,7 +39,7 @@ msgid "%ld more matches"
msgstr "%ld meer gevonden"
#. Resource IDs: (1069)
-msgid "%path% is replaced with the path of the file, %line% with the line to jump to"
+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"
#. Resource IDs: (119)
@@ -510,3 +510,6 @@ msgstr "het pad wordt recursief doorzocht.\r\nScheidt de paden met het | symbool
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 "Je kunt mappen uitsluiten, bv. CVS en afbeeldingen.\r\nVoorbeeld: ^(CVS|images)$\r\nOpmerking: '.svn' mappen zijn in Windows normaal verborgen en worden daarom normaal niet doorzocht."
+#. 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 d720660c0..1e7796cd6 100644
--- a/grepWinNP3/lang/Deutsch (Deutschland) [de-DE].lang
+++ b/grepWinNP3/lang/Deutsch (Deutschland) [de-DE].lang
@@ -39,8 +39,8 @@ msgid "%ld more matches"
msgstr "... und %ld Treffer mehr"
#. Resource IDs: (1069)
-msgid "%path% is replaced with the path of the file, %line% with the line to jump to"
-msgstr "%path% wird durch den Pfad der Datei ersetzt, %line% mit der Linie welche angezeigt werden soll."
+msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
+msgstr "%path% wird durch den Pfad der Datei ersetzt, %line% mit der Zeile welche angezeigt werden soll, %pattern% mit dem Suchbegriff."
#. Resource IDs: (119)
msgid "&About grepWinNP3..."
@@ -510,3 +510,6 @@ msgstr "Die Pfade werden rekursiv durchsucht.\r\nTrennen Sie Pfade mit dem | Sym
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 "Sie können Ordner ausschlissen, z.B. CVS und Bilder.\r\nBeispiel: ^(CVS|images)$\r\nHinweis: '.svn' Ordner sind normalerweise versteckt und deshalb per Default ausgeschlossen."
+#. 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 a4df8741b..02c4b34b5 100644
--- a/grepWinNP3/lang/English (United Kingdom) [en-GB].lang
+++ b/grepWinNP3/lang/English (United Kingdom) [en-GB].lang
@@ -39,7 +39,7 @@ msgid "%ld more matches"
msgstr ""
#. Resource IDs: (1069)
-msgid "%path% is replaced with the path of the file, %line% with the line to jump to"
+msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
msgstr ""
#. Resource IDs: (119)
@@ -510,3 +510,6 @@ msgstr ""
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 ""
+#. 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 5e74a713e..5b9d241c8 100644
--- a/grepWinNP3/lang/Español (España) [es-ES].lang
+++ b/grepWinNP3/lang/Español (España) [es-ES].lang
@@ -39,7 +39,7 @@ msgid "%ld more matches"
msgstr "%ld mas resultados"
#. Resource IDs: (1069)
-msgid "%path% is replaced with the path of the file, %line% with the line to jump to"
+msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
msgstr ""
#. Resource IDs: (119)
@@ -510,3 +510,6 @@ msgstr "la(s) ruta(s) que se busca(n) recursivamente.\r\nSepare rutas con el sim
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."
+#. 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 1e01e7484..ea5104b37 100644
--- a/grepWinNP3/lang/Français (France) [fr-FR].lang
+++ b/grepWinNP3/lang/Français (France) [fr-FR].lang
@@ -39,7 +39,7 @@ msgid "%ld more matches"
msgstr "%ld autres correspondances"
#. Resource IDs: (1069)
-msgid "%path% is replaced with the path of the file, %line% with the line to jump to"
+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"
#. Resource IDs: (119)
@@ -510,3 +510,6 @@ msgstr "Chemin(s) de recherche récursive.\n'|' pour ajouter un chemin.\nExemple
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."
+#. 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 d7d97c66f..77e553d8b 100644
--- a/grepWinNP3/lang/Italiano (Italia) [it-IT].lang
+++ b/grepWinNP3/lang/Italiano (Italia) [it-IT].lang
@@ -39,7 +39,7 @@ msgid "%ld more matches"
msgstr "%ld ulteriori risultati"
#. Resource IDs: (1069)
-msgid "%path% is replaced with the path of the file, %line% with the line to jump to"
+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"
#. Resource IDs: (119)
@@ -510,3 +510,6 @@ msgstr "il percorso(i) che viene cercato in modo ricorsivo.\nSeparare i percorsi
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."
+#. 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 a4df8741b..487868ec2 100644
--- a/grepWinNP3/lang/Magyar (Magyarország) [hu-HU].lang
+++ b/grepWinNP3/lang/Magyar (Magyarország) [hu-HU].lang
@@ -39,7 +39,7 @@ msgid "%ld more matches"
msgstr ""
#. Resource IDs: (1069)
-msgid "%path% is replaced with the path of the file, %line% with the line to jump to"
+msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
msgstr ""
#. Resource IDs: (119)
@@ -510,3 +510,6 @@ msgstr ""
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 ""
+#. 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 4b8978420..9d48a932d 100644
--- a/grepWinNP3/lang/Nederlands (Nederland) [nl-NL].lang
+++ b/grepWinNP3/lang/Nederlands (Nederland) [nl-NL].lang
@@ -39,7 +39,7 @@ msgid "%ld more matches"
msgstr "%ld meer gevonden"
#. Resource IDs: (1069)
-msgid "%path% is replaced with the path of the file, %line% with the line to jump to"
+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"
#. Resource IDs: (119)
@@ -510,3 +510,6 @@ msgstr "het pad wordt recursief doorzocht.\r\nScheidt de paden met het | symbool
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 "Je kunt mappen uitsluiten, bv. CVS en afbeeldingen.\r\nVoorbeeld: ^(CVS|images)$\r\nOpmerking: '.svn' mappen zijn in Windows normaal verborgen en worden daarom normaal niet doorzocht."
+#. Resource IDs: (1061)
+msgid "Reset"
+msgstr "[nl-NL]"
diff --git a/grepWinNP3/lang/Polski (Polska)Polski [pl-PL].lang b/grepWinNP3/lang/Polski (Polska)Polski [pl-PL].lang
index 39b20059e..ab9f38850 100644
--- a/grepWinNP3/lang/Polski (Polska)Polski [pl-PL].lang
+++ b/grepWinNP3/lang/Polski (Polska)Polski [pl-PL].lang
@@ -39,7 +39,7 @@ msgid "%ld more matches"
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"
+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."
#. Resource IDs: (119)
@@ -510,3 +510,6 @@ msgstr "Ścieżka(-i), która(-e) jest(są) przeszukiwana(-e) regularnie.\r\nOdd
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 "Można wykluczyć katalogi, np. CVS i obrazy.\r\nPrzykład: ^(CVS|obrazy)$\r\nUwaga, foldery '.svn' są ukryte w Windows, więc zwykle nie są one skanowane."
+#. 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 186fe2924..caa16215c 100644
--- a/grepWinNP3/lang/Português (Brasil) [pt-BR].lang
+++ b/grepWinNP3/lang/Português (Brasil) [pt-BR].lang
@@ -39,7 +39,7 @@ msgid "%ld more matches"
msgstr "%ld mais encontrados"
#. Resource IDs: (1069)
-msgid "%path% is replaced with the path of the file, %line% with the line to jump to"
+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"
#. Resource IDs: (119)
@@ -510,3 +510,6 @@ msgstr "O caminhos serão pesquisados recursivamente.\r\nSepare os caminhos com
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 "Você pode excluir diretórios, ex. CVS e images.\r\nExemplo: ^(CVS|images)$\r\nNote, '.svn' pastas 'ocultas' no Windows, geralmente não são escaneadas."
+#. 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 a4df8741b..ec80b2058 100644
--- a/grepWinNP3/lang/Slovenčina (Slovensko) [sk-SK].lang
+++ b/grepWinNP3/lang/Slovenčina (Slovensko) [sk-SK].lang
@@ -39,7 +39,7 @@ msgid "%ld more matches"
msgstr ""
#. Resource IDs: (1069)
-msgid "%path% is replaced with the path of the file, %line% with the line to jump to"
+msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
msgstr ""
#. Resource IDs: (119)
@@ -510,3 +510,6 @@ msgstr ""
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 ""
+#. 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 a4df8741b..1974d7569 100644
--- a/grepWinNP3/lang/Svenska (Sverige) [sv-SE].lang
+++ b/grepWinNP3/lang/Svenska (Sverige) [sv-SE].lang
@@ -39,7 +39,7 @@ msgid "%ld more matches"
msgstr ""
#. Resource IDs: (1069)
-msgid "%path% is replaced with the path of the file, %line% with the line to jump to"
+msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
msgstr ""
#. Resource IDs: (119)
@@ -510,3 +510,6 @@ msgstr ""
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 ""
+#. 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 a10646f35..90e435d3c 100644
--- a/grepWinNP3/lang/Türkçe (Türkiye) [tr-TR].lang
+++ b/grepWinNP3/lang/Türkçe (Türkiye) [tr-TR].lang
@@ -39,7 +39,7 @@ msgid "%ld more matches"
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"
+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"
#. Resource IDs: (119)
@@ -510,3 +510,6 @@ msgstr "özyinelemede aranan yollar.\r\n| sembolü ile ayrı yollar.\r\nÖrnek:
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."
+#. Resource IDs: (1061)
+msgid "Reset"
+msgstr "[tr-TR]"
diff --git a/grepWinNP3/lang/Беларуская (Беларусь) [be-BY].lang b/grepWinNP3/lang/Беларуская (Беларусь) [be-BY].lang
index a7108cd60..864993a87 100644
--- a/grepWinNP3/lang/Беларуская (Беларусь) [be-BY].lang
+++ b/grepWinNP3/lang/Беларуская (Беларусь) [be-BY].lang
@@ -39,7 +39,7 @@ msgid "%ld more matches"
msgstr "больше %ld совпадений"
#. Resource IDs: (1069)
-msgid "%path% is replaced with the path of the file, %line% with the line to jump to"
+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% на соответствующую строку."
#. Resource IDs: (119)
@@ -510,3 +510,6 @@ msgstr "Рекурсивный поиск путей.\r\nРазделение п
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: (1061)
+msgid "Reset"
+msgstr "[be-BY]"
diff --git a/grepWinNP3/lang/Русский (Pоссия) [ru-RU].lang b/grepWinNP3/lang/Русский (Pоссия) [ru-RU].lang
index a7108cd60..b6b2eef6f 100644
--- a/grepWinNP3/lang/Русский (Pоссия) [ru-RU].lang
+++ b/grepWinNP3/lang/Русский (Pоссия) [ru-RU].lang
@@ -39,7 +39,7 @@ msgid "%ld more matches"
msgstr "больше %ld совпадений"
#. Resource IDs: (1069)
-msgid "%path% is replaced with the path of the file, %line% with the line to jump to"
+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% на соответствующую строку."
#. Resource IDs: (119)
@@ -510,3 +510,6 @@ msgstr "Рекурсивный поиск путей.\r\nРазделение п
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: (1061)
+msgid "Reset"
+msgstr "[ru-RU]"
diff --git a/grepWinNP3/lang/日本語 (日本) [ja-JP].lang b/grepWinNP3/lang/日本語 (日本) [ja-JP].lang
index 850296e20..c0380726d 100644
--- a/grepWinNP3/lang/日本語 (日本) [ja-JP].lang
+++ b/grepWinNP3/lang/日本語 (日本) [ja-JP].lang
@@ -39,7 +39,7 @@ msgid "%ld more matches"
msgstr "%ld 以上の一致"
#. Resource IDs: (1069)
-msgid "%path% is replaced with the path of the file, %line% with the line to jump to"
+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% で指定した行に移動"
#. Resource IDs: (119)
@@ -510,3 +510,6 @@ msgstr "現在のパスは再帰的に検索されます.\r\nパスは \"|\" で
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 では非表示のため、通常はスキャンの対象外になります.."
+#. Resource IDs: (1061)
+msgid "Reset"
+msgstr "[ja-JP]"
diff --git a/grepWinNP3/lang/简体中文 (中国) [zh-CN].lang b/grepWinNP3/lang/简体中文 (中国) [zh-CN].lang
index 1c8a16264..1d46328ba 100644
--- a/grepWinNP3/lang/简体中文 (中国) [zh-CN].lang
+++ b/grepWinNP3/lang/简体中文 (中国) [zh-CN].lang
@@ -39,7 +39,7 @@ msgid "%ld more matches"
msgstr "还有 %ld 个匹配"
#. Resource IDs: (1069)
-msgid "%path% is replaced with the path of the file, %line% with the line to jump to"
+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% 将被替换为要转至的行号."
#. Resource IDs: (119)
@@ -510,3 +510,6 @@ msgstr "将被递归搜索的路径.\r\n使用 \"|\" 符号来分隔路径.\r\n
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中是隐藏的, 所以通常不扫描它们."
+#. Resource IDs: (1061)
+msgid "Reset"
+msgstr "[zh-CN]"
diff --git a/grepWinNP3/lang/한국어 (대한민국) [ko-KR].lang b/grepWinNP3/lang/한국어 (대한민국) [ko-KR].lang
index a4df8741b..ac63eb80d 100644
--- a/grepWinNP3/lang/한국어 (대한민국) [ko-KR].lang
+++ b/grepWinNP3/lang/한국어 (대한민국) [ko-KR].lang
@@ -39,7 +39,7 @@ msgid "%ld more matches"
msgstr ""
#. Resource IDs: (1069)
-msgid "%path% is replaced with the path of the file, %line% with the line to jump to"
+msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
msgstr ""
#. Resource IDs: (119)
@@ -510,3 +510,6 @@ msgstr ""
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 ""
+#. Resource IDs: (1061)
+msgid "Reset"
+msgstr "[ko-KR]"
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index c76b00a79..e2f57d94b 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
Notepad3 NF
diff --git a/src/Edit.c b/src/Edit.c
index 5cf0c1dd7..2e7e08f7b 100644
--- a/src/Edit.c
+++ b/src/Edit.c
@@ -2135,7 +2135,8 @@ void EditFindMatchingBrace()
if (iMatchingBracePos != (DocPos)-1) {
iMatchingBracePos = bIsAfter ? iMatchingBracePos : SciCall_PositionAfter(iMatchingBracePos);
_BEGIN_UNDO_ACTION_;
- EditSetSelectionEx(iMatchingBracePos, iMatchingBracePos, -1, -1);
+ SciCall_GotoPos(iMatchingBracePos);
+ Sci_ScrollToCurrentLine();
_END_UNDO_ACTION_;
}
}
@@ -3077,7 +3078,8 @@ void EditIndentBlock(HWND hwnd, int cmd, bool bFormatIndentation, bool bForceAll
}
}
else {
- EditSetSelectionEx(iInitialPos, iInitialPos, -1, -1);
+ SciCall_GotoPos(iInitialPos);
+ Sci_ScrollToCurrentLine();
}
_END_UNDO_ACTION_;
@@ -4969,7 +4971,7 @@ void EditSetSelectionEx(DocPos iAnchorPos, DocPos iCurrentPos, DocPos vSpcAnchor
else {
SciCall_SetSel(iAnchorPos, iCurrentPos); // scrolls into view
}
- EditScrollToLine(Sci_GetCurrentLineNumber()); // normalize view
+ EditNormalizeView(Sci_GetCurrentLineNumber()); // normalize view
}
//~~~_END_UNDO_ACTION_;~~~
@@ -4990,10 +4992,11 @@ void EditEnsureConsistentLineEndings(HWND hwnd)
//=============================================================================
//
-// EditScrollToLine() - normalize View
+// EditNormalizeView()
//
-void EditScrollToLine(const DocLn iDocLine)
+void EditNormalizeView(const DocLn iDocLine)
{
+ SciCall_EnsureVisible(iDocLine);
if (iDocLine == Sci_GetCurrentLineNumber()) {
Sci_ScrollChooseCaret();
}
@@ -5017,7 +5020,7 @@ void EditEnsureSelectionVisible()
SciCall_EnsureVisible(iAnchorLine);
if (iAnchorLine != iCurrentLine) { SciCall_EnsureVisible(iCurrentLine); }
- EditScrollToLine(Sci_GetCurrentLineNumber()); // normalize view
+ Sci_ScrollToCurrentLine(); // normalize view
}
@@ -5043,7 +5046,7 @@ void EditJumpTo(DocLn iNewLine, DocPos iNewCol)
const DocPos iNewPos = SciCall_FindColumn(iNewLine, iNewCol);
SciCall_GotoPos(iNewPos);
- EditScrollToLine(Sci_GetCurrentLineNumber()); // normalize view
+ Sci_ScrollToCurrentLine();
}
@@ -6850,7 +6853,7 @@ void EditSelectionMultiSelectAll()
if (iMainAnchor > iMainCaret) {
SciCall_SwapMainAnchorCaret();
}
- EditScrollToLine(Sci_GetCurrentLineNumber()); // normalize view
+ EditNormalizeView(Sci_GetCurrentLineNumber()); // normalize view
SciCall_SetTargetRange(saveTargetBeg, saveTargetEnd); //restore
}
@@ -7165,11 +7168,11 @@ void EditToggleView(HWND hwnd)
EditHideNotMarkedLineRange(hwnd, FocusedView.HideNonMatchedLines);
if (FocusedView.HideNonMatchedLines) {
- EditScrollToLine(0);
+ SciCall_GotoPos(0);
SciCall_SetReadOnly(true);
}
else {
- EditScrollToLine(Sci_GetCurrentLineNumber()); // normalize view
+ Sci_ScrollToCurrentLine();
SciCall_SetReadOnly(false);
}
diff --git a/src/Edit.h b/src/Edit.h
index b3b09840d..8e7d13768 100644
--- a/src/Edit.h
+++ b/src/Edit.h
@@ -85,7 +85,7 @@ void EditSortLines(HWND hwnd,int iSortFlags);
void EditJumpTo(DocLn iNewLine, DocPos iNewCol);
void EditSetSelectionEx(DocPos iAnchorPos, DocPos iCurrentPos, DocPos vSpcAnchor, DocPos vSpcCurrent);
void EditFixPositions();
-void EditScrollToLine(const DocLn iDocLine);
+void EditNormalizeView(const DocLn iDocLine);
void EditEnsureSelectionVisible();
void EditEnsureConsistentLineEndings(HWND hwnd);
void EditGetExcerpt(HWND hwnd,LPWSTR lpszExcerpt,DWORD cchExcerpt);
diff --git a/src/Notepad3.c b/src/Notepad3.c
index e58687d7f..9830e4373 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -2464,6 +2464,7 @@ LRESULT MsgDPIChanged(HWND hwnd, WPARAM wParam, LPARAM lParam)
if (FocusedView.HideNonMatchedLines) { EditToggleView(Globals.hwndEdit); }
SciCall_GotoPos(pos);
+ Sci_ScrollToCurrentLine();
if (Flags.bLargeFileLoaded) {
EditDoVisibleStyling();
@@ -2866,12 +2867,11 @@ LRESULT MsgContextMenu(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
POINT ptc;
ptc.x = pt.x; ptc.y = pt.y;
ScreenToClient(Globals.hwndEdit, &ptc);
- DocPos iNewPos = SciCall_PositionFromPoint(ptc.x, ptc.y);
- EditSetSelectionEx(iNewPos, iNewPos, -1, -1);
+ //~SciCall_GotoPos(SciCall_PositionFromPoint(ptc.x, ptc.y));
}
if (pt.x == -1 && pt.y == -1) {
- DocPos iCurrentPos = SciCall_GetCurrentPos();
+ DocPos const iCurrentPos = SciCall_GetCurrentPos();
pt.x = (LONG)SciCall_PointXFromPosition(iCurrentPos);
pt.y = (LONG)SciCall_PointYFromPosition(iCurrentPos);
ClientToScreen(Globals.hwndEdit, &pt);
@@ -2883,8 +2883,7 @@ LRESULT MsgContextMenu(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
case IDC_TOOLBAR:
case IDC_STATUSBAR:
case IDC_REBAR:
- if (pt.x == -1 && pt.y == -1)
- GetCursorPos(&pt);
+ if (pt.x == -1 && pt.y == -1) { GetCursorPos(&pt); }
imenu = 1;
break;
}
@@ -2927,10 +2926,11 @@ LRESULT MsgChangeNotify(HWND hwnd, WPARAM wParam, LPARAM lParam)
if (FileWatching.MonitoringLog)
{
SciCall_SetReadOnly(FileWatching.MonitoringLog);
- EditScrollToLine(Sci_GetLastDocLineNumber());
+ EditNormalizeView(Sci_GetLastDocLineNumber());
}
else {
SciCall_GotoPos(iCurPos);
+ Sci_ScrollToCurrentLine();
}
}
}
@@ -4695,9 +4695,8 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
if (iNextLine != (DocLn)-1)
{
- SciCall_EnsureVisible(iNextLine);
SciCall_GotoLine(iNextLine);
- EditScrollToLine(Sci_GetCurrentLineNumber()); // normalize view
+ EditNormalizeView(Sci_GetCurrentLineNumber());
}
}
break;
@@ -4716,9 +4715,8 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
if (iNextLine != (DocLn)-1)
{
- SciCall_EnsureVisible(iNextLine);
SciCall_GotoLine(iNextLine);
- EditScrollToLine(Sci_GetCurrentLineNumber()); // normalize view
+ EditNormalizeView(Sci_GetCurrentLineNumber());
}
}
break;
@@ -4787,7 +4785,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
case IDM_EDIT_SELTONEXT:
{
SciCall_RotateSelection();
- EditScrollToLine(Sci_GetCurrentLineNumber()); // normalize view
+ EditNormalizeView(Sci_GetCurrentLineNumber());
}
break;
@@ -4800,7 +4798,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
DocPosU const iNewMain = SciCall_GetSelections() - 1;
SciCall_SetMainSelection(iNewMain);
}
- EditScrollToLine(Sci_GetCurrentLineNumber()); // normalize view
+ EditNormalizeView(Sci_GetCurrentLineNumber()); // normalize view
}
break;
@@ -5211,7 +5209,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
FileWatching.AutoReloadTimeout = 250UL;
UndoRedoRecordingStop();
SciCall_SetEndAtLastLine(false);
- EditScrollToLine(Sci_GetLastDocLineNumber());
+ EditNormalizeView(Sci_GetLastDocLineNumber());
}
else {
s_flagChangeNotify = FileWatching.flagChangeNotify;
@@ -5221,7 +5219,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
FileWatching.AutoReloadTimeout = Settings2.AutoReloadTimeout;
UndoRedoRecordingStart();
SciCall_SetEndAtLastLine(!Settings.ScrollPastEOF);
- EditScrollToLine(Sci_GetCurrentLineNumber()); // normalize view
+ EditNormalizeView(Sci_GetCurrentLineNumber()); // normalize view
}
InstallFileWatching(Globals.CurrentFile); // force
@@ -5533,7 +5531,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
SciCall_SetIndicatorCurrent(INDIC_NP3_MULTI_EDIT);
SciCall_IndicatorClearRange(0, Sci_GetDocEndPosition());
SciCall_ClearSelections();
- EditSetSelectionEx(iCurPos, iCurPos, -1, -1);
+ SciCall_GotoPos(iCurPos);
_END_UNDO_ACTION_;
s_bInMultiEditMode = false;
--skipLevel;
@@ -5541,7 +5539,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
if ((!SciCall_IsSelectionEmpty() || Sci_IsMultiOrRectangleSelection()) && (skipLevel == Settings2.ExitOnESCSkipLevel)) {
_BEGIN_UNDO_ACTION_;
- EditSetSelectionEx(iCurPos, iCurPos, -1, -1);
+ SciCall_GotoPos(iCurPos);
_END_UNDO_ACTION_;
skipLevel -= Defaults2.ExitOnESCSkipLevel;
}
@@ -5559,7 +5557,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
default:
_BEGIN_UNDO_ACTION_;
- EditSetSelectionEx(iCurPos, iCurPos, -1, -1);
+ SciCall_GotoPos(iCurPos);
_END_UNDO_ACTION_;
break;
}
@@ -9385,7 +9383,8 @@ bool FileLoad(bool bDontSave, bool bNew, bool bReload,
if (bReload && !FileWatching.MonitoringLog)
{
_BEGIN_UNDO_ACTION_;
- EditSetSelectionEx(0, 0, -1, -1);
+ SciCall_GotoPos(0);
+ Sci_ScrollToCurrentLine();
_END_UNDO_ACTION_;
_BEGIN_UNDO_ACTION_;
@@ -9465,7 +9464,7 @@ bool FileLoad(bool bDontSave, bool bNew, bool bReload,
else if ((iCaretPos >= 0) && (iAnchorPos >= 0))
{
SciCall_SetSel(iAnchorPos, iCaretPos); // scroll into view
- EditScrollToLine(Sci_GetCurrentLineNumber());
+ EditNormalizeView(Sci_GetCurrentLineNumber());
}
}
@@ -9569,7 +9568,7 @@ bool FileRevert(LPCWSTR szFileName, bool bIgnoreCmdLnEnc)
if (bIsAtDocEnd || FileWatching.MonitoringLog) {
bPreserveView = false;
SciCall_DocumentEnd();
- EditScrollToLine(Sci_GetLastDocLineNumber());
+ EditNormalizeView(Sci_GetLastDocLineNumber());
}
}
@@ -9580,7 +9579,7 @@ bool FileRevert(LPCWSTR szFileName, bool bIgnoreCmdLnEnc)
SciCall_ClearSelections();
bPreserveView = false;
SciCall_DocumentEnd();
- EditScrollToLine(Sci_GetLastDocLineNumber());
+ EditNormalizeView(Sci_GetLastDocLineNumber());
}
}
diff --git a/src/SciCall.h b/src/SciCall.h
index 8df7cfc5f..cfd709748 100644
--- a/src/SciCall.h
+++ b/src/SciCall.h
@@ -600,7 +600,7 @@ inline DocPos Sci_GetRangeMaxLineLength(DocLn iBeginLine, DocLn iEndLine) {
// respect VSlop settings
inline void Sci_ScrollChooseCaret() { SciCall_ScrollCaret(); SciCall_ChooseCaretX(); }
-inline void Sci_ScrollToLine(DocLn line) { SciCall_ScrollRange(SciCall_PositionFromLine(line), SciCall_GetLineEndPosition(line)); }
+inline void Sci_ScrollToLine(DocLn line) { SciCall_EnsureVisible(line); SciCall_ScrollRange(SciCall_PositionFromLine(line), SciCall_GetLineEndPosition(line)); }
inline void Sci_ScrollToCurrentLine() { Sci_ScrollToLine(Sci_GetCurrentLineNumber()); }
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 643a3c2ae..eefa91e64 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -8,8 +8,8 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 20
-#define VERSION_REV 326
-#define VERSION_BUILD 4
+#define VERSION_REV 327
+#define VERSION_BUILD 1
#define SCINTILLA_VER 432
#define ONIGURUMA_REGEX_VER 6.9.4
#define UCHARDET_VER 2018.09.27