Merge branch 'Dev_Master' into Future_Dev_Master

2026-06-14 21:09:05 +08:00 · 2023-01-02 11:58:12 +01:00 · 2023-01-02 11:58:12 +01:00 · fb37a52e0c
commit fb37a52e0c
parent cf9b776f59 ba0c256476
152 changed files with 25682 additions and 522 deletions
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@ -2,7 +2,7 @@
 =                                                                              =
 =            Notepad3 - light-weight Scintilla-based text editor for Windows   =
 =                                                                              =
-=                                                   (c) Rizonesoft 2008-2022   =
+=                                                   (c) Rizonesoft 2008-2023   =
 =                                                 https://www.rizonesoft.com   =
 =                                                                              =
 ================================================================================
@ -34,7 +34,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library


 ========================================================
-Current BETA/RC Version 5.22.1228.(build_#) (2022-12-28)
+Current BETA/RC Version 5.23.101.(build_#) (2023-01-01)
 ========================================================

 --------------------------------------------------------
@ -63,6 +63,12 @@ NEW:
 CHANGES:
 --------------------------------------------------------
 [.###.#]- .
+[.101.1]- Fix and refactoring window positioning respecting monitor DPI.
+[1230.1]- Revert to Lexilla's standard Markdown lexer (LEX).
+[1230.1]- Change background color for Heading 1 to enhance contrast to std Hyperlink (LEX).
+[1230.1]- Visible representation of EOL characters.
+[1230.1]- Refactoring of using SCI_REPLACETARGET(MINIMAL).
+[1230.1]- Lexer Registry-Files: split string and GUID String coloring (LEX).
 [1228.1]- JSON lexer: Same style for SCE_JSON_COMPACTIRI and SCE_JSON_PROPERTYNAME (LEX).
 [1228.1]- Status-bar double-click line-break mode: Cycle only between CR+LF <-> LF modes.
 [1220.1]- Update Lexer "AutoIt3 Script" to Autoit v3.3.16.1.
@ -111,6 +117,8 @@ CHANGES Versions in Tools or Libraries:
 FIXES:
 --------------------------------------------------------
 [.###.#]- .
+[1230.1]- Minor bugs related to new feature Change-History.
+[1230.1]- (re)setting default window position in case of non std DPI resolution.
 [1228.1]- Speedup search&replace in large text files.
 [1227.1]- Use alternate path, if Path_GetKnownFolder() failed.
 [1215.1]- Set alpha (80) for "highlight current line" translucency, if not given.
--- a/Build/Docs/KeyboardShortcuts.txt
+++ b/Build/Docs/KeyboardShortcuts.txt
@ -2,7 +2,7 @@
 =                                                                              =
 =            Notepad3 - light-weight Scintilla-based text editor for Windows   =
 =                                                                              =
-=                                                   (c) Rizonesoft 2008-2022   =
+=                                                   (c) Rizonesoft 2008-2023   =
 =                                                 https://www.rizonesoft.com   =
 =                                                                              =
 ================================================================================
--- a/Build/Docs/Notepad3.txt
+++ b/Build/Docs/Notepad3.txt
@ -3,7 +3,7 @@
 =                                                                     =
 =   Notepad3 - light-weight Scintilla-based text editor for Windows   =
 =                                                                     =
-=                                          (c) Rizonesoft 2008-2022   =
+=                                          (c) Rizonesoft 2008-2023   =
 =                                            https://rizonesoft.com   =
 =                                                                     =
 =                          forked from Notepad2-mod                   =
--- a/Build/make_portable(.zip).cmd
+++ b/Build/make_portable(.zip).cmd
@ -12,7 +12,7 @@ rem *   Batch file for creating "Portable (*.zip)" packages
 rem *                                                                            *
 rem * See License.txt for details about distribution and modification.           *
 rem *                                                                            *
-rem *                                                 (c) Rizonesoft 2008-2022   *
+rem *                                                 (c) Rizonesoft 2008-2023   *
 rem *                                                   https://rizonesoft.com   *
 rem *                                                                            *
 rem ******************************************************************************
--- a/Build/notepad3_x64_setup.iss
+++ b/Build/notepad3_x64_setup.iss
@ -1,6 +1,6 @@
 ;* Notepad3 - Installer script x64 and amr64
 ;*
-;* (c) Rizonesoft 2008-2022
+;* (c) Rizonesoft 2008-2023

 ; Requirements:
 ; Inno Setup: https://www.jrsoftware.org/isdl.php
@ -27,7 +27,7 @@
 #define app_name "Notepad3"
 #define app_publisher "Rizonesoft"
 #define app_version GetVersionNumbersString(bindir + "\Release_x64_v143\Notepad3.exe")
-#define app_copyright "Copyright © 2008-2022 Rizonesoft"
+#define app_copyright "Copyright © 2008-2023 Rizonesoft"
 #define quick_launch "{userappdata}\Microsoft\Internet Explorer\Quick Launch"

 [Setup]
--- a/Build/notepad3_x86_setup.iss
+++ b/Build/notepad3_x86_setup.iss
@ -1,6 +1,6 @@
 ;* Notepad3 - Installer script x86
 ;*
-;* (c) Rizonesoft 2008-2022
+;* (c) Rizonesoft 2008-2023

 ; Requirements:
 ; Inno Setup: https://www.jrsoftware.org/isdl.php
@ -27,7 +27,7 @@
 #define app_name "Notepad3"
 #define app_publisher "Rizonesoft"
 #define app_version GetVersionNumbersString(bindir + "\Release_x86_v143\Notepad3.exe")
-#define app_copyright "Copyright © 2008-2022 Rizonesoft"
+#define app_copyright "Copyright © 2008-2023 Rizonesoft"
 #define quick_launch "{userappdata}\Microsoft\Internet Explorer\Quick Launch"

 [Setup]
--- a/License.txt
+++ b/License.txt
@ -1,6 +1,6 @@
 License for Notepad3 and MiniPath.
 =====================
-Notepad3 and MiniPath Copyright (c) 2008-2022 Rizonesoft, All rights reserved.
+Notepad3 and MiniPath Copyright (c) 2008-2023 Rizonesoft, All rights reserved.
 https://www.rizonesoft.com

 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
--- a/Readme.txt
+++ b/Readme.txt
@ -2,7 +2,7 @@
 =                                                                              =
 =            Notepad3 - light-weight Scintilla-based text editor for Windows   =
 =                                                                              =
-=                                                   (c) Rizonesoft 2008-2022   =
+=                                                   (c) Rizonesoft 2008-2023   =
 =                                                 https://www.rizonesoft.com   =
 =                                                                              =
 ================================================================================
@ -148,7 +148,7 @@ Notepad3 icon by Vexels.com     https://www.vexels.com
 --------------------------------------------------------------------------------
 Notepad3 Licence:
 -----------------
-Notepad3 and MiniPath Copyright © 2008-2022 Rizonesoft, All rights reserved.
+Notepad3 and MiniPath Copyright © 2008-2023 Rizonesoft, All rights reserved.
 https://www.rizonesoft.com

 Redistribution and use in source and binary forms, with or without modification,
--- a/Versions/AssemblyInfo.inf
+++ b/Versions/AssemblyInfo.inf
@ -7,7 +7,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Rizonesoft")]
 [assembly: AssemblyProduct("Notepad3")]
-[assembly: AssemblyCopyright("Copyright © Rizonesoft 2008-2022")]
+[assembly: AssemblyCopyright("Copyright © Rizonesoft 2008-2023")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/Versions/day.txt
+++ b/Versions/day.txt
@ -1 +1 @@
-1228
+101
--- a/translate.txt
+++ b/translate.txt
@ -3,7 +3,7 @@
 ==  This ".txt" file is intended for "Translators" to communicate to them the "Line numbers" of the   ==
 ==  "Added or Modified" items in the "Resource" files ("filename_xx_yy.rc" and "grepWinNP3.lang").    ==
 ==                                                                                                    ==
-==                                                                         Last update:  2022-12-13   ==
+==                                                                         Last update:  2022-12-30   ==
 ========================================================================================================

 January 2022:   Line numbers to translate_2022-01 - https://workupload.com/file/3kmZN49gB9w (2022-01-29)
@ -28,7 +28,7 @@ October 2022:   Line numbers to translate_2022-10 - https://workupload.com/file/

 November 2022:  Line numbers to translate_2022-11 - No "Added or Modified" items in November 2022

-December 2022:  Line numbers to translate_2022-12 - https://workupload.com/file/Yd53Fd54Kzg (2022-12-13)
+December 2022:  Line numbers to translate_2022-12 - https://workupload.com/file/Jqk5WuVHdRP (2022-12-30)


 Comments and suggestions are welcome... 😃
--- a/language/common_res.rc
+++ b/language/common_res.rc
@ -71,7 +71,7 @@ IDC_COPY                CURSOR                  "Copy.cur"
 // =============================================================================
 // Following Text is streamed to RichEdit Control supporting ANSI CP-1252 only
 // Unicode characters have to be encoded using '\\uN<ch>' sequences.
-// Example: Küng => K\\u252nng
+// Example: K<EFBFBD>ng => K\\u252nng
 // =============================================================================

 STRINGTABLE
@ -175,7 +175,7 @@ IDS_MUI_ABOUT_LICENSES  "\
 IDS_MUI_ABOUT_RTF_6  "\
 \\cf0 \\fs20\\b1\\ul1 Notepad3 License:\\ul0\\b0\\fs18\\par\
 \\cf0 \\par\
-\\cf0 Notepad3 and MiniPath Copyright \\u0169   2008-2022 Rizonesoft, All rights reserved.\\par\
+\\cf0 Notepad3 and MiniPath Copyright \\u0169   2008-2023 Rizonesoft, All rights reserved.\\par\
 \\cf0 https://www.rizonesoft.com\\par\
 \\cf0 \\par\
 \\cf0 Redistribution and use in source and binary forms, with or without modification,\\par\
--- a/language/np3_af_za/dialogs_af_za.rc
+++ b/language/np3_af_za/dialogs_af_za.rc
@ -74,13 +74,13 @@ BEGIN
    CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | RICHEDTCTRL_ADDSTYLE,20,90,360,170, ES_EX_ZOOMABLE
 END

-IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 300, 210
+IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 310, 210
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Command Line Help"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,239,187,55,16
-    EDITTEXT        IDC_CMDLINEHELP,15,7,278,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
+    DEFPUSHBUTTON   "OK",IDOK,249,187,55,16
+    EDITTEXT        IDC_CMDLINEHELP,15,7,288,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
 END

 IDD_MUI_FIND DIALOGEX 0, 0, 283, 142
--- a/language/np3_af_za/lexer_af_za.rc
+++ b/language/np3_af_za/lexer_af_za.rc
@ -496,6 +496,7 @@ BEGIN
    IDS_LEX_STR_63387       "Simbool Operateur"
    IDS_LEX_STR_63388       "String EOL"
    IDS_LEX_STR_63397       "Backticks"
+    IDS_LEX_STR_63398       "GUID String"
 END

 STRINGTABLE
--- a/language/np3_af_za/strings_af_za.rc
+++ b/language/np3_af_za/strings_af_za.rc
@ -174,6 +174,7 @@ BEGIN
    IDS_MUI_REPLCOUNT       "%s voorkoms(e) van gespesifiseerde soekpatroon vervang."
    IDS_MUI_ASK_ENCODING    "As u die lêer kodering van een kodering na 'n ander skuif, kan u nie-ondersteunde teks vervang met verstek karakters, en die ongedaan geskiedenis sal skoongemaak word. Gaan aan?"
    IDS_MUI_ASK_ENCODING2   "Jy is op die punt om die kodering van 'n leÃ« lêer te verander. Let daarop dat dit die geskiedenis ongedaan maak, aangesien dit nie met die nuwe enkodering gesinkroniseer kan word nie. Gaan aan?"
+    IDS_MUI_ASK_CLEAR_UNDO  "This operation will clear the undo history. Continue?"
    IDS_MUI_READONLY_SAVE   """%s"" is beskermd. Stoor na 'n ander lêer?"
    IDS_MUI_FILECHANGENOTIFY
                            "Die huidige lêer is gewysig deur 'n eksterne program. Herlaai?"
@ -315,8 +316,8 @@ Opsies:\r\n\
 /b\tMaak 'n nuwe plakbord oop om klipbordinskrywings te versamel.\r\n\
 /n\tMaak altyd 'n nuwe venster oop (/ns enkele lêer instansie).\r\n\
 /r\tHergebruik venster (/rs enkele lêer instansie).\r\n\
-/p\tStel venster posisie en grootte (/p0, /ps, /pf,l,t,r,b,m)\r\n\
-\tor /p <left>,<top>,<width>,<height>[,<dpi>,<max>]    [alle heelgetalle].\r\n\
+/p\tStel venster posisie en grootte (/p0,/ps,/pd,f,l,t,r,b,m)\r\n\
+\tor /p <left>,<top>,<width>,<height>[,<dpi>,<max>]  [alle heelgetalle].\r\n\
 /t\tStel venster titel.\r\n\
 /i\tBegin as tray ikoon.\r\n\
 /o\tHou venster bo-op.\r\n\
--- a/language/np3_be_by/dialogs_be_by.rc
+++ b/language/np3_be_by/dialogs_be_by.rc
@ -74,13 +74,13 @@ BEGIN
    CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | RICHEDTCTRL_ADDSTYLE,20,90,360,170, ES_EX_ZOOMABLE
 END

-IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 300, 210
+IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 320, 210
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Параметры камандавага радку"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,239,187,55,16
-    EDITTEXT        IDC_CMDLINEHELP,15,7,278,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
+    DEFPUSHBUTTON   "OK",IDOK,259,187,55,16
+    EDITTEXT        IDC_CMDLINEHELP,15,7,298,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
 END

 IDD_MUI_FIND DIALOGEX 0, 0, 313, 142
--- a/language/np3_be_by/lexer_be_by.rc
+++ b/language/np3_be_by/lexer_be_by.rc
@ -496,6 +496,7 @@ BEGIN
    IDS_LEX_STR_63387       "Symbol Operator"
    IDS_LEX_STR_63388       "String EOL"
    IDS_LEX_STR_63397       "Backticks"
+    IDS_LEX_STR_63398       "GUID String"
 END

 STRINGTABLE
--- a/language/np3_be_by/strings_be_by.rc
+++ b/language/np3_be_by/strings_be_by.rc
@ -174,6 +174,7 @@ BEGIN
    IDS_MUI_REPLCOUNT       "Заменена ўваходжанняў вызначанага шаблона пошуку: %s."
    IDS_MUI_ASK_ENCODING    "Пераключэнне кадоўкі файла з адной на другую можа замяніць непадтрымоўваны тэкст сімваламі-заменнікамі, а гісторыя адмены будзе прыбрана. Усё роўна працягнуць?"
    IDS_MUI_ASK_ENCODING2   "Вы збіраецеся змяніць кадоўку пустога файла. Звярніце ўвагу, што гэта прыбярэ гісторыю адмены, паколькі яна не можа быць скаардынаванай з новай кадоўкай. Усё роўна працягнуць?"
+    IDS_MUI_ASK_CLEAR_UNDO  "This operation will clear the undo history. Continue?"
    IDS_MUI_READONLY_SAVE   "«%s» толькі для чытання. Захваць у іншы файл?"
    IDS_MUI_FILECHANGENOTIFY
                            "Гэты файл быў зменены вонкавай праграмай. Пераадкрыць яго?"
@ -295,7 +296,7 @@ IDS_MUI_CMDLINEHELP "\
 Notepad3 [/?] [...[Кадоўка]] [...[Канчаткі радкоў]] [/e] [/g] [/m] [/l]\r\n\
 \t[/q] [/s] [/d] [/h] [/x] [/c] [/b] [/n] [/r| [/p] [/t] [/i] [/o]\r\n\
 \t[/f] [/u] [/v] [/vd] [/y] [/z] [[дыск:][шлях]імя[...]]\r\n\r\n\
-файл\tПавінен быць апошнім аргументам, першапачаткова\r\n\tбез прабелаў.\r\n\
+файл\tПавінен быць апошнім аргументам, першапачаткова без прабелаў.\r\n\
 +\tНекалькі аргументаў файлаў (з кадаванымі прабеламі).\r\n\
 -\tАдзін аргумент файла (без кадаваных прабелаў).\r\n\r\n\
 Параметры:\r\n\
@ -304,7 +305,7 @@ Notepad3 [/?] [...[Кадоўка]] [...[Канчаткі радкоў]] [/e] [/
 ...\tФармат канчаткаў радкоў (/crlf, /cr, /lf).\r\n\
 /e\tЗыходная кадоўка файла.\r\n\
 /g\tПерайсці да зазначанага месца (/g -1 канец файла).\r\n\
-/m\tЗнайсці названы тэкст (/m- апошні, /mr regex,\r\n\t/mb адваротная косая рыска).\r\n\
+/m\tЗнайсці названы тэкст (/m- апошні, /mr regex, /mb адваротная \r\n\tкосая рыска).\r\n\
 /l\tАўтаабнаўленне змененых файлаў.\r\n\
 /q\tПрымусіць ствараць новыя файлы без запыту.\r\n\
 /s\tВыбраць схему сінтаксісу.\r\n\
@ -315,8 +316,8 @@ Notepad3 [/?] [...[Кадоўка]] [...[Канчаткі радкоў]] [/e] [/
 /b\tАдкрыць новае акно для збірання змяненняў буфера абмену.\r\n\
 /n\tЗаўсёды адкрываць новае акно (/ns адзін экзэмпляр файла).\r\n\
 /r\tВыкарыстаць былое акно (/rs адзін экзэмпляр файла).\r\n\
-/p\tЗадаць пазіцыю і памер акна (/p0, /ps, /pf,l,t,r,b,m)\r\n\
-\tці /p <left>,<top>,<width>,<height>[,<dpi>,<max>]    [цэлыя лікі].\r\n\
+/p\tЗадаць пазіцыю і памер акна (/p0,/ps,/pd,f,l,t,r,b,m)\r\n\
+\tці /p <left>,<top>,<width>,<height>[,<dpi>,<max>]  [цэлыя лікі].\r\n\
 /t\tЗадаць назву акна.\r\n\
 /i\tЗапусціць значком на паліцы задач.\r\n\
 /o\tЗверху іншых вокнаў.\r\n\
@ -325,7 +326,7 @@ Notepad3 [/?] [...[Кадоўка]] [...[Канчаткі радкоў]] [/e] [/
 /v\tНадрукаваць файл адразу і выйсці.\r\n\
 /vd\tНадрукаваць файл (адкрыць дыялог друку).\r\n\
 /y\tШукаць у пераменнай PATH калі выкарыстаны адносны шлях.\r\n\
-/z\tПрапусціць наступны (прыдатна для пошуку з рэгулярным\r\n\tвыразам).\r\n\r\n\
+/z\tПрапусціць наступны (прыдатна для пошуку з рэгулярным выразам).\r\n\r\n\
 Прыклады:\r\n\
 Notepad3 /utf8sig /crlf d:\\temp\\Test.txt\r\n\
 \t... Новы файл: ""Test.txt"" Кадоўка=UTF-8-BOM, Канчаткі=CRLF.\r\n\
--- a/language/np3_de_de/dialogs_de_de.rc
+++ b/language/np3_de_de/dialogs_de_de.rc
@ -74,13 +74,13 @@ BEGIN
    CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | RICHEDTCTRL_ADDSTYLE,20,90,360,170, ES_EX_ZOOMABLE
 END

-IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 300, 210
+IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 320, 210
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Kommandozeilen Hilfe"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,239,187,55,16
-    EDITTEXT        IDC_CMDLINEHELP,15,7,278,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
+    DEFPUSHBUTTON   "OK",IDOK,259,187,55,16
+    EDITTEXT        IDC_CMDLINEHELP,15,7,298,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
 END

 IDD_MUI_FIND DIALOGEX 0, 0, 273, 142
--- a/language/np3_de_de/strings_de_de.rc
+++ b/language/np3_de_de/strings_de_de.rc
@ -296,7 +296,7 @@ Nutzung:\r\n\
 Notepad3 [/?] [...[Codierung]] [...[Zeilenumbruch Modus]] [/e] [/g] [/m] [/l]\r\n\
 \t[/q] [/s] [/d] [/h] [/x] [/c] [/b] [/n] [/r| [/p] [/t] [/i] [/o]\r\n\
 \t[/f] [/u] [/v] [/vd] [/y] [/z] [[Laufwerk:][Pfad]Datei[...]]\r\n\r\n\
-Datei\tMuss das letzte Argument sein, normalerweise\r\n\tkeine gequoteten Leerstellen.\r\n\
+Datei\tMuss das letzte Argument sein, normalerweise keine gequoteten Leerstellen.\r\n\
 +\tAkzeptiere mehrere Dateien (mit gequoteten Leerstellen).\r\n\
 -\tAkzeptiere ein einzelne Datei (ohne gequotete Leerstellen).\r\n\r\n\
 Optionen:\r\n\
@ -305,19 +305,19 @@ Optionen:\r\n\
 ...\tZeilenumbruch Modus (/crlf, /cr, /lf).\r\n\
 /e\tDatei Quellen Codierung.\r\n\
 /g\tSpringe zur gegebenen Position (/g -1 Ende der Datei).\r\n\
-/m\tFinde gegebenen Suchbegriff (/m- letzter, /mr regex,\r\n\t/mb backslash).\r\n\
+/m\tFinde gegebenen Suchbegriff (/m- letzter, /mr regex, /mb backslash).\r\n\
 /l\tAuto-Neu-Laden einer veränderten Datei.\r\n\
 /q\tErzwinge die Erzeugung einer neuen Datei ohne Nachfrage.\r\n\
 /s\tSetze das gegebene Syntax Schema.\r\n\
 /d\tSetze das Standard-Text Schema.\r\n\
 /h\tSetze das Web Quellcode Schema.\r\n\
 /x\tSetze das XML Dokument Schema.\r\n\
-/c\tÖffne ein neues Fenster und füge den Inhalt\r\n\tder Zwischenablage ein.\r\n\
-/b\tÖffne ein neues 'Paste Board' um die Einträge\r\n\tder Zwischenablage zu sammeln.\r\n\
+/c\tÖffne ein neues Fenster und füge den Inhalt der Zwischenablage ein.\r\n\
+/b\tÖffne ein neues 'Paste Board' um die Einträge der Zwischenablage \r\n\tzu sammeln.\r\n\
 /n\tÖffne immer ein neues Fenster (/ns single file instance).\r\n\
 /r\tBenutze geöffnetes Fenster erneut (/rs single file instance).\r\n\
-/p\tSetze Fenster: Position und Größe (/p0, /ps, /pf,l,t,r,b,m)\r\n\
-\toder /p <links>,<oben>,<breite>,<höhe>[,<dpi>,<max>]    [ganzzahlig].\r\n\
+/p\tSetze Fenster: Position und Größe (/p0,/ps,/pd,f,l,t,r,b,m)\r\n\
+\toder /p <links>,<oben>,<breite>,<höhe>[,<dpi>,<max>]  [ganzzahlig].\r\n\
 /t\tSetze Fenster-Titel.\r\n\
 /i\tStarte als 'Tray-Icon'.\r\n\
 /o\tHalte Fenster immer auf oberster Ebene.\r\n\
@ -326,10 +326,10 @@ Optionen:\r\n\
 /v\tDrucke Datei und beende Programm.\r\n\
 /vd\tDrucke Datei (öffne Drucker-Dialog).\r\n\
 /y\tSuche relative Dateinamen im Umgebungs PATH.\r\n\
-/z\tÜberspringe Nächstes (nützlich für Registy-Basierte\r\n\tNotepad Ersetzung).\r\n\r\n\
+/z\tÜberspringe Nächstes (nützlich für Registy-Basierte Notepad Ersetzung).\r\n\r\n\
 Beispiele:\r\n\
 Notepad3 /utf8sig /crlf d:\\temp\\Test.txt\r\n\
- \t... Eine neue Datei öffnen: ""Test.txt"" Codierung=UTF-8-BOM,\r\n\tEoL=CRLF.\r\n\
+ \t... Eine neue Datei öffnen: ""Test.txt"" Codierung=UTF-8-BOM, EoL=CRLF.\r\n\
 Notepad3 /v d:\\temp\\Test.txt\r\n\
 \t... Drucke Datei: ""Test.txt"" direkt.\
 "
--- a/language/np3_el_gr/dialogs_el_gr.rc
+++ b/language/np3_el_gr/dialogs_el_gr.rc
@ -74,13 +74,13 @@ BEGIN
    CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | RICHEDTCTRL_ADDSTYLE,20,90,360,170, ES_EX_ZOOMABLE
 END

-IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 300, 210
+IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 330, 210
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Βοήθεια γραμμής εντολών"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "&Εντάξει",IDOK,239,187,55,16
-    EDITTEXT        IDC_CMDLINEHELP,15,7,278,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
+    DEFPUSHBUTTON   "&Εντάξει",IDOK,269,187,55,16
+    EDITTEXT        IDC_CMDLINEHELP,15,7,308,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
 END

 IDD_MUI_FIND DIALOGEX 0, 0, 283, 142
--- a/language/np3_el_gr/lexer_el_gr.rc
+++ b/language/np3_el_gr/lexer_el_gr.rc
@ -496,6 +496,7 @@ BEGIN
    IDS_LEX_STR_63387       "Symbol Operator"
    IDS_LEX_STR_63388       "String EOL"
    IDS_LEX_STR_63397       "Backticks"
+    IDS_LEX_STR_63398       "GUID String"
 END

 STRINGTABLE
--- a/language/np3_el_gr/strings_el_gr.rc
+++ b/language/np3_el_gr/strings_el_gr.rc
@ -174,6 +174,7 @@ BEGIN
    IDS_MUI_REPLCOUNT       "Έγινε αντικατάσταση σε %s εμφάνιση(εις) του καθορισμένου μοτίβου αναζήτησης."
    IDS_MUI_ASK_ENCODING    "Η εναλλαγή κωδικοποίησης αρχείου από μία κωδικοποίηση σε άλλη μπορεί να αντικαταστήσει το μη υποστηριζόμενο κείμενο με προεπιλεγμένους χαρακτήρες και το ιστορικό αναίρεσης θα απαλειφθεί. Συνέχεια;"
    IDS_MUI_ASK_ENCODING2   "Πρόκειται να αλλάξετε την κωδικοποίηση ενός κενού αρχείου. Σημειώστε ότι αυτό θα διαγράψει το ιστορικό αναίρεσης, καθώς δεν μπορεί να συγχρονιστεί με τη νέα κωδικοποίηση. Συνέχεια;"
+    IDS_MUI_ASK_CLEAR_UNDO  "This operation will clear the undo history. Continue?"
    IDS_MUI_READONLY_SAVE   "Το ""%s"" είναι μόνο για ανάγνωση. Να αποθηκευτεί σε διαφορετικό αρχείο;"
    IDS_MUI_FILECHANGENOTIFY
                            "Το τρέχον αρχείο έχει τροποποιηθεί από ένα εξωτερικό πρόγραμμα. Να φορτωθεί ξανά;"
@ -292,11 +293,11 @@ STRINGTABLE
 BEGIN
 IDS_MUI_CMDLINEHELP "\
 Χρήση:\r\n\
-Notepad3 [/?] [...[Κωδικοποίηση]] [...[Λειτουργία κατάληξης γραμμής]]\r\n\t[/e] [/g]\r\n\
+Notepad3 [/?] [...[Κωδικοποίηση]] [...[Λειτουργία κατάληξης γραμμής]] [/e] [/g]\r\n\
 \t[/m] [/l] [/q] [/s] [/d] [/h] [/x] [/c] [/b] [/n] [/r| [/p] [/t] [/i] [/o]\r\n\
 \t[/f] [/u] [/v] [/vd] [/y] [/z] [[οδηγός:][διαδρομή]αρχείο[...]]\r\n\r\n\
-αρχείο\tΠρέπει να είναι το τελευταίο όρισμα, από προεπιλογή χωρίς κενά\r\n\tμέσα σε εισαγωγικά.\r\n\
-+\tΑποδοχή πολλαπλών ορισμάτων αρχείων (με κενά εντός\r\n\tεισαγωγικών).\r\n\
+αρχείο\tΠρέπει να είναι το τελευταίο όρισμα, από προεπιλογή χωρίς κενά μέσα \r\n\tσε εισαγωγικά.\r\n\
+\tΑποδοχή πολλαπλών ορισμάτων αρχείων (με κενά εντός εισαγωγικών).\r\n\
 -\tΑποδοχή ορίσματος ενός αρχείου (χωρίς κενά εντός εισαγωγικών).\r\n\r\n\
 Επιλογές:\r\n\
 /?\tΕμφάνιση αυτού του μηνύματος βοήθειας.\r\n\
@ -304,19 +305,19 @@ Notepad3 [/?] [...[Κωδικοποίηση]] [...[Λειτουργία κατά
 ...\tΛειτουργία κατάληξης γραμμής (/crlf, /cr, /lf).\r\n\
 /e\tΚωδικοποίηση του αρχείου προέλευσης.\r\n\
 /g\tΜετάβαση σε καθορισμένη θέση (/g -1 τέλος του αρχείου).\r\n\
-/m\tΣυμφωνία καθορισμένου κειμένου (/m- Τελευταία,\r\n\t/mr Κανονική έκφραση, /mb Ανάστροφη κάθετος).\r\n\
+/m\tΣυμφωνία καθορισμένου κειμένου (/m- Τελευταία, /mr Κανονική έκφραση, \r\n\t/mb Ανάστροφη κάθετος).\r\n\
 /l\tΑυτόματη φόρτωση μεταβληθέντων αρχείων.\r\n\
 /q\tΑναγκαστική δημιουργία νέων αρχείων χωρίς ερώτηση.\r\n\
 /s\tΕπιλογή καθορισμένου συνδυασμού σύνταξης.\r\n\
 /d\tΕπιλογή προεπιλεγμένου συνδυασμού κειμένου.\r\n\
 /h\tΕπιλογή συνδυασμού πηγαίου κώδικα Web.\r\n\
 /x\tΕπιλογή συνδυασμού εγγράφων XML.\r\n\
-/c\tΆνοιγμα νέου παραθύρου και επικόλληση περιεχομένων του\r\n\tπρόχειρου.\r\n\
-/b\tΆνοιγμα νέου πίνακα επικόλλησης για τη συλλογή καταχωρήσεων\r\n\tτου πρόχειρου.\r\n\
+/c\tΆνοιγμα νέου παραθύρου και επικόλληση περιεχομένων του πρόχειρου.\r\n\
+/b\tΆνοιγμα νέου πίνακα επικόλλησης για τη συλλογή καταχωρήσεων \r\n\tτου πρόχειρου.\r\n\
 /n\tΆνοιγμα πάντα νέου παραθύρου (/ns παρουσία ενός μόνο αρχείου).\r\n\
-/r\tΕπαναχρησιμοποίηση παραθύρου (/rs παρουσία ενός μόνο\r\n\tαρχείου).\r\n\
-/p\tΟρισμός θέσης και μεγέθους παραθύρου (/p0, /ps, /pf,l,t,r,b,m)\r\n\
-\tή /p <αριστερά>,<πάνω>,<πλάτος>,<ύψος>[,<dpi>,<μέγ.>]    [όλοι\r\n\tακέραιοι].\r\n\
+/r\tΕπαναχρησιμοποίηση παραθύρου (/rs παρουσία ενός μόνο αρχείου).\r\n\
+/p\tΟρισμός θέσης και μεγέθους παραθύρου (/p0,/ps,/pd,f,l,t,r,b,m)\r\n\
+\tή /p <αριστερά>,<πάνω>,<πλάτος>,<ύψος>[,<dpi>,<μέγ.>]  [όλοι ακέραιοι].\r\n\
 /t\tΟρισμός τίτλου παραθύρου.\r\n\
 /i\tΈναρξη ως ελαχιστοποιημένο στην περιοχή ειδοποιήσεων.\r\n\
 /o\tΠάντα στην κορυφή το παράθυρο.\r\n\
@ -324,11 +325,11 @@ Notepad3 [/?] [...[Κωδικοποίηση]] [...[Λειτουργία κατά
 /u\tΕκκίνηση με αυξημένα δικαιώματα.\r\n\
 /v\tΕκτύπωση αρχείου άμεσα και έξοδος.\r\n\
 /vd\tΕκτύπωση αρχείου (άνοιγμα διαλόγου εκτυπωτή).\r\n\
-/y\tΑναζήτηση στο περιβάλλον PATH σε περίπτωση σχετικού ονόματος\r\n\tαρχείου.\r\n\
-/z\tΜετάβαση στο επόμενο (χρησιμοποιείται για αντικατάσταση\r\n\tτου Notepad μέσω του μητρώου).\r\n\r\n\
+/y\tΑναζήτηση στο περιβάλλον PATH σε περίπτωση σχετικού ονόματος αρχείου.\r\n\
+/z\tΜετάβαση στο επόμενο (χρησιμοποιείται για αντικατάσταση του Notepad \r\n\tμέσω του μητρώου).\r\n\r\n\
 Παραδείγματα:\r\n\
 Notepad3 /utf8sig /crlf d:\\temp\\Test.txt\r\n\
- \t... Άνοιγμα νέου αρχείου: ""Test.txt"" Κωδικοποίηση=UTF-8-BOM,\r\n\tEoL=CRLF.\r\n\
+ \t... Άνοιγμα νέου αρχείου: ""Test.txt"" Κωδικοποίηση=UTF-8-BOM, EoL=CRLF.\r\n\
 Notepad3 /v d:\\temp\\Test.txt\r\n\
 \t... Εκτύπωση του αρχείου: ""Test.txt"" άμεσα.\
 "
--- a/language/np3_en_gb/lexer_en_gb.rc
+++ b/language/np3_en_gb/lexer_en_gb.rc
@ -496,6 +496,7 @@ BEGIN
    IDS_LEX_STR_63387       "Symbol Operator"
    IDS_LEX_STR_63388       "String EOL"
    IDS_LEX_STR_63397       "Backticks"
+    IDS_LEX_STR_63398       "GUID String"
 END

 STRINGTABLE
--- a/language/np3_en_gb/strings_en_gb.rc
+++ b/language/np3_en_gb/strings_en_gb.rc
@ -174,6 +174,7 @@ BEGIN
    IDS_MUI_REPLCOUNT       "%s occurrence(s) of specified search pattern replaced."
    IDS_MUI_ASK_ENCODING    "Switching the file encoding from one encoding to another may replace unsupported text with default characters, and the undo history will be cleared. Continue?"
    IDS_MUI_ASK_ENCODING2   "You are about to change the encoding of an empty file. Note that this will clear the undo history, as it can't be synchronised with the new encoding. Continue?"
+    IDS_MUI_ASK_CLEAR_UNDO  "This operation will clear the undo history. Continue?"
    IDS_MUI_READONLY_SAVE   """%s"" is read only. Save to a different file?"
    IDS_MUI_FILECHANGENOTIFY
                            "The current file has been modified by an external program. Reload?"
@ -315,8 +316,8 @@ Options:\r\n\
 /b\tOpen new paste board to collect clipboard entries.\r\n\
 /n\tAlways open a new window (/ns single file instance).\r\n\
 /r\tReuse window (/rs single file instance).\r\n\
-/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m)\r\n\
-\tor /p <left>,<top>,<width>,<height>[,<dpi>,<max>]    [all integers].\r\n\
+/p\tSet window position and size (/p0,/ps,/pd,f,l,t,r,b,m)\r\n\
+\tor /p <left>,<top>,<width>,<height>[,<dpi>,<max>]  [all integers].\r\n\
 /t\tSet window title.\r\n\
 /i\tStart as tray icon.\r\n\
 /o\tKeep window on top.\r\n\
--- a/language/np3_en_us/strings_en_us.rc
+++ b/language/np3_en_us/strings_en_us.rc
@ -316,8 +316,8 @@ Options:\r\n\
 /b\tOpen new paste board to collect clipboard entries.\r\n\
 /n\tAlways open a new window (/ns single file instance).\r\n\
 /r\tReuse window (/rs single file instance).\r\n\
-/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m)\r\n\
-\tor /p <left>,<top>,<width>,<height>[,<dpi>,<max>]    [all integers].\r\n\
+/p\tSet window position and size (/p0,/ps,/pd,f,l,t,r,b,m)\r\n\
+\tor /p <left>,<top>,<width>,<height>[,<dpi>,<max>]  [all integers].\r\n\
 /t\tSet window title.\r\n\
 /i\tStart as tray icon.\r\n\
 /o\tKeep window on top.\r\n\
--- a/language/np3_es_es/dialogs_es_es.rc
+++ b/language/np3_es_es/dialogs_es_es.rc
@ -74,13 +74,13 @@ BEGIN
    CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | RICHEDTCTRL_ADDSTYLE,20,90,360,170, ES_EX_ZOOMABLE
 END

-IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 300, 210
+IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 330, 210
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Ayuda de la línea de comando"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "Aceptar",IDOK,239,187,55,16
-    EDITTEXT        IDC_CMDLINEHELP,15,7,278,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
+    DEFPUSHBUTTON   "Aceptar",IDOK,269,187,55,16
+    EDITTEXT        IDC_CMDLINEHELP,15,7,308,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
 END

 IDD_MUI_FIND DIALOGEX 0, 0, 273, 142
--- a/language/np3_es_es/lexer_es_es.rc
+++ b/language/np3_es_es/lexer_es_es.rc
@ -496,6 +496,7 @@ BEGIN
    IDS_LEX_STR_63387       "Symbol Operator"
    IDS_LEX_STR_63388       "String EOL"
    IDS_LEX_STR_63397       "Backticks"
+    IDS_LEX_STR_63398       "GUID String"
 END

 STRINGTABLE
--- a/language/np3_es_es/strings_es_es.rc
+++ b/language/np3_es_es/strings_es_es.rc
@ -174,6 +174,7 @@ BEGIN
    IDS_MUI_REPLCOUNT       "Se han reemplazado %s ocurrencia(s) del patrón de búsqueda especificado."
    IDS_MUI_ASK_ENCODING    "Cambiar la codificación del archivo de una codificación a otra puede reemplazar el texto no compatible con caracteres predeterminados, y el historial de deshacer se borrará. ¿Continuar?"
    IDS_MUI_ASK_ENCODING2   "Está a punto de cambiar la codificación de un archivo vacío. Tenga en cuenta que esto borrará el historial de deshacer, ya que no se puede sincronizar con la nueva codificación. ¿Continuar?"
+    IDS_MUI_ASK_CLEAR_UNDO  "This operation will clear the undo history. Continue?"
    IDS_MUI_READONLY_SAVE   """%s"" es de sólo lectura. ¿Guardar en un archivo diferente?"
    IDS_MUI_FILECHANGENOTIFY
                            "El archivo actual ha sido modificado por un programa externo. ¿Recargar?"
@ -295,8 +296,8 @@ Uso:\r\n\
 Notepad3 [/?] [...[Codificación]] [...[Modo de final de línea]] [/e] [/g] [/m] [/l]\r\n\
 \t[/q] [/s] [/d] [/h] [/x] [/c] [/b] [/n] [/r| [/p] [/t] [/i] [/o]\r\n\
 \t[/f] [/u] [/v] [/vd] [/y] [/z] [[unidad:][ruta]archivo[...]]\r\n\r\n\
-archivo\tDebe ser el último argumento, sin espacios entre\r\n\tcomillas por defecto.\r\n\
-+\tAceptar múltiples argumentos de archivo (con espacios\r\n\tentre comillas).\r\n\
+archivo\tDebe ser el último argumento, sin espacios entre comillas por defecto.\r\n\
+\tAceptar múltiples argumentos de archivo (con espacios entre comillas).\r\n\
 -\tAceptar argumento de archivo único (sin espacios entre comillas).\r\n\r\n\
 Opciones:\r\n\
 /?\tMostrar este mensaje de ayuda.\r\n\
@ -304,7 +305,7 @@ Opciones:\r\n\
 ...\tModo de final de línea (/crlf, /cr, /lf).\r\n\
 /e\tCodificación de la fuente del archivo.\r\n\
 /g\tSaltar a la posición especificada (/g -1 fin de archivo).\r\n\
-/m\tCoincidencia de texto especificado (/m- último, /mr regex,\r\n\t/mb backslash).\r\n\
+/m\tCoincidencia de texto especificado (/m- último, /mr regex, /mb backslash).\r\n\
 /l\tAuto recargar archivos modificados.\r\n\
 /q\tForzar la creación de nuevos archivos sin aviso.\r\n\
 /s\tSeleccione el esquema de sintaxis especificado.\r\n\
@ -312,11 +313,11 @@ Opciones:\r\n\
 /h\tSeleccione un esquema de código fuente Web.\r\n\
 /x\tSeleccione el esquema de documento XML.\r\n\
 /c\tAbrir nueva ventana y pegar contenido del portapapeles.\r\n\
-/b\tAbre una nueva tabla de pegar para recoger las entradas\r\n\tdel portapapeles.\r\n\
+/b\tAbre una nueva tabla de pegar para recoger las entradas del portapapeles.\r\n\
 /n\tSiempre abre una nueva ventana (/ns instancia de archivo único).\r\n\
 /r\tReutilizar la ventana (/rs instancia de archivo único).\r\n\
-/p\tEstablecer el tamaño y la posición de la ventana (/p0, /ps, /pf,l,t,r,b,m)\r\n\
-\to /p <izquierda>,<arriba>,<ancho>,<altura>[,<dpi>,<max>]    [todos\r\n\tenteros].\r\n\
+/p\tEstablecer el tamaño y la posición de la ventana  (/p0,/ps,/pd,f,l,t,r,b,m)\r\n\
+\to /p <izquierda>,<arriba>,<ancho>,<altura>[,<dpi>,<max>]  [todos enteros].\r\n\
 /t\tEstablecer el título de la ventana.\r\n\
 /i\tComenzar como un icono de la barra de tareas.\r\n\
 /o\tVentana siempre visible.\r\n\
@ -325,10 +326,10 @@ Opciones:\r\n\
 /v\tImprimir el archivo inmediatamente y salir.\r\n\
 /vd\tImprimir archivo (abrir el cuadro de diálogo de la impresora).\r\n\
 /y\tEntorno de búsqueda PATH en caso de nombre de archivo relativo..\r\n\
-/z\tIr a la siguiente (usar para reemplazar el Notepad basado\r\n\ten el registro).\r\n\r\n\
+/z\tIr a la siguiente (usar para reemplazar el Notepad basado en el registro).\r\n\r\n\
 Ejemplos:\r\n\
 Notepad3 /utf8sig /crlf d:\\temp\\Test.txt\r\n\
- \t... Abrir un nuevo archivo: ""Test.txt"" Codificación=UTF-8-BOM,\r\n\tEoL=CRLF.\r\n\
+ \t... Abrir un nuevo archivo: ""Test.txt"" Codificación=UTF-8-BOM, EoL=CRLF.\r\n\
 Notepad3 /v d:\\temp\\Test.txt\r\n\
 \t... Imprimir el archivo: ""Test.txt"" inmediatamente.\
 "
--- a/language/np3_es_mx/dialogs_es_mx.rc
+++ b/language/np3_es_mx/dialogs_es_mx.rc
@ -74,13 +74,13 @@ BEGIN
    CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | RICHEDTCTRL_ADDSTYLE,20,90,360,170, ES_EX_ZOOMABLE
 END

-IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 300, 210
+IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 330, 210
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Ayuda de la línea de comando"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "Aceptar",IDOK,239,187,55,16
-    EDITTEXT        IDC_CMDLINEHELP,15,7,278,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
+    DEFPUSHBUTTON   "Aceptar",IDOK,269,187,55,16
+    EDITTEXT        IDC_CMDLINEHELP,15,7,308,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
 END

 IDD_MUI_FIND DIALOGEX 0, 0, 273, 142
--- a/language/np3_es_mx/lexer_es_mx.rc
+++ b/language/np3_es_mx/lexer_es_mx.rc
@ -496,6 +496,7 @@ BEGIN
    IDS_LEX_STR_63387       "Symbol Operator"
    IDS_LEX_STR_63388       "String EOL"
    IDS_LEX_STR_63397       "Backticks"
+    IDS_LEX_STR_63398       "GUID String"
 END

 STRINGTABLE
--- a/language/np3_es_mx/strings_es_mx.rc
+++ b/language/np3_es_mx/strings_es_mx.rc
@ -174,6 +174,7 @@ BEGIN
    IDS_MUI_REPLCOUNT       "Se han reemplazado %s ocurrencia(s) del patrón de búsqueda especificado."
    IDS_MUI_ASK_ENCODING    "Cambiar la codificación del archivo de una codificación a otra puede reemplazar el texto no compatible con caracteres predeterminados, y el historial de deshacer se borrará. ¿Continuar?"
    IDS_MUI_ASK_ENCODING2   "Está a punto de cambiar la codificación de un archivo vacío. Tenga en cuenta que esto borrará el historial de deshacer, ya que no se puede sincronizar con la nueva codificación. ¿Continuar?"
+    IDS_MUI_ASK_CLEAR_UNDO  "This operation will clear the undo history. Continue?"
    IDS_MUI_READONLY_SAVE   """%s"" es de sólo lectura. ¿Guardar en un archivo diferente?"
    IDS_MUI_FILECHANGENOTIFY
                            "El archivo actual ha sido modificado por un programa externo. ¿Recargar?"
@ -295,8 +296,8 @@ Uso:\r\n\
 Notepad3 [/?] [...[Codificación]] [...[Modo de final de línea]] [/e] [/g] [/m] [/l]\r\n\
 \t[/q] [/s] [/d] [/h] [/x] [/c] [/b] [/n] [/r| [/p] [/t] [/i] [/o]\r\n\
 \t[/f] [/u] [/v] [/vd] [/y] [/z] [[unidad:][ruta]archivo[...]]\r\n\r\n\
-archivo\tDebe ser el último argumento, sin espacios entre\r\n\tcomillas por defecto.\r\n\
-+\tAceptar múltiples argumentos de archivo (con espacios\r\n\tentre comillas).\r\n\
+archivo\tDebe ser el último argumento, sin espacios entre comillas por defecto.\r\n\
+\tAceptar múltiples argumentos de archivo (con espacios entre comillas).\r\n\
 -\tAceptar argumento de archivo único (sin espacios entre comillas).\r\n\r\n\
 Opciones:\r\n\
 /?\tMostrar este mensaje de ayuda.\r\n\
@ -304,7 +305,7 @@ Opciones:\r\n\
 ...\tModo de final de línea (/crlf, /cr, /lf).\r\n\
 /e\tCodificación de la fuente del archivo.\r\n\
 /g\tSaltar a la posición especificada (/g -1 fin de archivo).\r\n\
-/m\tCoincidencia de texto especificado (/m- último, /mr regex,\r\n\t/mb backslash).\r\n\
+/m\tCoincidencia de texto especificado (/m- último, /mr regex, /mb backslash).\r\n\
 /l\tAuto recargar archivos modificados.\r\n\
 /q\tForzar la creación de nuevos archivos sin aviso.\r\n\
 /s\tSeleccione el esquema de sintaxis especificado.\r\n\
@ -312,11 +313,11 @@ Opciones:\r\n\
 /h\tSeleccione un esquema de código fuente Web.\r\n\
 /x\tSeleccione el esquema de documento XML.\r\n\
 /c\tAbrir nueva ventana y pegar contenido del portapapeles.\r\n\
-/b\tAbre una nueva tabla de pegar para recoger las entradas\r\n\tdel portapapeles.\r\n\
+/b\tAbre una nueva tabla de pegar para recoger las entradas del portapapeles.\r\n\
 /n\tSiempre abre una nueva ventana (/ns instancia de archivo único).\r\n\
 /r\tReutilizar la ventana (/rs instancia de archivo único).\r\n\
-/p\tEstablecer el tamaño y la posición de la ventana (/p0, /ps, /pf,l,t,r,b,m)\r\n\
-\to /p <izquierda>,<arriba>,<ancho>,<altura>[,<dpi>,<max>]    [todos\r\n\tenteros].\r\n\
+/p\tEstablecer el tamaño y la posición de la ventana  (/p0,/ps,/pd,f,l,t,r,b,m)\r\n\
+\to /p <izquierda>,<arriba>,<ancho>,<altura>[,<dpi>,<max>]  [todos enteros].\r\n\
 /t\tEstablecer el título de la ventana.\r\n\
 /i\tComenzar como un icono de la barra de tareas.\r\n\
 /o\tVentana siempre visible.\r\n\
@ -325,10 +326,10 @@ Opciones:\r\n\
 /v\tImprimir el archivo inmediatamente y salir.\r\n\
 /vd\tImprimir archivo (abrir el cuadro de diálogo de la impresora).\r\n\
 /y\tEntorno de búsqueda PATH en caso de nombre de archivo relativo..\r\n\
-/z\tIr a la siguiente (usar para reemplazar el Notepad basado\r\n\ten el registro).\r\n\r\n\
+/z\tIr a la siguiente (usar para reemplazar el Notepad basado en el registro).\r\n\r\n\
 Ejemplos:\r\n\
 Notepad3 /utf8sig /crlf d:\\temp\\Test.txt\r\n\
- \t... Abrir un nuevo archivo: ""Test.txt"" Codificación=UTF-8-BOM,\r\n\tEoL=CRLF.\r\n\
+ \t... Abrir un nuevo archivo: ""Test.txt"" Codificación=UTF-8-BOM, EoL=CRLF.\r\n\
 Notepad3 /v d:\\temp\\Test.txt\r\n\
 \t... Imprimir el archivo: ""Test.txt"" inmediatamente.\
 "
--- a/language/np3_fr_fr/dialogs_fr_fr.rc
+++ b/language/np3_fr_fr/dialogs_fr_fr.rc
@ -74,13 +74,13 @@ BEGIN
    CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | RICHEDTCTRL_ADDSTYLE,20,90,360,170, ES_EX_ZOOMABLE
 END

-IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 300, 210
+IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 330, 210
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Aide de la ligne de commande"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,239,187,55,16
-    EDITTEXT        IDC_CMDLINEHELP,15,7,278,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
+    DEFPUSHBUTTON   "OK",IDOK,269,187,55,16
+    EDITTEXT        IDC_CMDLINEHELP,15,7,308,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
 END

 IDD_MUI_FIND DIALOGEX 0, 0, 278, 142
--- a/language/np3_fr_fr/lexer_fr_fr.rc
+++ b/language/np3_fr_fr/lexer_fr_fr.rc
@ -496,6 +496,7 @@ BEGIN
    IDS_LEX_STR_63387       "Opérateur de symbole"
    IDS_LEX_STR_63388       "Chaîne EOL"
    IDS_LEX_STR_63397       "Accents graves"
+    IDS_LEX_STR_63398       "GUID String"
 END

 STRINGTABLE
--- a/language/np3_fr_fr/strings_fr_fr.rc
+++ b/language/np3_fr_fr/strings_fr_fr.rc
@ -174,6 +174,7 @@ BEGIN
    IDS_MUI_REPLCOUNT       "%s occurrence(s) du modèle de recherche spécifié remplacée(s)."
    IDS_MUI_ASK_ENCODING    "Changer l'encodage du fichier d'un encodage à un autre peut remplacer le texte non pris en charge par des caractères par défaut et l'historique de ""Défaire"" sera effacé. Continuer ?"
    IDS_MUI_ASK_ENCODING2   "Vous êtes sur le point de changer l'encodage d'un fichier vide. Notez que cela effacera l'historique de ""Défaire"", car il ne peut pas être synchronisé avec le nouvel encodage. Continuer ?"
+    IDS_MUI_ASK_CLEAR_UNDO  "This operation will clear the undo history. Continue?"
    IDS_MUI_READONLY_SAVE   """%s"" est en lecture seule. Sauvegarder dans un fichier différent ?"
    IDS_MUI_FILECHANGENOTIFY
                            "Le fichier actuel a été modifié par un programme externe. Recharger ?"
@ -295,8 +296,8 @@ Utilisation :\r\n\
 Notepad3 [/?] [...[Encodage]] [...[Mode de fin de ligne]] [/e] [/g] [/m]\r\n\
 \t[/l] [/q] [/s] [/d] [/h] [/x] [/c] [/b] [/n] [/r| [/p] [/t] [/i] [/o]\r\n\
 \t[/f] [/u] [/v] [/vd] [/y] [/z] [[lecteur:][chemin]fichier[...]]\r\n\r\n\
-fichier\tDoit être le dernier argument, aucun espace entre guillemets\r\n\tpar défaut.\r\n\
-+\tAccepte plusieurs arguments de fichier (avec des espaces entre\r\n\tguillemets).\r\n\
+fichier\tDoit être le dernier argument, aucun espace entre guillemets par défaut.\r\n\
+\tAccepte plusieurs arguments de fichier (avec des espaces entre guillemets).\r\n\
 -\tAccepte un seul argument de fichier (sans espaces entre guillemets).\r\n\r\n\
 Options :\r\n\
 /?\tAffiche ce message d'aide.\r\n\
@ -304,7 +305,7 @@ Options :\r\n\
 ...\tMode de fin de ligne (/crlf, /cr, /lf).\r\n\
 /e\tEncodage du fichier source.\r\n\
 /g\tVa à la position spécifiée (/g -1 fin de fichier).\r\n\
-/m\tTrouve le texte spécifié (/m- dernier, /mr regex,\r\n\t/mb oblique inverse).\r\n\
+/m\tTrouve le texte spécifié (/m- dernier, /mr regex, /mb oblique inverse).\r\n\
 /l\tRecharge automatiquement les fichiers modifiés.\r\n\
 /q\tForce la création de nouveaux fichiers sans confirmation.\r\n\
 /s\tSélectionne le modèle de syntaxe spécifié.\r\n\
@ -312,11 +313,11 @@ Options :\r\n\
 /h\tSélectionne un modèle de Code Source Web.\r\n\
 /x\tSélectionne un modèle de Document XML.\r\n\
 /c\tOuvre une nouvelle fenêtre et colle le contenu du presse-papiers.\r\n\
-/b\tOuvre un nouveau tableau de collage pour collecter les entrées du\r\n\tpresse-papiers.\r\n\
-/n\tOuvre toujours une nouvelle fenêtre (/ns instance\r\n\tde fichier unique).\r\n\
+/b\tOuvre un nouveau tableau de collage pour collecter les entrées du \r\n\tpresse-papiers.\r\n\
+/n\tOuvre toujours une nouvelle fenêtre (/ns instance de fichier unique).\r\n\
 /r\tRéutilise la fenêtre (/rs instance de fichier unique).\r\n\
-/p\tDéfinit la position et la taille de la fenêtre (/p0, /ps, /pf,l,t,r,b,m)\r\n\
-\tou /p <gauche>,<haut>,<largeur>,<hauteur>[,<dpi>,<max>]    [tous entiers].\r\n\
+/p\tDéfinit la position et la taille de la fenêtre (/p0,/ps,/pd,f,l,t,r,b,m)\r\n\
+\tou /p <gauche>,<haut>,<largeur>,<hauteur>[,<dpi>,<max>]  [tous  entiers].\r\n\
 /t\tDéfinit un titre de fenêtre.\r\n\
 /i\tDémarre en icône dans la zone de notifications.\r\n\
 /o\tGarde la fenêtre toujours visible.\r\n\
@ -324,11 +325,11 @@ Options :\r\n\
 /u\tDémarre avec des privilèges élevés.\r\n\
 /v\tImprime le fichier immédiatement et quitte.\r\n\
 /vd\tImprime le fichier (ouvre le dialogue de l'imprimante).\r\n\
-/y\tCherche dans le PATH (environnement) en cas de nom de fichier\r\n\trelatif.\r\n\
-/z\tPasse au suivant (utilisable avec le remplacement de Notepad via\r\n\tle registre).\r\n\r\n\
+/y\tCherche dans le PATH (environnement) en cas de nom de fichier relatif.\r\n\
+/z\tPasse au suivant (utilisable avec le remplacement de Notepad via le registre).\r\n\r\n\
 Exemples :\r\n\
 Notepad3 /utf8sig /crlf d:\\temp\\Test.txt\r\n\
- \t... Ouvre un nouveau fichier : ""Test.txt"" Encodage=UTF-8-BOM,\r\n\tEoL=CRLF.\r\n\
+ \t... Ouvre un nouveau fichier : ""Test.txt"" Encodage=UTF-8-BOM, EoL=CRLF.\r\n\
 Notepad3 /v d:\\temp\\Test.txt\r\n\
  \t... Imprime le fichier : ""Test.txt"" immédiatement.\
 "
--- a/language/np3_hi_in/dialogs_hi_in.rc
+++ b/language/np3_hi_in/dialogs_hi_in.rc
@ -74,13 +74,13 @@ BEGIN
    CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | RICHEDTCTRL_ADDSTYLE,20,90,360,170, ES_EX_ZOOMABLE
 END

-IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 300, 210
+IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 310, 210
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "कमांड लाइन मदद"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "सही है",IDOK,239,187,55,16
-    EDITTEXT        IDC_CMDLINEHELP,15,7,278,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
+    DEFPUSHBUTTON   "सही है",IDOK,249,187,55,16
+    EDITTEXT        IDC_CMDLINEHELP,15,7,288,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
 END

 IDD_MUI_FIND DIALOGEX 0, 0, 273, 142
--- a/language/np3_hi_in/lexer_hi_in.rc
+++ b/language/np3_hi_in/lexer_hi_in.rc
@ -496,6 +496,7 @@ BEGIN
    IDS_LEX_STR_63387       "Symbol Operator"
    IDS_LEX_STR_63388       "String EOL"
    IDS_LEX_STR_63397       "Backticks"
+    IDS_LEX_STR_63398       "GUID String"
 END

 STRINGTABLE
--- a/language/np3_hi_in/strings_hi_in.rc
+++ b/language/np3_hi_in/strings_hi_in.rc
@ -174,6 +174,7 @@ BEGIN
    IDS_MUI_REPLCOUNT       "निर्देशित खोज पैटर्न के अनुसार %s उपस्थितियाँ बदल दी गई हैं "
    IDS_MUI_ASK_ENCODING    "फ़ाईल एन्कोडिंग बदलने के स्वरूप निराधार टेक्स्ट डिफ़ॉल्ट वर्णों से बदल सकते हैं, और पूर्ववत करने का इतिहास भी साफ़ हो जाएगा। शुरू करें?"
    IDS_MUI_ASK_ENCODING2   "आप एक खाली फ़ाईल की एन्कोडिंग बदलने जा रहे हैं। ध्यान दें कि यह कार्य पूर्ववत करने का इतिहास भी साफ़ कर देगा, क्यूंकि यह नई एन्कोडिंग के साथ sync नहीं हो सकता. शुरू करें?"
+    IDS_MUI_ASK_CLEAR_UNDO  "This operation will clear the undo history. Continue?"
    IDS_MUI_READONLY_SAVE   """%s"" सिर्फ़ पढ़ने-लायक है। अन्य फ़ाईल के रूप में सहेजें?"
    IDS_MUI_FILECHANGENOTIFY
                            "चालू फ़ाईल एक बाहरी प्रोग्राम द्वारा परिवर्तित हो चुकी है। पुनः लोड करें?"
@ -315,8 +316,8 @@ Notepad3 [/?] [...[एन्कोडिंग]] [...[रेखा समाप
 /b\tक्लिपबोर्ड प्रविष्टियाँ जमा करने हेतु नए पेस्ट बोर्ड को खोलें.\r\n\
 /n\tसदैव एक नई विंडो खोलें (/ns एकल फ़ाइल अवस्था).\r\n\
 /r\tविंडो पुनः इस्तमएआल करें (/rs एकल फ़ाइल अवस्था).\r\n\
-/p\tविंडो स्तिथि और आकार तय करें (/p0, /ps, /pf,l,t,r,b,m)\r\n\
-\tया /p <बाएं>,<शीर्ष>,<चोड़ाई>,<ऊंचाई>[,<dpi>,<अत्यधिक>]    [समस्त पूर्णांक].\r\n\
+/p\tविंडो स्तिथि और आकार तय करें (/p0,/ps,/pd,f,l,t,r,b,m)\r\n\
+\tया /p <बाएं>,<शीर्ष>,<चोड़ाई>,<ऊंचाई>[,<dpi>,<अत्यधिक>]  [समस्त पूर्णांक].\r\n\
 /t\tविंडो शीर्षक तय करें.\r\n\
 /i\tट्रे आइकान के रूप में शुरू करें.\r\n\
 /o\tविंडो ऊपर रखें.\r\n\
--- a/language/np3_hu_hu/dialogs_hu_hu.rc
+++ b/language/np3_hu_hu/dialogs_hu_hu.rc
@ -74,13 +74,13 @@ BEGIN
    CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | RICHEDTCTRL_ADDSTYLE,20,90,360,170, ES_EX_ZOOMABLE
 END

-IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 300, 210
+IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 320, 210
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Parancssori súgó"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,239,187,55,16
-    EDITTEXT        IDC_CMDLINEHELP,15,7,278,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
+    DEFPUSHBUTTON   "OK",IDOK,259,187,55,16
+    EDITTEXT        IDC_CMDLINEHELP,15,7,298,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
 END

 IDD_MUI_FIND DIALOGEX 0, 0, 273, 142
--- a/language/np3_hu_hu/lexer_hu_hu.rc
+++ b/language/np3_hu_hu/lexer_hu_hu.rc
@ -496,6 +496,7 @@ BEGIN
    IDS_LEX_STR_63387       "Symbol Operator"
    IDS_LEX_STR_63388       "String EOL"
    IDS_LEX_STR_63397       "Backticks"
+    IDS_LEX_STR_63398       "GUID String"
 END

 STRINGTABLE
--- a/language/np3_hu_hu/strings_hu_hu.rc
+++ b/language/np3_hu_hu/strings_hu_hu.rc
@ -174,6 +174,7 @@ BEGIN
    IDS_MUI_REPLCOUNT       "A keresési minta %s db. találata cserélve lett."
    IDS_MUI_ASK_ENCODING    "A fájl kódolásának megváltoztatása lecserélhet nem támogatott karaktereket alapértelmezettek karakterekkel, valamint a visszavonási történet törölve lesz. Folytatja?"
    IDS_MUI_ASK_ENCODING2   "Egy üres fájl kódolását változtatja meg. Ne feledje, hogy ez a visszavonási történetet törli, mert azt nem lehet szinkronizálni az új kódolással. Folytatja?"
+    IDS_MUI_ASK_CLEAR_UNDO  "This operation will clear the undo history. Continue?"
    IDS_MUI_READONLY_SAVE   """%s"" csak olvastható. Legyen mentés egy másik fájlba?"
    IDS_MUI_FILECHANGENOTIFY
                            "Az aktuális fájl egy külső progarm által módosítva lett. Újratöltsük?"
@ -295,7 +296,7 @@ Használat:\r\n\
 Notepad3 [/?] [...[kódolás]] [...[sorvég mód]] [/e] [/g] [/m] [/l]\r\n\
 \t[/q] [/s] [/d] [/h] [/x] [/c] [/b] [/n] [/r| [/p] [/t] [/i] [/o]\r\n\
 \t[/f] [/u] [/v] [/vd] [/y] [/z] [[meghajtó:][útvonal]fájlnév[...]]\r\n\r\n\
-fájl\tAz utolsó paraméter kell legyen, alapból nincsenek idézőjelezett\r\n\tszóközök.\r\n\
+fájl\tAz utolsó paraméter kell legyen, alapból nincsenek idézőjelezett szóközök.\r\n\
 +\tTöbb fájlt is elfogad (idézőjelezett szóközökkel).\r\n\
 -\tEgy fájlt fogad el paraméterként (idézőjelezett szóközök nélkül).\r\n\r\n\
 Opciók:\r\n\
@ -315,8 +316,8 @@ Opciók:\r\n\
 /b\tÚj dokumentum megnyitása, ahova a vágólap tartalma gyűlik.\r\n\
 /n\tMindig nyisson új ablakot (/ns egyetlen fájl példány).\r\n\
 /r\tAblak újrahasznosítása (/rs egyetlen fájl példány).\r\n\
-/p\tAblak pozíció és méret beállítása (/p0, /ps, /pf,l,t,r,b,m)\r\n\
-\tor /p <bal>,<teteje>,<szélesség>,<magasság>[,<dpi>,<max>]    [mindegyik\r\n\tegész szám].\r\n\
+/p\tAblak pozíció és méret beállítása (/p0,/ps,/pd,f,l,t,r,b,m)\r\n\
+\tor /p <bal>,<teteje>,<szélesség>,<magasság>[,<dpi>,<max>]  [mindegyik \r\n\tegész szám].\r\n\
 /t\tCímsor szövegének beállítása.\r\n\
 /i\tIndítás óra melé kicsinyítve.\r\n\
 /o\tAblak mindig felül.\r\n\
@ -325,7 +326,7 @@ Opciók:\r\n\
 /v\tFájl nyomtatása rögtön és kilépés.\r\n\
 /vd\tFájl nyomtatása (Nyomtatási ablak megnyitása).\r\n\
 /y\tRelatív fájlnév esetén keressen az útvonalon (PATH) belül.\r\n\
-/z\tKövetkező kihagyása (registry alapú Notepad lecserélésnél lehet\r\n\thasznos).\r\n\r\n\
+/z\tKövetkező kihagyása (registry alapú Notepad lecserélésnél lehet hasznos).\r\n\r\n\
 Példák:\r\n\
 Notepad3 /utf8sig /crlf d:\\temp\\Test.txt\r\n\
 \t... Egy új fájlt nyit meg: ""Test.txt"" Encoding=UTF-8-BOM, EoL=CRLF.\r\n\
--- a/language/np3_id_id/lexer_id_id.rc
+++ b/language/np3_id_id/lexer_id_id.rc
@ -496,6 +496,7 @@ BEGIN
    IDS_LEX_STR_63387       "Symbol Operator"
    IDS_LEX_STR_63388       "String EOL"
    IDS_LEX_STR_63397       "Backticks"
+    IDS_LEX_STR_63398       "GUID String"
 END

 STRINGTABLE
--- a/language/np3_id_id/strings_id_id.rc
+++ b/language/np3_id_id/strings_id_id.rc
@ -174,6 +174,7 @@ BEGIN
    IDS_MUI_REPLCOUNT       "%s occurrence(s) of specified search pattern replaced."
    IDS_MUI_ASK_ENCODING    "Switching the file encoding from one encoding to another may replace unsupported text with default characters, and the undo history will be cleared. Continue?"
    IDS_MUI_ASK_ENCODING2   "You are about to change the encoding of an empty file. Note that this will clear the undo history, as it can't be synchronised with the new encoding. Continue?"
+    IDS_MUI_ASK_CLEAR_UNDO  "This operation will clear the undo history. Continue?"
    IDS_MUI_READONLY_SAVE   """%s"" is read only. Save to a different file?"
    IDS_MUI_FILECHANGENOTIFY
                            "The current file has been modified by an external program. Reload?"
@ -315,8 +316,8 @@ Options:\r\n\
 /b\tOpen new paste board to collect clipboard entries.\r\n\
 /n\tAlways open a new window (/ns single file instance).\r\n\
 /r\tReuse window (/rs single file instance).\r\n\
-/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m)\r\n\
-\tor /p <left>,<top>,<width>,<height>[,<dpi>,<max>]    [all integers].\r\n\
+/p\tSet window position and size (/p0,/ps,/pd,f,l,t,r,b,m)\r\n\
+\tor /p <left>,<top>,<width>,<height>[,<dpi>,<max>]  [all integers].\r\n\
 /t\tSet window title.\r\n\
 /i\tStart as tray icon.\r\n\
 /o\tKeep window on top.\r\n\
--- a/language/np3_it_it/lexer_it_it.rc
+++ b/language/np3_it_it/lexer_it_it.rc
@ -496,6 +496,7 @@ BEGIN
    IDS_LEX_STR_63387       "Operatore Simbolo"
    IDS_LEX_STR_63388       "Stringa EOL"
    IDS_LEX_STR_63397       "Backticks"
+    IDS_LEX_STR_63398       "GUID String"
 END

 STRINGTABLE
--- a/language/np3_it_it/strings_it_it.rc
+++ b/language/np3_it_it/strings_it_it.rc
@ -174,6 +174,7 @@ BEGIN
    IDS_MUI_REPLCOUNT       "%s occorrenze del pattern di ricerca specificato sono state sostituite."
    IDS_MUI_ASK_ENCODING    "Cambiare la codifica del file potrebbe sostituire testo non supportato con un carattere di default, e la cronologia delle modifiche (undo) sarà svuotata. Continuare?"
    IDS_MUI_ASK_ENCODING2   "Stai per cambiare la codifica di un file vuoto. Questo cancellerà la cronologia delle modifiche (undo), perché non può essere sincronizzata con la nuova codifica. Continuare?"
+    IDS_MUI_ASK_CLEAR_UNDO  "This operation will clear the undo history. Continue?"
    IDS_MUI_READONLY_SAVE   """%s"" è in sola lettura. Salvare in un file differente?"
    IDS_MUI_FILECHANGENOTIFY
                            "Il file corrente è stato modificato da un programma esterno. Ricaricare?"
@ -315,8 +316,8 @@ Opzioni:\r\n\
 /b\tApri una nuova Paste Board per collezionare il testo copiato\r\n\tnegli Appunti.\r\n\
 /n\tApri sempre una nuova finestra (/ns istanza singola).\r\n\
 /r\tRiutilizza finestra (/rs istanza singola).\r\n\
-/p\tImposta posizione e dimensione della finestra (/p0, /ps, /pf,l,t,r,b,m)\r\n\
-\to /p <sinistra>,<sopra>,<larghezza>,<altezza>[,<dpi>,<max>]    [numeri interi].\r\n\
+/p\tImposta posizione e dimensione della finestra (/p0,/ps,/pd,f,l,t,r,b,m)\r\n\
+\to /p <sinistra>,<sopra>,<larghezza>,<altezza>[,<dpi>,<max>]  \r\n\t[numeri interi].\r\n\
 /t\tImposta titolo della finestra.\r\n\
 /i\tAvvia come icona nell'area di notifica'.\r\n\
 /o\tMantieni finestra in primo piano.\r\n\
--- a/language/np3_ja_jp/lexer_ja_jp.rc
+++ b/language/np3_ja_jp/lexer_ja_jp.rc
@ -496,6 +496,7 @@ BEGIN
    IDS_LEX_STR_63387       "Symbol Operator"
    IDS_LEX_STR_63388       "文字列 EOL"
    IDS_LEX_STR_63397       "Backticks"
+    IDS_LEX_STR_63398       "GUID String"
 END

 STRINGTABLE
--- a/language/np3_ja_jp/strings_ja_jp.rc
+++ b/language/np3_ja_jp/strings_ja_jp.rc
@ -174,6 +174,7 @@ BEGIN
    IDS_MUI_REPLCOUNT       "一致する %s か所を指定の検索条件で置換しました。"
    IDS_MUI_ASK_ENCODING    "他の文字コードに変換すると、未対応の文字は所定の文字に置換され、また「元に戻す」の履歴もリセットされます。\n変換を続行しますか?"
    IDS_MUI_ASK_ENCODING2   "空のファイルの文字コードを変更しようとしています。「元に戻す」の履歴もリセットされます。変更を続行しますか?"
+    IDS_MUI_ASK_CLEAR_UNDO  "This operation will clear the undo history. Continue?"
    IDS_MUI_READONLY_SAVE   "「%s」は読み取り専用です。別のファイル名で保存しますか?"
    IDS_MUI_FILECHANGENOTIFY
                            "ファイルが他のプログラムによって変更されました。再読み込みしますか?"
@ -304,7 +305,7 @@ Notepad3 [/?] [...[文字コード]] [...[改行コード]] [/e] [/g] [/m] [/l]\
 ...\t改行コード (/crlf, /cr, /lf)\r\n\
 /e\tファイルの文字コードを指定 [/e id]\r\n\
 /g\t指定位置にジャンプ (/g 行[,列] -1で終端)\r\n\
-/m\t文字列一致 [/m text] (/m- 最後, /mr 正規表現,\r\n\t/mb バックスラッシュ変換)\r\n\
+/m\t文字列一致 [/m text] (/m- 最後, /mr 正規表現, /mb バックスラッシュ変換)\r\n\
 /l\tファイル変更時に自動で最新内容に再読み込み\r\n\
 /q\tファイルがない場合、問い合わせずファイル作成\r\n\
 /s\t配色設定を指定 [/s ext]\r\n\
@ -315,8 +316,8 @@ Notepad3 [/?] [...[文字コード]] [...[改行コード]] [/e] [/g] [/m] [/l]\
 /b\tクリップボード履歴表示モードで開く\r\n\
 /n\t新規ウィンドウで開く (/ns ファイルは単一のインスタンス)\r\n\
 /r\tウインドウを再利用 (/rs 同じく単一のインスタンス\r\n\
-/p\tウィンドウの位置とサイズを指定 [/p x,y,sizex,y[,max]] (/p0, /ps, /pf,\r\n\
-\tl,t,r,b,m) or /p <left>,<top>,<width>,<height>[,<dpi>,<max>]    [すべて整数]\r\n\
+/p\tウィンドウの位置とサイズを指定 (/p0,/ps,/pd,f,l,t,r,b,m)\r\n\
+\tor /p <left>,<top>,<width>,<height>[,<dpi>,<max>]  [すべて整数]\r\n\
 /t\tタイトルバーの文字列を指定 [/t text]\r\n\
 /i\tシステムトレイ内に起動\r\n\
 /o\t常に手前に表示\r\n\
--- a/language/np3_ko_kr/lexer_ko_kr.rc
+++ b/language/np3_ko_kr/lexer_ko_kr.rc
@ -496,6 +496,7 @@ BEGIN
    IDS_LEX_STR_63387       "기호 연산자"
    IDS_LEX_STR_63388       "문자열 EOL"
    IDS_LEX_STR_63397       "백틱"
+    IDS_LEX_STR_63398       "GUID String"
 END

 STRINGTABLE
--- a/language/np3_ko_kr/strings_ko_kr.rc
+++ b/language/np3_ko_kr/strings_ko_kr.rc
@ -174,6 +174,7 @@ BEGIN
    IDS_MUI_REPLCOUNT       "지정한 검색 패턴의 %s 발생이 대체되었습니다."
    IDS_MUI_ASK_ENCODING    "파일 인코딩을 한 인코딩에서 다른 인코딩으로 전환하면 지원되지 않는 텍스트가 기본 문자로 대체될 수 있으며 실행 취소 기록이 지워집니다. 계속하시겠습니까?"
    IDS_MUI_ASK_ENCODING2   "빈 파일의 인코딩을 변경하려고 합니다. 새 인코딩과 동기화할 수 없기 때문에 실행 취소 기록이 지워집니다. 계속하시겠습니까?"
+    IDS_MUI_ASK_CLEAR_UNDO  "This operation will clear the undo history. Continue?"
    IDS_MUI_READONLY_SAVE   """%s""은 읽기 전용입니다. 다른 파일로 저장하시겠습니까?"
    IDS_MUI_FILECHANGENOTIFY
                            "현재 파일이 외부 프로그램에 의해 수정되었습니다. 다시 불러오시겠습니까?"
@ -315,8 +316,8 @@ Notepad3 [/?] [...[인코딩]] [...[줄 끝 모드]] [/e] [/g] [/m] [/l]\r\n\
 /b\t새 붙여넣기 보드를 열어 클립보드 항목을 수집합니다.\r\n\
 /n\t항상 새 창을 엽니다 (/ns 단일 파일 인스턴스).\r\n\
 /r\t창을 재사용합니다 (/rs 단일 파일 인스턴스).\r\n\
-/p\t창 위치와 크기 지정 (/p0, /ps, /pf,l,t,r,b,m)\r\n\
-\t또는 /p <왼쪽>,<상단>,<너비>,<높이>[,<dpi>,<최대>]    [모두 정수].\r\n\
+/p\t창 위치와 크기 지정 (/p0,/ps,/pd,f,l,t,r,b,m)\r\n\
+\t또는 /p <왼쪽>,<상단>,<너비>,<높이>[,<dpi>,<최대>]  [모두 정수].\r\n\
 /t\t창 제목을 설정합니다.\r\n\
 /i\t트레이 아이콘으로 시작합니다.\r\n\
 /o\t창을 맨 위에 둡니다.\r\n\
--- a/language/np3_nl_nl/dialogs_nl_nl.rc
+++ b/language/np3_nl_nl/dialogs_nl_nl.rc
@ -74,13 +74,13 @@ BEGIN
    CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | RICHEDTCTRL_ADDSTYLE,20,90,360,170, ES_EX_ZOOMABLE
 END

-IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 300, 210
+IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 320, 210
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Hulp bij de opdrachtregel"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,239,187,55,16
-    EDITTEXT        IDC_CMDLINEHELP,15,7,278,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
+    DEFPUSHBUTTON   "OK",IDOK,259,187,55,16
+    EDITTEXT        IDC_CMDLINEHELP,15,7,298,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
 END

 IDD_MUI_FIND DIALOGEX 0, 0, 273, 142
--- a/language/np3_nl_nl/lexer_nl_nl.rc
+++ b/language/np3_nl_nl/lexer_nl_nl.rc
@ -496,6 +496,7 @@ BEGIN
    IDS_LEX_STR_63387       "Symbol Operator"
    IDS_LEX_STR_63388       "String EOL"
    IDS_LEX_STR_63397       "Backticks"
+    IDS_LEX_STR_63398       "GUID String"
 END

 STRINGTABLE
--- a/language/np3_nl_nl/strings_nl_nl.rc
+++ b/language/np3_nl_nl/strings_nl_nl.rc
@ -174,6 +174,7 @@ BEGIN
    IDS_MUI_REPLCOUNT       "%s exempla(a)r(en) van het opgegeven zoekpatroon vervangen."
    IDS_MUI_ASK_ENCODING    "Bij het omzetten van de ene naar de andere codering kan niet-ondersteunde tekst worden vervangen door standaardtekens. Dit kan niet ongedaan worden. Doorgaan?"
    IDS_MUI_ASK_ENCODING2   "Je staat op het punt de codering van een leeg bestand te wijzigen. Dit kan niet ongedaan worden. Doorgaan?"
+    IDS_MUI_ASK_CLEAR_UNDO  "This operation will clear the undo history. Continue?"
    IDS_MUI_READONLY_SAVE   """%s"" is alleen-lezen. Opslaan als een ander bestand?"
    IDS_MUI_FILECHANGENOTIFY
                           "Het huidige bestand is gewijzigd door een extern programma. Opnieuw laden?"
@ -295,9 +296,9 @@ Gebruik:\r\n\
 Notepad3 [/?] [...[Codering]] [...[Regeleinde-modus]] [/e] [/g] [/m] [/l]\r\n\
 \t[/q] [/s] [/d] [/h] [/x] [/c] [/b] [/n] [/r| [/p] [/t] [/i] [/o]\r\n\
 \t[/f] [/u] [/v] [/vd] [/y] [/z] [[schijf:][pad]bestand[...]]\r\n\r\n\
-bestand\tMoet het laatste argument zijn, geen aanhalingstekens\r\n\tspaties standaard.\r\n\
-+\tAccepteer meerdere bestandsargumenten (met\r\n\taanhalingstekens spaties).\r\n\
-\tAccepteer argument voor een enkel bestand (zonder\r\n\taanhalingstekens).\r\n\r\n\
+bestand\tMoet het laatste argument zijn, geen aanhalingstekens spaties standaard.\r\n\
+\tAccepteer meerdere bestandsargumenten (met aanhalingstekens spaties).\r\n\
+-\tAccepteer argument voor een enkel bestand (zonder aanhalingstekens).\r\n\r\n\
 Opties:\r\n\
 /?\tDeze gebruiksaanwijzing weergeven.\r\n\
 ...\tCodering (/ansi, /unicode, /unicodebe, /utf8, /utf8sig).\r\n\
@ -315,8 +316,8 @@ Opties:\r\n\
 /b\tOpen nieuw plakbord om de klemborditems te verzamelen.\r\n\
 /n\tOpen altijd een nieuw venster (/ns één bestand instantie).\r\n\
 /r\tHergebruik venster (/rs één bestand instantie).\r\n\
-/p\tVensterpositie en -grootte instellen (/p0, /ps, /pf,l,t,r,b,m)\r\n\
-\tof /p <links>,<top>,<breedte>,<hoogte>[,<dpi>,<max>]    [gehele getallen].\r\n\
+/p\tVensterpositie en -grootte instellen (/p0,/ps,/pd,f,l,t,r,b,m)\r\n\
+\tof /p <links>,<top>,<breedte>,<hoogte>[,<dpi>,<max>]  [gehele\r\n\tgetallen].\r\n\
 /t\tVenstertitel instellen.\r\n\
 /i\tStart als systeemvakpictogram.\r\n\
 /o\tVenster bovenop houden.\r\n\
@ -325,7 +326,7 @@ Opties:\r\n\
 /v\tBestand direct afdrukken en afsluiten.\r\n\
 /vd\tBestand afdrukken (via printerdialoog).\r\n\
 /y\tZoekomgeving PAD in geval van relatieve bestandsnaam.\r\n\
-/z\tVolgende overslaan (bruikbaar voor het register-gebaseerde\r\n\tNotepad vervanging).\r\n\r\n\
+/z\tVolgende overslaan (bruikbaar voor het register-gebaseerde Notepad\r\n\tvervanging).\r\n\r\n\
 Voorbeelden:\r\n\
 Notepad3 /utf8sig /crlf d:\\temp\\Test.txt\r\n\
 \t... Nieuw bestand openen: ""Test.txt"" Codering=UTF-8-BOM, EoL=CRLF.\r\n\
--- a/language/np3_pl_pl/dialogs_pl_pl.rc
+++ b/language/np3_pl_pl/dialogs_pl_pl.rc
@ -74,13 +74,13 @@ BEGIN
    CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | RICHEDTCTRL_ADDSTYLE,20,90,360,170, ES_EX_ZOOMABLE
 END

-IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 300, 210
+IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 310, 210
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Pomoc linii komend"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,239,187,55,16
-    EDITTEXT        IDC_CMDLINEHELP,15,7,278,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
+    DEFPUSHBUTTON   "OK",IDOK,249,187,55,16
+    EDITTEXT        IDC_CMDLINEHELP,15,7,288,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
 END

 IDD_MUI_FIND DIALOGEX 0, 0, 273, 142
--- a/language/np3_pl_pl/lexer_pl_pl.rc
+++ b/language/np3_pl_pl/lexer_pl_pl.rc
@ -496,6 +496,7 @@ BEGIN
    IDS_LEX_STR_63387       "Symbol Operator"
    IDS_LEX_STR_63388       "String EOL"
    IDS_LEX_STR_63397       "Backticks"
+    IDS_LEX_STR_63398       "GUID String"
 END

 STRINGTABLE
--- a/language/np3_pl_pl/strings_pl_pl.rc
+++ b/language/np3_pl_pl/strings_pl_pl.rc
@ -174,6 +174,7 @@ BEGIN
    IDS_MUI_REPLCOUNT       "Zamieniono %s wystąpień określonego wzorca wyszukiwania."
    IDS_MUI_ASK_ENCODING    "Przełączanie kodowania pliku z jednego kodowania na drugie może zamienić tekst na domyślne znaki, i przywrócenie historii zostanie wymazane. Kontynuować?"
    IDS_MUI_ASK_ENCODING2   "Właśnie chcesz zmienić kodowanie pustego pliku. Spowoduje to wyczyszczenie historii, jak i również nie będzie możliwe zsynchronizowanie nowego kodowania. Kontynuować?"
+    IDS_MUI_ASK_CLEAR_UNDO  "This operation will clear the undo history. Continue?"
    IDS_MUI_READONLY_SAVE   """%s"" tylko do odczytu. Zapisać do innego pliku?"
    IDS_MUI_FILECHANGENOTIFY
                            "Bieżący plik został zmieniony przez zewnętrzny program. Załadować ponownie?"
@ -315,8 +316,8 @@ Opcje:\r\n\
 /b\tOpen new paste board to collect clipboard entries.\r\n\
 /n\tAlways open a new window (/ns single file instance).\r\n\
 /r\tReuse window (/rs single file instance).\r\n\
-/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m)\r\n\
-\tor /p <lewy>,<góra>,<szer.>,<wys.>[,<dpi>,<maks>]    [wszystkie liczby].\r\n\
+/p\tSet window position and size (/p0,/ps,/pd,f,l,t,r,b,m)\r\n\
+\tor /p <lewy>,<góra>,<szer.>,<wys.>[,<dpi>,<maks>]  [wszystkie liczby].\r\n\
 /t\tSet window title.\r\n\
 /i\tStart as tray icon.\r\n\
 /o\tKeep window on top.\r\n\
--- a/language/np3_pt_br/dialogs_pt_br.rc
+++ b/language/np3_pt_br/dialogs_pt_br.rc
@ -74,13 +74,13 @@ BEGIN
    CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | RICHEDTCTRL_ADDSTYLE,20,90,360,170, ES_EX_ZOOMABLE
 END

-IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 300, 210
+IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 320, 210
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Ajuda para Linha de Comando"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,239,187,55,16
-    EDITTEXT        IDC_CMDLINEHELP,15,7,278,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
+    DEFPUSHBUTTON   "OK",IDOK,259,187,55,16
+    EDITTEXT        IDC_CMDLINEHELP,15,7,298,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
 END

 IDD_MUI_FIND DIALOGEX 0, 0, 273, 142
--- a/language/np3_pt_br/lexer_pt_br.rc
+++ b/language/np3_pt_br/lexer_pt_br.rc
@ -496,6 +496,7 @@ BEGIN
    IDS_LEX_STR_63387       "Operador de Símbolos"
    IDS_LEX_STR_63388       "String EOL"
    IDS_LEX_STR_63397       "Acentos Graves"
+    IDS_LEX_STR_63398       "Cadeia GUID"
 END

 STRINGTABLE
--- a/language/np3_pt_br/strings_pt_br.rc
+++ b/language/np3_pt_br/strings_pt_br.rc
@ -174,6 +174,7 @@ BEGIN
    IDS_MUI_REPLCOUNT       "%s ocorrência(s) substituída(s) do termo de pesquisa especificado."
    IDS_MUI_ASK_ENCODING    "Mudar a codificação de um arquivo de uma codificação para outra pode levar à substituição de textos não suportados por caracteres padrão, e o histórico de ações para desfazer será apagado. Continuar?"
    IDS_MUI_ASK_ENCODING2   "Você está para mudar a codificação de um arquivo vazio. Note que isso apagará o histórico de ações para desfazer, já que ela não pode ser sincronizada com a nova codificação. Continuar?"
+    IDS_MUI_ASK_CLEAR_UNDO  "Esta operação irá limpar o histórico de desfazer. Continuar?"
    IDS_MUI_READONLY_SAVE   """%s"" é somente leitura. Salvar em um arquivo diferente?"
    IDS_MUI_FILECHANGENOTIFY
                            "O presente arquivo foi modificado por um programa externo. Recarregar?"
@ -315,8 +316,8 @@ Opções:\r\n\
 /b\tAbre um novo quadro de colagem para coletar entradas da área \r\n\tde transferência.\r\n\
 /n\tSempre abre uma nova janela (/ns instância de único arquivo).\r\n\
 /r\tReusa a janela (/rs instância de único arquivo).\r\n\
-/p\tDefine a posição e o tamanho da janela (/p0, /ps, /pf,l,t,r,b,m)\r\n\
-\tou /p <left>,<top>,<width>,<height>[,<dpi>,<max>]    [all integers].\r\n\
+/p\tDefine a posição e o tamanho da janela (/p0,/ps,/pd,f,l,t,r,b,m)\r\n\
+\tou /p <left>,<top>,<width>,<height>[,<dpi>,<max>]  [todos os números \r\n\tinteiros].\r\n\
 /t\tDefine o título da janela.\r\n\
 /i\tInicia como ícone na área de notificação.\r\n\
 /o\tMantém a janela sobre as outras.\r\n\
@ -324,8 +325,8 @@ Opções:\r\n\
 /u\tExecuta com privilégios elevados.\r\n\
 /v\tImprime o arquivo imediatamente e fecha.\r\n\
 /vd\tImprime o arquivo (abre o diálogo de impressão).\r\n\
-/y\tCAMINHO do ambiente de pesquisa em caso de nome de\r\n\tarquivo relativo.\r\n\
-/z\tPular próximo (utilizável para substituição de Bloco de Notas\r\n\tcom base no registro).\r\n\r\n\
+/y\tCAMINHO do ambiente de pesquisa em caso de nome de tarquivo relativo.\r\n\
+/z\tPular próximo (utilizável para substituição de Bloco de Notas com base \r\n\tno registro).\r\n\r\n\
 Exemplos:\r\n\
 Notepad3 /utf8sig /crlf d:\\temp\\Test.txt\r\n\
 \t... Abre um novo arquivo: ""Test.txt"" Encoding=UTF-8-BOM, EoL=CRLF.\r\n\
--- a/language/np3_pt_pt/dialogs_pt_pt.rc
+++ b/language/np3_pt_pt/dialogs_pt_pt.rc
@ -74,13 +74,13 @@ BEGIN
    CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | RICHEDTCTRL_ADDSTYLE,20,90,360,170, ES_EX_ZOOMABLE
 END

-IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 300, 210
+IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 320, 210
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Ajuda da linha de comandos"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,239,187,55,16
-    EDITTEXT        IDC_CMDLINEHELP,15,7,278,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
+    DEFPUSHBUTTON   "OK",IDOK,259,187,55,16
+    EDITTEXT        IDC_CMDLINEHELP,15,7,298,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
 END

 IDD_MUI_FIND DIALOGEX 0, 0, 273, 142
--- a/language/np3_pt_pt/lexer_pt_pt.rc
+++ b/language/np3_pt_pt/lexer_pt_pt.rc
@ -496,6 +496,7 @@ BEGIN
    IDS_LEX_STR_63387       "Symbol Operator"
    IDS_LEX_STR_63388       "String EOL"
    IDS_LEX_STR_63397       "Backticks"
+    IDS_LEX_STR_63398       "GUID String"
 END

 STRINGTABLE
--- a/language/np3_pt_pt/strings_pt_pt.rc
+++ b/language/np3_pt_pt/strings_pt_pt.rc
@ -174,6 +174,7 @@ BEGIN
    IDS_MUI_REPLCOUNT       "Foram substituídas %s ocorrência(s) do padrão de procura especificado."
    IDS_MUI_ASK_ENCODING    "A alteração da codificação do ficheiro de uma para outra, pode substituir texto não suportado com caracteres padrão e será limpo o histórico de anulações. Continuar?"
    IDS_MUI_ASK_ENCODING2   "Está prestes a alterar a codificação de um ficheiro vazio. Tenha em atenção de que isto irá limpar o histórico de anulações e que não pode ser sincronizado com a nova codificação. Continuar?"
+    IDS_MUI_ASK_CLEAR_UNDO  "This operation will clear the undo history. Continue?"
    IDS_MUI_READONLY_SAVE   """%s"" é só de leitura. Guardar noutro ficheiro?"
    IDS_MUI_FILECHANGENOTIFY
                            "O ficheiro actual foi modificado por um programa externo. Recarregar?"
@ -304,7 +305,7 @@ Opções:\r\n\
 ...\tModo fim de linha (/crlf, /cr, /lf).\r\n\
 /e\tCodificação do ficheiro de origem.\r\n\
 /g\tSalta para posição indicada (/g -1 fim do ficheiro).\r\n\
-/m\tCorresponde ao texto especificado (/m- último, /mr regex,\r\n\t/mb backslash).\r\n\
+/m\tCorresponde ao texto especificado (/m- último, /mr regex, /mb backslash).\r\n\
 /l\tAuto-recarrega ficheiros modificados.\r\n\
 /q\tForça a criação de novos ficheiros sem perguntar.\r\n\
 /s\tSelecciona esquema de sintaxe especificado.\r\n\
@ -315,8 +316,8 @@ Opções:\r\n\
 /b\tAbre novo quadro de colagem para recolher entradas da área \r\n\tde transferência.\r\n\
 /n\tAbre sempre uma nova janela (/ns instância de único ficheiro).\r\n\
 /r\tReutiliza a janela (/rs instância de único ficheiro).\r\n\
-/p\tDefine tamanho e posição da janela (/p0, /ps, /pf,l,t,r,b,m) ou /p\r\n\
-\t<esquerda>,<superior>,<largura>,<altura>[,<dpi>,<máx>]    [todos inteiros].\r\n\
+/p\tDefine tamanho e posição da janela (/p0,/ps,/pd,f,l,t,r,b,m)\r\n\
+\tou /p <esquerda>,<superior>,<largura>,<altura>[,<dpi>,<máx>]  [todos \r\n\tinteiros].\r\n\
 /t\tDefine título da janela.\r\n\
 /i\tInicia como ícone na área de notificação.\r\n\
 /o\tMantém a janela sempre visível.\r\n\
@ -328,7 +329,7 @@ Opções:\r\n\
 /z\tIgnora seguinte (utilizável para substituição do Notepad com base \r\n\tno registro).\r\n\r\n\
 Exemplos:\r\n\
 Notepad3 /utf8sig /crlf d:\\temp\\Test.txt\r\n\
- \t... Abre um novo ficheiro: ""Test.txt"" Codificação=UTF-8-BOM,\r\n\tEoL=CRLF.\r\n\
+ \t... Abre um novo ficheiro: ""Test.txt"" Codificação=UTF-8-BOM, EoL=CRLF.\r\n\
 Notepad3 /v d:\\temp\\Test.txt\r\n\
 \t... Imprime o ficheiro: ""Test.txt"" imediatamente.\
 "
--- a/language/np3_ru_ru/dialogs_ru_ru.rc
+++ b/language/np3_ru_ru/dialogs_ru_ru.rc
@ -74,13 +74,13 @@ BEGIN
    CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | RICHEDTCTRL_ADDSTYLE,20,90,360,170, ES_EX_ZOOMABLE
 END

-IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 300, 210
+IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 310, 210
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Параметры командной строки"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,239,187,55,16
-    EDITTEXT        IDC_CMDLINEHELP,15,7,278,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
+    DEFPUSHBUTTON   "OK",IDOK,249,187,55,16
+    EDITTEXT        IDC_CMDLINEHELP,15,7,288,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
 END

 IDD_MUI_FIND DIALOGEX 0, 0, 313, 142
--- a/language/np3_ru_ru/lexer_ru_ru.rc
+++ b/language/np3_ru_ru/lexer_ru_ru.rc
@ -496,6 +496,7 @@ BEGIN
    IDS_LEX_STR_63387       "Symbol Operator"
    IDS_LEX_STR_63388       "String EOL"
    IDS_LEX_STR_63397       "Backticks"
+    IDS_LEX_STR_63398       "GUID String"
 END

 STRINGTABLE
--- a/language/np3_ru_ru/strings_ru_ru.rc
+++ b/language/np3_ru_ru/strings_ru_ru.rc
@ -174,6 +174,7 @@ BEGIN
    IDS_MUI_REPLCOUNT       "Заменено вхождений указанного шаблона поиска: %s."
    IDS_MUI_ASK_ENCODING    "Переключение кодировки файла с одной на другую может заменить неподдерживаемый текст заполнителями, а история отмены будет очищена. Все равно продолжить?"
    IDS_MUI_ASK_ENCODING2   "Вы собираетесь изменить кодировку пустого файла. Обратите внимание, что это очистит историю отмены, поскольку она не может быть синхронизирована с новой кодировкой. Все равно продолжить?"
+    IDS_MUI_ASK_CLEAR_UNDO  "This operation will clear the undo history. Continue?"
    IDS_MUI_READONLY_SAVE   "«%s» только для чтения. Сохранить в другой файл?"
    IDS_MUI_FILECHANGENOTIFY
                            "Этот файл был изменен внешней программой. Переоткрыть его?"
@ -315,8 +316,8 @@ Notepad3 [/?] [...[Кодировка]] [...[Окончания строк]] [/e
 /b\tОткрыть новое окно для сбора изменений буфера обмена.\r\n\
 /n\tВсегда открывать новое окно (/ns один экземпляр файла).\r\n\
 /r\tПереиспользовать окно (/rs один экземпляр файла).\r\n\
-/p\tЗадать положение и размер окна (/p0, /ps, /pf,l,t,r,b,m)\r\n\
-\tили /p <left>,<top>,<width>,<height>[,<dpi>,<max>]    [целые числа].\r\n\
+/p\tЗадать положение и размер окна (/p0,/ps,/pd,f,l,t,r,b,m)\r\n\
+\tили /p <left>,<top>,<width>,<height>[,<dpi>,<max>]  [целые числа].\r\n\
 /t\tЗадать заголовок окна.\r\n\
 /i\tЗапустить иконкой в области уведомлений.\r\n\
 /o\tПоверх других окон.\r\n\
--- a/language/np3_sk_sk/dialogs_sk_sk.rc
+++ b/language/np3_sk_sk/dialogs_sk_sk.rc
@ -74,13 +74,13 @@ BEGIN
    CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | RICHEDTCTRL_ADDSTYLE,20,90,360,170, ES_EX_ZOOMABLE
 END

-IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 300, 210
+IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 320, 210
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Nápoveda príkazového riadka"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,239,187,55,16
-    EDITTEXT        IDC_CMDLINEHELP,15,7,278,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
+    DEFPUSHBUTTON   "OK",IDOK,259,187,55,16
+    EDITTEXT        IDC_CMDLINEHELP,15,7,298,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
 END

 IDD_MUI_FIND DIALOGEX 0, 0, 273, 142
--- a/language/np3_sk_sk/lexer_sk_sk.rc
+++ b/language/np3_sk_sk/lexer_sk_sk.rc
@ -496,6 +496,7 @@ BEGIN
    IDS_LEX_STR_63387       "Symbol Operator"
    IDS_LEX_STR_63388       "String EOL"
    IDS_LEX_STR_63397       "Backticks"
+    IDS_LEX_STR_63398       "GUID String"
 END

 STRINGTABLE
--- a/language/np3_sk_sk/strings_sk_sk.rc
+++ b/language/np3_sk_sk/strings_sk_sk.rc
@ -174,6 +174,7 @@ BEGIN
    IDS_MUI_REPLCOUNT       "%s výskytov zadaného vyhľadávania bolo nahradených."
    IDS_MUI_ASK_ENCODING    "Prepínanie kódovania súboru z jedného na iné môže spôsobiť, že nepodporované znaky budú nahradené predvolenými znakmi a história spätných krokov sa vymaže. Chcete pokračovať?"
    IDS_MUI_ASK_ENCODING2   "Chystáte sa zmeniť kódovanie prázdneho súboru. Upozorňujeme, že týmto sa vymaže história spätných krokov, pretože sa nedá synchronizovať s novým kódovaním. Pokračovať?"
+    IDS_MUI_ASK_CLEAR_UNDO  "This operation will clear the undo history. Continue?"
    IDS_MUI_READONLY_SAVE   """%s"" je iba na čítanie. Uložiť súbor pod iným názvom?"
    IDS_MUI_FILECHANGENOTIFY
                            "Aktuálny súbor bol upravený externým programom. Znovu ho načítať?"
@ -295,7 +296,7 @@ Použitie:\r\n\
 Notepad3 [/?] [...[Kódovanie]] [...[Režim ukončenia riadku]] [/e] [/g] [/m] [/l]\r\n\
 \t[/q] [/s] [/d] [/h] [/x] [/c] [/b] [/n] [/r| [/p] [/t] [/i] [/o]\r\n\
 \t[/f] [/u] [/v] [/vd] [/y] [/z] [[disk:][cesta]názov súboru[...]]\r\n\r\n\
-súbor\tMusí to byť posledný argument, v predvolenom nastavení nie sú\r\n\tmedzery.\r\n\
+súbor\tMusí to byť posledný argument, v predvolenom nastavení nie sú medzery.\r\n\
 +\tAkceptuje viac argumentov súborov (s medzerami).\r\n\
 -\tAkceptuje argument jedného súboru (bez medzier).\r\n\r\n\
 Možnosti:\r\n\
@ -315,8 +316,8 @@ Možnosti:\r\n\
 /b\tOtvorenie nového panela na vkladanie a zber záznamov zo schránky.\r\n\
 /n\tVždy otvoriť nové okno (/ns inštancia jedného súboru).\r\n\
 /r\tOpätovné použitie okna (/rs inštancia jedného súboru).\r\n\
-/p\tNastavenie polohy a veľkosti okna (/p0, /ps, /pf,l,t,r,b,m)\r\n\
-\talebo /p <vľavo>,<hore>,<šírka>,<výška>[,<dpi>,<max>]    [všetky čísla celé].\r\n\
+/p\tNastavenie polohy a veľkosti okna (/p0,/ps,/pd,f,l,t,r,b,m)\r\n\
+\talebo /p <vľavo>,<hore>,<šírka>,<výška>[,<dpi>,<max>]  [všetky čísla \r\n\tcelé].\r\n\
 /t\tNastavenie titulku okna.\r\n\
 /i\tZačať ako ikona na paneli úloh.\r\n\
 /o\tPonechanie okna vždy na vrchu.\r\n\
@ -325,7 +326,7 @@ Možnosti:\r\n\
 /v\tOkamžité vytlačenie súboru a ukončenie.\r\n\
 /vd\tTlač súboru cez dialógové okno tlačiarne.\r\n\
 /y\tVyhľadanie prostredia cesty v prípade relatívneho názvu súboru.\r\n\
-/z\tPreskočiť ďalej (použiteľné pri zámene Poznámkového bloku\r\n\tWindows pomocou registrov).\r\n\r\n\
+/z\tPreskočiť ďalej (použiteľné pri zámene Poznámkového bloku Windows \r\n\tpomocou registrov).\r\n\r\n\
 Príklady:\r\n\
 Notepad3 /utf8sig /crlf d:\\temp\\Test.txt\r\n\
 \t... Otvoriť nový súbor: ""Test.txt"" Encoding=UTF-8-BOM, EoL=CRLF.\r\n\
--- a/language/np3_sv_se/dialogs_sv_se.rc
+++ b/language/np3_sv_se/dialogs_sv_se.rc
@ -74,13 +74,13 @@ BEGIN
    CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | RICHEDTCTRL_ADDSTYLE,20,90,360,170, ES_EX_ZOOMABLE
 END

-IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 300, 210
+IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 310, 210
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Hjälp för kommandorad"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,239,187,55,16
-    EDITTEXT        IDC_CMDLINEHELP,15,7,278,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
+    DEFPUSHBUTTON   "OK",IDOK,249,187,55,16
+    EDITTEXT        IDC_CMDLINEHELP,15,7,288,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
 END

 IDD_MUI_FIND DIALOGEX 0, 0, 273, 142
--- a/language/np3_sv_se/lexer_sv_se.rc
+++ b/language/np3_sv_se/lexer_sv_se.rc
@ -496,6 +496,7 @@ BEGIN
    IDS_LEX_STR_63387       "Symboloperatör"
    IDS_LEX_STR_63388       "Sträng EOL"
    IDS_LEX_STR_63397       "Backticks"
+    IDS_LEX_STR_63398       "GUID String"
 END

 STRINGTABLE
--- a/language/np3_sv_se/strings_sv_se.rc
+++ b/language/np3_sv_se/strings_sv_se.rc
@ -174,6 +174,7 @@ BEGIN
    IDS_MUI_REPLCOUNT       "%s träff(ar) för angivet sökmönster ersatta."
    IDS_MUI_ASK_ENCODING    "Att byta teckenkodning från en kodning till en annan kommer att ersätta tecken som inte stöds med standardtecken och ångerhistoriken kommer att rensas. Vill du fortsätta?"
    IDS_MUI_ASK_ENCODING2   "Du kommer att ändra teckenkodning i en tom fil. Notera att detta kommer att rensa ångerhistoriken. Vill du fortsätta?"
+    IDS_MUI_ASK_CLEAR_UNDO  "This operation will clear the undo history. Continue?"
    IDS_MUI_READONLY_SAVE   """%s"" är inte skrivbar. Vill du spara till en annan fil?"
    IDS_MUI_FILECHANGENOTIFY
                            "Aktuell fil har modifierats av ett externt program. Vill du ladda om?"
@ -315,8 +316,8 @@ Tillval:\r\n\
 /b\tÖppna urklippsbordet för att samla alla urklipp.\r\n\
 /n\tÖppna alltid nytt fönster (/ns enkel filinstans).\r\n\
 /r\tÅteranvänd fönster (/rs enkel filinstans).\r\n\
-/p\tAnge fönsterposition och storlek (/p0, /ps, /pf,l,t,r,b,m)\r\n\
-\teller /p <vänster>,<topp>,<bredd>,<höjd>[,<dpi>,<max>]    [alla heltal].\r\n\
+/p\tAnge fönsterposition och storlek (/p0,/ps,/pd,f,l,t,r,b,m)\r\n\
+\teller /p <vänster>,<topp>,<bredd>,<höjd>[,<dpi>,<max>]  [alla heltal].\r\n\
 /t\tAnge fönstertitel.\r\n\
 /i\tStarta som ikon i verktygsfältet.\r\n\
 /o\tVisa alltid fönstret överst.\r\n\
@ -325,7 +326,7 @@ Tillval:\r\n\
 /v\tSpara fil och avsluta.\r\n\
 /vd\tSkriv ut fil (öppna skrivardialogen).\r\n\
 /y\tSök miljövariable vid relativt filnamn.\r\n\
-/z\tHoppa över nästa (användbart för registerbaserad\r\n\tnotepad-ersättning).\r\n\r\n\
+/z\tHoppa över nästa (användbart för registerbaserad notepad-ersättning).\r\n\r\n\
 Exempel:\r\n\
 Notepad3 /utf8sig /crlf d:\\temp\\Test.txt\r\n\
 \t... Öppna ny fil: ""Test.txt"" Encoding=UTF-8-BOM, EoL=CRLF.\r\n\
--- a/language/np3_tr_tr/dialogs_tr_tr.rc
+++ b/language/np3_tr_tr/dialogs_tr_tr.rc
@ -74,13 +74,13 @@ BEGIN
    CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | RICHEDTCTRL_ADDSTYLE,20,90,360,170, ES_EX_ZOOMABLE
 END

-IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 300, 210
+IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 310, 210
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Komut satırı yardımı"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "Tamam",IDOK,239,187,55,16
-    EDITTEXT        IDC_CMDLINEHELP,15,7,278,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
+    DEFPUSHBUTTON   "Tamam",IDOK,249,187,55,16
+    EDITTEXT        IDC_CMDLINEHELP,15,7,288,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
 END

 IDD_MUI_FIND DIALOGEX 0, 0, 285, 142
--- a/language/np3_tr_tr/lexer_tr_tr.rc
+++ b/language/np3_tr_tr/lexer_tr_tr.rc
@ -496,6 +496,7 @@ BEGIN
    IDS_LEX_STR_63387       "Simge işlemi"
    IDS_LEX_STR_63388       "Dizge satır sonu"
    IDS_LEX_STR_63397       "Ters tik"
+    IDS_LEX_STR_63398       "GUID String"
 END

 STRINGTABLE
--- a/language/np3_tr_tr/strings_tr_tr.rc
+++ b/language/np3_tr_tr/strings_tr_tr.rc
@ -174,6 +174,7 @@ BEGIN
    IDS_MUI_REPLCOUNT       "Belirtilen aramaya uygun %s eşleşme bulundu."
    IDS_MUI_ASK_ENCODING    "Dosya kodlamasını değiştirmek desteklenmeyen karakterlerin varsayılanlar ile değiştirilmesine yol açar ve geri alma geçmişini temizler. Devam etmek istiyor musunuz?"
    IDS_MUI_ASK_ENCODING2   "Boş bir dosyanın kodlamasını değiştirmek üzeresiniz. Yeni kodlama ile eşitlenemeyeceğinden bu işlemin geri alma geçmişini sileceğini unutmayın. Devam etmek istiyor musunuz?"
+    IDS_MUI_ASK_CLEAR_UNDO  "This operation will clear the undo history. Continue?"
    IDS_MUI_READONLY_SAVE   """%s"" salt okunur. Başka bir dosyaya kaydetmek ister misiniz?"
    IDS_MUI_FILECHANGENOTIFY
                            "Geçerli dosya başka bir uygulama tarafından değiştirilmiş Yeniden yüklemek ister misiniz?"
@ -315,8 +316,8 @@ Seçenekler:\r\n\
 /b\tPano kayıtlarını derlemek için yeni yapıştırma panosu açar.\r\n\
 /n\tHer zaman yeni pencerede açar (/ns tek dosya kopyası).\r\n\
 /r\tPencereyi yeniden kullanır (/rs tek dosya kopyası).\r\n\
-/p\tPencere konumunu ve boyutunu ayarlar (/p0, /ps, /pf,l,t,r,b,m)\r\n\
-\tor /p <left>,<top>,<width>,<height>[,<dpi>,<max>]    [tümü tam sayı].\r\n\
+/p\tPencere konumunu ve boyutunu ayarlar (/p0,/ps,/pd,f,l,t,r,b,m)\r\n\
+\tor /p <left>,<top>,<width>,<height>[,<dpi>,<max>]  [tümü tam sayı].\r\n\
 /t\tPencere başlığını ayarlar.\r\n\
 /i\tSistem tepsisinde başlatır.\r\n\
 /o\tPencereyi üste sabitler.\r\n\
@ -325,7 +326,7 @@ Seçenekler:\r\n\
 /v\tDosyayı hemen yazdırır ve çıkar.\r\n\
 /vd\tDosyayı yazdırır (yazıcı penceresini açar).\r\n\
 /y\tGöreli dosya adı durumuna karşı PATH ortam değişkeninde arar.\r\n\
-/z\tSonrakine geçer (kayıt defteri temelli Notepad değişikliği\r\n\tiçin kullanışlı).\r\n\r\n\
+/z\tSonrakine geçer (kayıt defteri temelli Notepad değişikliği için kullanışlı).\r\n\r\n\
 Örnekler:\r\n\
 Notepad3 /utf8sig /crlf d:\\temp\\Deneme.txt\r\n\
 \t... Yeni bir dosya açar: ""Deneme.txt"" Encoding=UTF-8-BOM, EoL=CRLF.\r\n\
--- a/language/np3_vi_vn/lexer_vi_vn.rc
+++ b/language/np3_vi_vn/lexer_vi_vn.rc
@ -496,6 +496,7 @@ BEGIN
    IDS_LEX_STR_63387       "Symbol Operator"
    IDS_LEX_STR_63388       "String EOL"
    IDS_LEX_STR_63397       "Backticks"
+    IDS_LEX_STR_63398       "GUID String"
 END

 STRINGTABLE
--- a/language/np3_vi_vn/strings_vi_vn.rc
+++ b/language/np3_vi_vn/strings_vi_vn.rc
@ -174,6 +174,7 @@ BEGIN
    IDS_MUI_REPLCOUNT       "%s occurrence(s) of specified search pattern replaced."
    IDS_MUI_ASK_ENCODING    "Switching the file encoding from one encoding to another may replace unsupported text with default characters, and the undo history will be cleared. Continue?"
    IDS_MUI_ASK_ENCODING2   "You are about to change the encoding of an empty file. Note that this will clear the undo history, as it can't be synchronised with the new encoding. Continue?"
+    IDS_MUI_ASK_CLEAR_UNDO  "This operation will clear the undo history. Continue?"
    IDS_MUI_READONLY_SAVE   """%s"" is read only. Save to a different file?"
    IDS_MUI_FILECHANGENOTIFY
                            "The current file has been modified by an external program. Reload?"
@ -315,8 +316,8 @@ Options:\r\n\
 /b\tOpen new paste board to collect clipboard entries.\r\n\
 /n\tAlways open a new window (/ns single file instance).\r\n\
 /r\tReuse window (/rs single file instance).\r\n\
-/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m)\r\n\
-\tor /p <left>,<top>,<width>,<height>[,<dpi>,<max>]    [all integers].\r\n\
+/p\tSet window position and size (/p0,/ps,/pd,f,l,t,r,b,m)\r\n\
+\tor /p <left>,<top>,<width>,<height>[,<dpi>,<max>]  [all integers].\r\n\
 /t\tSet window title.\r\n\
 /i\tStart as tray icon.\r\n\
 /o\tKeep window on top.\r\n\
--- a/language/np3_zh_cn/lexer_zh_cn.rc
+++ b/language/np3_zh_cn/lexer_zh_cn.rc
@ -496,6 +496,7 @@ BEGIN
    IDS_LEX_STR_63387       "Symbol Operator"
    IDS_LEX_STR_63388       "String EOL"
    IDS_LEX_STR_63397       "Backticks"
+    IDS_LEX_STR_63398       "GUID String"
 END

 STRINGTABLE
--- a/language/np3_zh_cn/strings_zh_cn.rc
+++ b/language/np3_zh_cn/strings_zh_cn.rc
@ -174,6 +174,7 @@ BEGIN
    IDS_MUI_REPLCOUNT       "替换了 %s 个匹配项。"
    IDS_MUI_ASK_ENCODING    "切换文件编码可能导致部分无法表示的字符被替换为其它字符，并且该操作会清空撤销历史。是否继续？"
    IDS_MUI_ASK_ENCODING2   "切换文件编码会清空撤销历史。是否继续？"
+    IDS_MUI_ASK_CLEAR_UNDO  "This operation will clear the undo history. Continue?"
    IDS_MUI_READONLY_SAVE   "“%s”是只读的。是否尝试使用其它名字保存？"
    IDS_MUI_FILECHANGENOTIFY
                            "当前文件已被其它程序修改。是否重新加载？"
@ -315,8 +316,8 @@ Notepad3 [/?] [...[编码]] [...[换行符模式]] [/e] [/g] [/m] [/l]\r\n\
 /b\t打开剪贴板收集窗口（自动粘贴加入到剪贴板中的内容）。\r\n\
 /n\t总是打开新窗口（/ns 对于每个文件只允许打开一个实例）。\r\n\
 /r\t重用已存在的窗口（/rs 对于每个文件只允许打开一个实例）。\r\n\
-/p\t设置窗口位置和大小（/p0, /ps, /pf,左,上,宽,高,最大化）\r\n\
-\t或 /p <左>,<上>,<宽>,<高>[,<dpi>,<最大化>]    [均为整数］。\r\n\
+/p\t设置窗口位置和大小（/p0,/ps,/pd,f,l,t,r,b,m）\r\n\
+\t或 /p <左>,<上>,<宽>,<高>[,<dpi>,<最大化>]  [均为整数］。\r\n\
 /t\t设置窗口标题。\r\n\
 /i\t以托盘图标状态启动。\r\n\
 /o\t窗口置顶。\r\n\
--- a/language/np3_zh_tw/lexer_zh_tw.rc
+++ b/language/np3_zh_tw/lexer_zh_tw.rc
@ -496,6 +496,7 @@ BEGIN
    IDS_LEX_STR_63387       "Symbol Operator"
    IDS_LEX_STR_63388       "String EOL"
    IDS_LEX_STR_63397       "Backticks"
+    IDS_LEX_STR_63398       "GUID String"
 END

 STRINGTABLE
--- a/language/np3_zh_tw/strings_zh_tw.rc
+++ b/language/np3_zh_tw/strings_zh_tw.rc
@ -174,6 +174,7 @@ BEGIN
    IDS_MUI_REPLCOUNT       "%s 次出現的指定搜索模式已被替換。"
    IDS_MUI_ASK_ENCODING    "切換檔案編碼可能導致部分無法表示的字元被替換為其它字元，並且該操作會清空取消歷程記錄。是否繼續？"
    IDS_MUI_ASK_ENCODING2   "切換檔案編碼會清空取消歷程記錄。是否繼續？"
+    IDS_MUI_ASK_CLEAR_UNDO  "This operation will clear the undo history. Continue?"
    IDS_MUI_READONLY_SAVE   """%s"" 是唯讀。是否嘗試使用其它名字儲存？"
    IDS_MUI_FILECHANGENOTIFY
                            "目前檔案已被其它程式修改。是否重新載入？"
@ -315,8 +316,8 @@ Notepad3 [/?] [...[編碼]] [...[分行符號模式]] [/e] [/g] [/m] [/l]\r\n\
 /b\t開啟剪貼簿收集視窗（自動貼上加入到剪貼簿中的內容）。\r\n\
 /n\t總是開啟新視窗（/ns 對於每個檔案只允許開啟一個實例）。\r\n\
 /r\t重新使用已存在的視窗（/rs 對於每個檔案只允許開啟一個實例）。\r\n\
-/p\t設定視窗位置和大小（/p0, /ps, /pf,左,上,寬,高,最大化）\r\n\
-\t或 /p <左>,<上>,<寬>,<高>[,<dpi>,<最大化>]    [均為整數］。\r\n\
+/p\t設定視窗位置和大小（/p0,/ps,/pd,f,l,t,r,b,m）\r\n\
+\t或 /p <左>,<上>,<寬>,<高>[,<dpi>,<最大化>]  [均為整數］。\r\n\
 /t\t設定視窗標題。\r\n\
 /i\t以系統匣圖示狀態啟動。\r\n\
 /o\t視窗置頂。\r\n\
--- a/lexilla/Lexilla.vcxproj
+++ b/lexilla/Lexilla.vcxproj
@ -72,6 +72,7 @@
    <ClCompile Include="lexers\LexLaTeX.cxx" />
    <ClCompile Include="lexers\LexLua.cxx" />
    <ClCompile Include="lexers\LexMake.cxx" />
+    <ClCompile Include="lexers\LexMarkdown.cxx" />
    <ClCompile Include="lexers\LexMatlab.cxx" />
    <ClCompile Include="lexers\LexNim.cxx" />
    <ClCompile Include="lexers\LexNsis.cxx" />
@ -95,7 +96,6 @@
    <ClCompile Include="lexers_x\LexerUtils.cxx" />
    <ClCompile Include="lexers_x\LexJSON.cxx" />
    <ClCompile Include="lexers_x\LexKotlin.cxx" />
-    <ClCompile Include="lexers_x\LexMarkdown.cxx" />
    <ClCompile Include="lexers_x\LexPython.cxx" />
    <ClCompile Include="lexers_x\LexTOML.cxx" />
    <ClCompile Include="lexlib\Accessor.cxx" />
--- a/lexilla/Lexilla.vcxproj.filters
+++ b/lexilla/Lexilla.vcxproj.filters
@ -272,8 +272,8 @@
    <ClCompile Include="lexers\LexKix.cxx">
      <Filter>lexers</Filter>
    </ClCompile>
-    <ClCompile Include="lexers_x\LexMarkdown.cxx">
-      <Filter>lexers_x</Filter>
+    <ClCompile Include="lexers\LexMarkdown.cxx">
+      <Filter>lexers</Filter>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
--- a/lexilla/lexers/LexMarkdown.cxx
+++ b/lexilla/lexers/LexMarkdown.cxx
@ -0,0 +1,486 @@
+/******************************************************************
+ *  LexMarkdown.cxx
+ *
+ *  A simple Markdown lexer for scintilla.
+ *
+ *  Includes highlighting for some extra features from the
+ *  Pandoc implementation; strikeout, using '#.' as a default
+ *  ordered list item marker, and delimited code blocks.
+ *
+ *  Limitations:
+ *
+ *  Standard indented code blocks are not highlighted at all,
+ *  as it would conflict with other indentation schemes. Use
+ *  delimited code blocks for blanket highlighting of an
+ *  entire code block.  Embedded HTML is not highlighted either.
+ *  Blanket HTML highlighting has issues, because some Markdown
+ *  implementations allow Markdown markup inside of the HTML. Also,
+ *  there is a following blank line issue that can't be ignored,
+ *  explained in the next paragraph. Embedded HTML and code
+ *  blocks would be better supported with language specific
+ *  highlighting.
+ *
+ *  The highlighting aims to accurately reflect correct syntax,
+ *  but a few restrictions are relaxed. Delimited code blocks are
+ *  highlighted, even if the line following the code block is not blank.
+ *  Requiring a blank line after a block, breaks the highlighting
+ *  in certain cases, because of the way Scintilla ends up calling
+ *  the lexer.
+ *
+ *  Written by Jon Strait - jstrait@moonloop.net
+ *
+ *  The License.txt file describes the conditions under which this
+ *  software may be distributed.
+ *
+ *****************************************************************/
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+namespace {
+
+constexpr bool IsNewline(const int ch) {
+    // sc.GetRelative(i) returns '\0' if out of range
+    return (ch == '\n' || ch == '\r' || ch == '\0');
+}
+
+}
+
+// True if can follow ch down to the end with possibly trailing whitespace
+// Does not set the state SCE_MARKDOWN_LINE_BEGIN as to allow further processing
+static bool FollowToLineEnd(const int ch, const int state, const Sci_PositionU endPos, StyleContext &sc) {
+    Sci_Position i = 0;
+    while (sc.GetRelative(++i) == ch)
+        ;
+    // Skip over whitespace
+    while (IsASpaceOrTab(sc.GetRelative(i)) && sc.currentPos + i < endPos)
+        ++i;
+    if (IsNewline(sc.GetRelative(i)) || sc.currentPos + i == endPos) {
+        sc.SetState(state);
+        sc.Forward(i);
+        return true;
+    }
+    else return false;
+}
+
+// Set the state on text section from current to length characters,
+// then set the rest until the newline to default, except for any characters matching token
+static void SetStateAndZoom(const int state, const Sci_Position length, const int token, StyleContext &sc) {
+    sc.SetState(state);
+    sc.Forward(length);
+    sc.SetState(SCE_MARKDOWN_DEFAULT);
+    sc.Forward();
+    bool started = false;
+    while (sc.More() && !IsNewline(sc.ch)) {
+        if (sc.ch == token && !started) {
+            sc.SetState(state);
+            started = true;
+        }
+        else if (sc.ch != token) {
+            sc.SetState(SCE_MARKDOWN_DEFAULT);
+            started = false;
+        }
+        sc.Forward();
+    }
+    sc.SetState(SCE_MARKDOWN_LINE_BEGIN);
+}
+
+// Does the previous line have more than spaces and tabs?
+static bool HasPrevLineContent(StyleContext &sc) {
+    Sci_Position i = 0;
+    // Go back to the previous newline
+    while ((--i + (Sci_Position)sc.currentPos) >= 0 && !IsNewline(sc.GetRelative(i)))
+        ;
+    while ((--i + (Sci_Position)sc.currentPos) >= 0) {
+        const int ch = sc.GetRelative(i);
+        if (ch == '\n')
+            break;
+        if (!((ch == '\r' || IsASpaceOrTab(ch))))
+            return true;
+    }
+    return false;
+}
+
+static bool AtTermStart(StyleContext &sc) {
+    return sc.currentPos == 0 || sc.chPrev == 0 || isspacechar(sc.chPrev);
+}
+
+static bool IsCompleteStyleRegion(StyleContext &sc, const char *token) {
+    bool found = false;
+    const size_t start = strlen(token);
+    Sci_Position i = static_cast<Sci_Position>(start);
+    while (!IsNewline(sc.GetRelative(i))) {
+        // make sure an empty pair of single-char tokens doesn't match
+        // with a longer token: {*}{*} != {**}
+        if (sc.GetRelative(i) == *token && sc.GetRelative(i - 1) != *token) {
+            found = start > 1U ? sc.GetRelative(i + 1) == token[1] : true;
+            break;
+        }
+        i++;
+    }
+    return AtTermStart(sc) && found;
+}
+
+static bool IsValidHrule(const Sci_PositionU endPos, StyleContext &sc) {
+    int count = 1;
+    Sci_Position i = 0;
+    for (;;) {
+        ++i;
+        int c = sc.GetRelative(i);
+        if (c == sc.ch)
+            ++count;
+        // hit a terminating character
+        else if (!IsASpaceOrTab(c) || sc.currentPos + i == endPos) {
+            // Are we a valid HRULE
+            if ((IsNewline(c) || sc.currentPos + i == endPos) &&
+                    count >= 3 && !HasPrevLineContent(sc)) {
+                sc.SetState(SCE_MARKDOWN_HRULE);
+                sc.Forward(i);
+                sc.SetState(SCE_MARKDOWN_LINE_BEGIN);
+                return true;
+            }
+            else {
+                sc.SetState(SCE_MARKDOWN_DEFAULT);
+                return false;
+            }
+        }
+    }
+}
+
+static void ColorizeMarkdownDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+                                WordList **, Accessor &styler) {
+    Sci_PositionU endPos = startPos + length;
+    int precharCount = 0;
+    bool isLinkNameDetecting = false;
+    // Don't advance on a new loop iteration and retry at the same position.
+    // Useful in the corner case of having to start at the beginning file position
+    // in the default state.
+    bool freezeCursor = false;
+
+    // property lexer.markdown.header.eolfill
+    //  Set to 1 to highlight all ATX header text.
+    bool headerEOLFill = styler.GetPropertyInt("lexer.markdown.header.eolfill", 0) == 1;
+
+    StyleContext sc(startPos, static_cast<Sci_PositionU>(length), initStyle, styler);
+
+    while (sc.More()) {
+        // Skip past escaped characters
+        if (sc.ch == '\\') {
+            sc.Forward();
+            continue;
+        }
+
+        // A blockquotes resets the line semantics
+        if (sc.state == SCE_MARKDOWN_BLOCKQUOTE)
+            sc.SetState(SCE_MARKDOWN_LINE_BEGIN);
+
+        // Conditional state-based actions
+        if (sc.state == SCE_MARKDOWN_CODE2) {
+            if (sc.Match("``")) {
+                const int closingSpan = (sc.GetRelative(2) == '`') ? 3 : 2;
+                sc.Forward(closingSpan);
+                sc.SetState(SCE_MARKDOWN_DEFAULT);
+            }
+        }
+        else if (sc.state == SCE_MARKDOWN_CODE) {
+            if (sc.ch == '`' && sc.chPrev != ' ')
+                sc.ForwardSetState(SCE_MARKDOWN_DEFAULT);
+        }
+        /* De-activated because it gets in the way of other valid indentation
+         * schemes, for example multiple paragraphs inside a list item.
+        // Code block
+        else if (sc.state == SCE_MARKDOWN_CODEBK) {
+            bool d = true;
+            if (IsNewline(sc.ch)) {
+                if (sc.chNext != '\t') {
+                    for (int c = 1; c < 5; ++c) {
+                        if (sc.GetRelative(c) != ' ')
+                            d = false;
+                    }
+                }
+            }
+            else if (sc.atLineStart) {
+                if (sc.ch != '\t' ) {
+                    for (int i = 0; i < 4; ++i) {
+                        if (sc.GetRelative(i) != ' ')
+                            d = false;
+                    }
+                }
+            }
+            if (!d)
+                sc.SetState(SCE_MARKDOWN_LINE_BEGIN);
+        }
+        */
+        // Strong
+        else if (sc.state == SCE_MARKDOWN_STRONG1) {
+            if ((sc.Match("**") && sc.chPrev != ' ') || IsNewline(sc.GetRelative(2))) {
+                sc.Forward(2);
+                sc.SetState(SCE_MARKDOWN_DEFAULT);
+            }
+        }
+        else if (sc.state == SCE_MARKDOWN_STRONG2) {
+            if ((sc.Match("__") && sc.chPrev != ' ') || IsNewline(sc.GetRelative(2))) {
+                sc.Forward(2);
+                sc.SetState(SCE_MARKDOWN_DEFAULT);
+            }
+        }
+        // Emphasis
+        else if (sc.state == SCE_MARKDOWN_EM1) {
+            if ((sc.ch == '*' && sc.chPrev != ' ') || IsNewline(sc.chNext))
+                sc.ForwardSetState(SCE_MARKDOWN_DEFAULT);
+        }
+        else if (sc.state == SCE_MARKDOWN_EM2) {
+            if ((sc.ch == '_' && sc.chPrev != ' ') || IsNewline(sc.chNext))
+                sc.ForwardSetState(SCE_MARKDOWN_DEFAULT);
+        }
+        else if (sc.state == SCE_MARKDOWN_CODEBK) {
+            if (sc.atLineStart && sc.Match("~~~")) {
+                Sci_Position i = 1;
+                while (!IsNewline(sc.GetRelative(i)) && sc.currentPos + i < endPos)
+                    i++;
+                sc.Forward(i);
+                sc.SetState(SCE_MARKDOWN_DEFAULT);
+            }
+        }
+        else if (sc.state == SCE_MARKDOWN_STRIKEOUT) {
+            if ((sc.Match("~~") && sc.chPrev != ' ') || IsNewline(sc.GetRelative(2))) {
+                sc.Forward(2);
+                sc.SetState(SCE_MARKDOWN_DEFAULT);
+            }
+        }
+        else if (sc.state == SCE_MARKDOWN_LINE_BEGIN) {
+            // Header
+            if (sc.Match("######")) {
+                if (headerEOLFill)
+                    sc.SetState(SCE_MARKDOWN_HEADER6);
+                else
+                    SetStateAndZoom(SCE_MARKDOWN_HEADER6, 6, '#', sc);
+            }
+            else if (sc.Match("#####")) {
+                if (headerEOLFill)
+                    sc.SetState(SCE_MARKDOWN_HEADER5);
+                else
+                    SetStateAndZoom(SCE_MARKDOWN_HEADER5, 5, '#', sc);
+            }
+            else if (sc.Match("####")) {
+                if (headerEOLFill)
+                    sc.SetState(SCE_MARKDOWN_HEADER4);
+                else
+                    SetStateAndZoom(SCE_MARKDOWN_HEADER4, 4, '#', sc);
+            }
+            else if (sc.Match("###")) {
+                if (headerEOLFill)
+                    sc.SetState(SCE_MARKDOWN_HEADER3);
+                else
+                    SetStateAndZoom(SCE_MARKDOWN_HEADER3, 3, '#', sc);
+            }
+            else if (sc.Match("##")) {
+                if (headerEOLFill)
+                    sc.SetState(SCE_MARKDOWN_HEADER2);
+                else
+                    SetStateAndZoom(SCE_MARKDOWN_HEADER2, 2, '#', sc);
+            }
+            else if (sc.Match("#")) {
+                // Catch the special case of an unordered list
+                if (sc.chNext == '.' && IsASpaceOrTab(sc.GetRelative(2))) {
+                    precharCount = 0;
+                    sc.SetState(SCE_MARKDOWN_PRECHAR);
+                }
+                else if (headerEOLFill) {
+                    sc.SetState(SCE_MARKDOWN_HEADER1);
+                }
+                else
+                    SetStateAndZoom(SCE_MARKDOWN_HEADER1, 1, '#', sc);
+            }
+            // Code block
+            else if (sc.Match("~~~")) {
+                if (!HasPrevLineContent(sc))
+                    sc.SetState(SCE_MARKDOWN_CODEBK);
+                else
+                    sc.SetState(SCE_MARKDOWN_DEFAULT);
+            }
+            else if (sc.ch == '=') {
+                if (HasPrevLineContent(sc) && FollowToLineEnd('=', SCE_MARKDOWN_HEADER1, endPos, sc)) {
+                    if (!headerEOLFill)
+                        sc.SetState(SCE_MARKDOWN_LINE_BEGIN);
+                }
+                else
+                    sc.SetState(SCE_MARKDOWN_DEFAULT);
+            }
+            else if (sc.ch == '-') {
+                if (HasPrevLineContent(sc) && FollowToLineEnd('-', SCE_MARKDOWN_HEADER2, endPos, sc)) {
+                    if (!headerEOLFill)
+                        sc.SetState(SCE_MARKDOWN_LINE_BEGIN);
+                }
+                else {
+                    precharCount = 0;
+                    sc.SetState(SCE_MARKDOWN_PRECHAR);
+                }
+            }
+            else if (IsNewline(sc.ch))
+                sc.SetState(SCE_MARKDOWN_LINE_BEGIN);
+            else {
+                precharCount = 0;
+                sc.SetState(SCE_MARKDOWN_PRECHAR);
+            }
+        }
+
+        // The header lasts until the newline
+        else if (sc.state == SCE_MARKDOWN_HEADER1 || sc.state == SCE_MARKDOWN_HEADER2 ||
+                 sc.state == SCE_MARKDOWN_HEADER3 || sc.state == SCE_MARKDOWN_HEADER4 ||
+                 sc.state == SCE_MARKDOWN_HEADER5 || sc.state == SCE_MARKDOWN_HEADER6) {
+            if (headerEOLFill) {
+                if (sc.atLineStart) {
+                    sc.SetState(SCE_MARKDOWN_LINE_BEGIN);
+                    freezeCursor = true;
+                }
+            }
+            else if (IsNewline(sc.ch))
+                sc.SetState(SCE_MARKDOWN_LINE_BEGIN);
+        }
+
+        // New state only within the initial whitespace
+        if (sc.state == SCE_MARKDOWN_PRECHAR) {
+            // Blockquote
+            if (sc.ch == '>' && precharCount < 5)
+                sc.SetState(SCE_MARKDOWN_BLOCKQUOTE);
+            /*
+            // Begin of code block
+            else if (!HasPrevLineContent(sc) && (sc.chPrev == '\t' || precharCount >= 4))
+                sc.SetState(SCE_MARKDOWN_CODEBK);
+            */
+            // HRule - Total of three or more hyphens, asterisks, or underscores
+            // on a line by themselves
+            else if ((sc.ch == '-' || sc.ch == '*' || sc.ch == '_') && IsValidHrule(endPos, sc))
+                ;
+            // Unordered list
+            else if ((sc.ch == '-' || sc.ch == '*' || sc.ch == '+') && IsASpaceOrTab(sc.chNext)) {
+                sc.SetState(SCE_MARKDOWN_ULIST_ITEM);
+                sc.ForwardSetState(SCE_MARKDOWN_DEFAULT);
+            }
+            // Ordered list
+            else if (IsADigit(sc.ch)) {
+                int digitCount = 0;
+                while (IsADigit(sc.GetRelative(++digitCount)))
+                    ;
+                if (sc.GetRelative(digitCount) == '.' &&
+                        IsASpaceOrTab(sc.GetRelative(digitCount + 1))) {
+                    sc.SetState(SCE_MARKDOWN_OLIST_ITEM);
+                    sc.Forward(digitCount + 1);
+                    sc.SetState(SCE_MARKDOWN_DEFAULT);
+                } else {
+                    // a textual number at the margin should be plain text
+                    sc.SetState(SCE_MARKDOWN_DEFAULT);
+                }
+            }
+            // Alternate Ordered list
+            else if (sc.ch == '#' && sc.chNext == '.' && IsASpaceOrTab(sc.GetRelative(2))) {
+                sc.SetState(SCE_MARKDOWN_OLIST_ITEM);
+                sc.Forward(2);
+                sc.SetState(SCE_MARKDOWN_DEFAULT);
+            }
+            else if (sc.ch != ' ' || precharCount > 2)
+                sc.SetState(SCE_MARKDOWN_DEFAULT);
+            else
+                ++precharCount;
+        }
+
+        // Any link
+        if (sc.state == SCE_MARKDOWN_LINK) {
+            if (sc.Match("](") && sc.GetRelative(-1) != '\\') {
+                sc.Forward(2);
+                isLinkNameDetecting = true;
+            }
+            else if (sc.Match("]:") && sc.GetRelative(-1) != '\\') {
+                sc.Forward(2);
+                sc.SetState(SCE_MARKDOWN_DEFAULT);
+            }
+            else if (!isLinkNameDetecting && sc.ch == ']' && sc.GetRelative(-1) != '\\') {
+                sc.Forward();
+                sc.SetState(SCE_MARKDOWN_DEFAULT);
+            }
+            else if (isLinkNameDetecting && sc.ch == ')' && sc.GetRelative(-1) != '\\') {
+                sc.Forward();
+                sc.SetState(SCE_MARKDOWN_DEFAULT);
+                isLinkNameDetecting = false;
+            }
+        }
+
+        // New state anywhere in doc
+        if (sc.state == SCE_MARKDOWN_DEFAULT) {
+            if (sc.atLineStart && sc.ch == '#') {
+                sc.SetState(SCE_MARKDOWN_LINE_BEGIN);
+                freezeCursor = true;
+            }
+            // Links and Images
+            if (sc.Match("![")) {
+                sc.SetState(SCE_MARKDOWN_LINK);
+                sc.Forward(1);
+            }
+            else if (sc.ch == '[' && sc.GetRelative(-1) != '\\') {
+                sc.SetState(SCE_MARKDOWN_LINK);
+            }
+            // Code - also a special case for alternate inside spacing
+            else if (sc.Match("``") && sc.GetRelative(3) != ' ' && AtTermStart(sc)) {
+                const int openingSpan = (sc.GetRelative(2) == '`') ? 2 : 1;
+                sc.SetState(SCE_MARKDOWN_CODE2);
+                sc.Forward(openingSpan);
+            }
+            else if (sc.ch == '`' && sc.chNext != ' ' && IsCompleteStyleRegion(sc, "`")) {
+                sc.SetState(SCE_MARKDOWN_CODE);
+            }
+            // Strong
+            else if (sc.Match("**") && sc.GetRelative(2) != ' ' && IsCompleteStyleRegion(sc, "**")) {
+                sc.SetState(SCE_MARKDOWN_STRONG1);
+                sc.Forward();
+            }
+            else if (sc.Match("__") && sc.GetRelative(2) != ' ' && IsCompleteStyleRegion(sc, "__")) {
+                sc.SetState(SCE_MARKDOWN_STRONG2);
+                sc.Forward();
+            }
+            // Emphasis
+            else if (sc.ch == '*' && sc.chNext != ' ' && IsCompleteStyleRegion(sc, "*")) {
+                sc.SetState(SCE_MARKDOWN_EM1);
+            }
+            else if (sc.ch == '_' && sc.chNext != ' ' && IsCompleteStyleRegion(sc, "_")) {
+                sc.SetState(SCE_MARKDOWN_EM2);
+            }
+            // Strikeout
+            else if (sc.Match("~~") && !(sc.GetRelative(2) == '~' || sc.GetRelative(2) == ' ') &&
+                     IsCompleteStyleRegion(sc, "~~")) {
+                sc.SetState(SCE_MARKDOWN_STRIKEOUT);
+                sc.Forward();
+            }
+            // Beginning of line
+            else if (IsNewline(sc.ch)) {
+                sc.SetState(SCE_MARKDOWN_LINE_BEGIN);
+            }
+        }
+        // Advance if not holding back the cursor for this iteration.
+        if (!freezeCursor)
+            sc.Forward();
+        freezeCursor = false;
+    }
+    sc.Complete();
+}
+
+LexerModule lmMarkdown(SCLEX_MARKDOWN, ColorizeMarkdownDoc, "markdown");
--- a/lexilla/lexers_x/homebrew/LexMarkdown.cxx
+++ b/lexilla/lexers_x/homebrew/LexMarkdown.cxx
@ -277,7 +277,7 @@ static void ColorizeMarkdownDoc(Sci_PositionU startPos, Sci_Position length, int
                freezeCursor = true;
            }
            else if (sc.Match("####")) {
-                SetStateAndZoom(SCE_MARKDOWN_HEADER4, 4, '#', sc);           
+                SetStateAndZoom(SCE_MARKDOWN_HEADER4, 4, '#', sc);
                freezeCursor = true;
            }
            else if (sc.Match("###")) {
--- a/lexilla/src/deps.mak
+++ b/lexilla/src/deps.mak
@ -364,6 +364,18 @@ $(DIR_O)/LexMake.o: \
 	../lexlib/StyleContext.h \
 	../lexlib/CharacterSet.h \
 	../lexlib/LexerModule.h
+$(DIR_O)/LexMarkdown.o: \
+	../lexers/LexMarkdown.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
 $(DIR_O)/LexMatlab.o: \
 	../lexers/LexMatlab.cxx \
 	../../scintilla/include/ILexer.h \
@ -681,19 +693,6 @@ $(DIR_O)/LexKotlin.o: \
 	../include/SciLexer.h \
 	../lexers_x/StringUtils.h \
 	../lexers_x/LexerUtils.h
-$(DIR_O)/LexMarkdown.o: \
-	../lexers_x/LexMarkdown.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
-	../include/SciLexer.h \
-	../lexlib/WordList.h \
-	../lexlib/LexAccessor.h \
-	../lexlib/Accessor.h \
-	../lexlib/StyleContext.h \
-	../lexers_x/CharSetX.h \
-	../lexlib/CharacterSet.h \
-	../lexlib/LexerModule.h
 $(DIR_O)/LexPython.o: \
 	../lexers_x/LexPython.cxx \
 	../../scintilla/include/ILexer.h \
--- a/lexilla/src/lexilla.mak
+++ b/lexilla/src/lexilla.mak
@ -94,6 +94,7 @@ LEX_OBJS=\
 	$(DIR_O)\LexLaTeX.obj \
 	$(DIR_O)\LexLua.obj \
 	$(DIR_O)\LexMake.obj \
+	$(DIR_O)\LexMarkdown.obj \
 	$(DIR_O)\LexMatlab.obj \
 	$(DIR_O)\LexNim.obj \
 	$(DIR_O)\LexNsis.obj \
@ -117,7 +118,6 @@ LEX_OBJS=\
 	$(DIR_O)\LexerUtils.obj \
 	$(DIR_O)\LexJSON.obj \
 	$(DIR_O)\LexKotlin.obj \
-	$(DIR_O)\LexMarkdown.obj \
 	$(DIR_O)\LexPython.obj \
 	$(DIR_O)\LexTOML.obj \

--- a/lexilla/src/nmdeps.mak
+++ b/lexilla/src/nmdeps.mak
@ -364,6 +364,18 @@ $(DIR_O)/LexMake.obj: \
 	../lexlib/StyleContext.h \
 	../lexlib/CharacterSet.h \
 	../lexlib/LexerModule.h
+$(DIR_O)/LexMarkdown.obj: \
+	../lexers/LexMarkdown.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
 $(DIR_O)/LexMatlab.obj: \
 	../lexers/LexMatlab.cxx \
 	../../scintilla/include/ILexer.h \
@ -681,19 +693,6 @@ $(DIR_O)/LexKotlin.obj: \
 	../include/SciLexer.h \
 	../lexers_x/StringUtils.h \
 	../lexers_x/LexerUtils.h
-$(DIR_O)/LexMarkdown.obj: \
-	../lexers_x/LexMarkdown.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
-	../include/SciLexer.h \
-	../lexlib/WordList.h \
-	../lexlib/LexAccessor.h \
-	../lexlib/Accessor.h \
-	../lexlib/StyleContext.h \
-	../lexers_x/CharSetX.h \
-	../lexlib/CharacterSet.h \
-	../lexlib/LexerModule.h
 $(DIR_O)/LexPython.obj: \
 	../lexers_x/LexPython.cxx \
 	../../scintilla/include/ILexer.h \
--- a/minipath/License.txt
+++ b/minipath/License.txt
@ -2,7 +2,7 @@
 =                                                                              =
 =            Notepad3 - light-weight Scintilla-based text editor for Windows   =
 =                                                                              =
-=                                                   (c) Rizonesoft 2008-2022   =
+=                                                   (c) Rizonesoft 2008-2023   =
 =                                                 https://www.rizonesoft.com   =
 =                                                                              =
 ================================================================================
@ -12,7 +12,7 @@ Rizonesoft Notepad3 --- Licenses ---
 --------------------------------------------------
 License for Notepad3 and MiniPath
 --------------------------------------------------
-Copyright © 2008-2022 Rizonesoft,
+Copyright © 2008-2023 Rizonesoft,
 All rights reserved.

 metapath Copyright © 2004-2011 Florian Balmer
--- a/minipath/src/Config.cpp
+++ b/minipath/src/Config.cpp
@ -7,7 +7,7 @@
 * Config.cpp                                                                  *
 *   Methods to read and write configuration                                   *
 *                                                                             *
-*                                                  (c) Rizonesoft 2008-2022   *
+*                                                  (c) Rizonesoft 2008-2023   *
 *                                                    https://rizonesoft.com   *
 *                                                                             *
 *                                                                             *
--- a/minipath/src/Config.h
+++ b/minipath/src/Config.h
@ -7,7 +7,7 @@
 * Config.h                                                                    *
 *   Methods to read and write configuration                                   *
 *                                                                             *
-*                                                  (c) Rizonesoft 2008-2022   *
+*                                                  (c) Rizonesoft 2008-2023   *
 *                                                    https://rizonesoft.com   *
 *                                                                             *
 *                                                                             *
--- a/minipath/src/Dialogs.c
+++ b/minipath/src/Dialogs.c
@ -8,7 +8,7 @@
 *   dialog boxes implementation                                               *
 *   Based on code from metapath, (c) Florian Balmer 1996-2011                 *
 *                                                                             *
-*                                                  (c) Rizonesoft 2008-2022   *
+*                                                  (c) Rizonesoft 2008-2023   *
 *                                                    https://rizonesoft.com   *
 *                                                                             *
 *                                                                             *
--- a/minipath/src/Dialogs.h
+++ b/minipath/src/Dialogs.h
@ -8,7 +8,7 @@
 *   Definitions for metapath dialog boxes                                     *
 *   Based on code from metapath, (c) Florian Balmer 1996-2011                 *
 *                                                                             *
-*                                                  (c) Rizonesoft 2008-2022   *
+*                                                  (c) Rizonesoft 2008-2023   *
 *                                                    https://rizonesoft.com   *
 *                                                                             *
 *                                                                             *
--- a/minipath/src/Dlapi.c
+++ b/minipath/src/Dlapi.c
@ -8,7 +8,7 @@
 *   Directory Listing APIs used in metapath                                   *
 *   Based on code from metapath, (c) Florian Balmer 1996-2011                 *
 *                                                                             *
-*                                                  (c) Rizonesoft 2008-2022   *
+*                                                  (c) Rizonesoft 2008-2023   *
 *                                                    https://rizonesoft.com   *
 *                                                                             *
 *                                                                             *
--- a/minipath/src/Dlapi.h
+++ b/minipath/src/Dlapi.h
@ -8,7 +8,7 @@
 *   Definitions for Directory Listing APIs                                    *
 *   Based on code from metapath, (c) Florian Balmer 1996-2011                 *
 *                                                                             *
-*                                                  (c) Rizonesoft 2008-2022   *
+*                                                  (c) Rizonesoft 2008-2023   *
 *                                                    https://rizonesoft.com   *
 *                                                                             *
 *                                                                             *
--- a/minipath/src/DropSource.cpp
+++ b/minipath/src/DropSource.cpp
@ -8,7 +8,7 @@
 *   OLE drop source functionality                                             *
 *   Based on code from metapath, (c) Florian Balmer 1996-2011                 *
 *                                                                             *
-*                                                  (c) Rizonesoft 2008-2022   *
+*                                                  (c) Rizonesoft 2008-2023   *
 *                                                    https://rizonesoft.com   *
 *                                                                             *
 *                                                                             *
--- a/minipath/src/DropSource.h
+++ b/minipath/src/DropSource.h
@ -8,7 +8,7 @@
 *   OLE drop source functionality                                             *
 *   Based on code from metapath, (c) Florian Balmer 1996-2011                 *
 *                                                                             *
-*                                                  (c) Rizonesoft 2008-2022   *
+*                                                  (c) Rizonesoft 2008-2023   *
 *                                                    https://rizonesoft.com   *
 *                                                                             *
 *                                                                             *
--- a/minipath/src/Helpers.c
+++ b/minipath/src/Helpers.c
@ -8,7 +8,7 @@
 *   General helper functions                                                  *
 *   Based on code from metapath, (c) Florian Balmer 1996-2011                 *
 *                                                                             *
-*                                                  (c) Rizonesoft 2008-2022   *
+*                                                  (c) Rizonesoft 2008-2023   *
 *                                                    https://rizonesoft.com   *
 *                                                                             *
 *                                                                             *
--- a/minipath/src/Helpers.h
+++ b/minipath/src/Helpers.h
@ -8,7 +8,7 @@
 *   Definitions for general helper functions and macros                       *
 *   Based on code from metapath, (c) Florian Balmer 1996-2011                 *
 *                                                                             *
-*                                                  (c) Rizonesoft 2008-2022   *
+*                                                  (c) Rizonesoft 2008-2023   *
 *                                                    https://rizonesoft.com   *
 *                                                                             *
 *                                                                             *
--- a/minipath/src/minipath.c
+++ b/minipath/src/minipath.c
@ -8,7 +8,7 @@
 *   Main application window functionality                                     *
 *   Based on code from metapath, (c) Florian Balmer 1996-2011                 *
 *                                                                             *
-*                                                  (c) Rizonesoft 2008-2022   *
+*                                                  (c) Rizonesoft 2008-2023   *
 *                                                    https://rizonesoft.com   *
 *                                                                             *
 *                                                                             *
--- a/minipath/src/minipath.h
+++ b/minipath/src/minipath.h
@ -8,7 +8,7 @@
 *   Global definitions and declarations                                       *
 *   Based on code from metapath, (c) Florian Balmer 1996-2011                 *
 *                                                                             *
-*                                                  (c) Rizonesoft 2008-2022   *
+*                                                  (c) Rizonesoft 2008-2023   *
 *                                                    https://rizonesoft.com   *
 *                                                                             *
 *                                                                             *
--- a/minipath/src/minipath.ver
+++ b/minipath/src/minipath.ver
@ -7,7 +7,7 @@
 *   MiniPath version information                                              *
 *   Based on code from metapath, (c) Florian Balmer 1996-2011                 *
 *                                                                             *
-*                                                  (c) Rizonesoft 2008-2022   *
+*                                                  (c) Rizonesoft 2008-2023   *
 *                                                    https://rizonesoft.com   *
 *                                                                             *
 *******************************************************************************/
--- a/Show More
+++ b/Show More