Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_ONIGURUMA

# Conflicts:
#	Versions/build.txt
#	res/Notepad3.exe.manifest.conf
#	src/VersionEx.h

Build/make_zip.bat

@@ -89,8 +89,11 @@ FOR %%A IN ("Changes.txt" "License.txt" "Readme.txt" "Notepad3.ini" "minipath.in
 	"..\%1\Notepad3.exe" "..\%1\minipath.exe") DO COPY /Y /V "%%A" "%TEMP_NAME%\"
 
 SET "LNG=%TEMP_NAME%\lng"
+SET "THEMES=%TEMP_NAME%\themes"
 IF NOT EXIST %LNG% MD %LNG%
+IF NOT EXIST %THEMES% MD %THEMES%
 XCOPY /E /Y /V "..\%1\lng" "%LNG%" /EXCLUDE:Ignore.txt
+XCOPY /E /Y /V "themes" "%THEMES%"
 
 SET "FAVORITES=%TEMP_NAME%\Favorites"
 IF NOT EXIST "%FAVORITES%" MD "%FAVORITES%"
@@ -98,7 +101,7 @@ IF NOT EXIST "%FAVORITES%" MD "%FAVORITES%"
 PUSHD "%TEMP_NAME%"
 "%SEVENZIP%" a -tzip -mx=9^
  "%ZIP_NAME%.zip" "License.txt" "Notepad3.exe" "Notepad3.ini" "Changes.txt"^
- "Readme.txt" "Favorites" "minipath.exe" "minipath.ini" "lng">NUL
+ "Readme.txt" "Favorites" "minipath.exe" "minipath.ini" "lng" "themes">NUL
 IF %ERRORLEVEL% NEQ 0 CALL :SUBMSG "ERROR" "Compilation failed!"
 
 CALL :SUBMSG "INFO" "%ZIP_NAME%.zip created successfully!"

Versions/build.txt

@@ -1 +1 @@
-2231
+2235

language/np3_af_za/dialogs_af_za.rc

@@ -187,7 +187,7 @@ BEGIN
     GROUPBOX        "Kodering Deteksie: ",IDC_STATIC,7,58,183,88,0,WS_EX_TRANSPARENT
     CONTROL         "Maak 7-bit &ASCII-lêers in UTF-8 wyse oop.",IDC_ASCIIASUTF8,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,70,155,10
-    CONTROL         "Use &reliable detection results only.", IDC_RELIABLE_DETECTION_RES,
+    CONTROL         "Gebruik &betroubare opsporing resultate alleenlik.", IDC_RELIABLE_DETECTION_RES,
                     "Button", BS_AUTOCHECKBOX | WS_TABSTOP,14,82,155,10
     CONTROL         "Maak 8-bit *.&nfo/diz lêers in DOS-437 wyse oop.",IDC_NFOASOEM,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,94,155,10
@@ -207,7 +207,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     LTEXT           "&Standaard lyn eindig wyse:",IDC_STATIC,7,7,116,8
     COMBOBOX        IDC_EOLMODELIST,7,20,118,81,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Show inconsistent line-breaks warning.",IDC_WARN_INCONSISTENT_EOLS,
+    CONTROL         "Wys inkonsekwente lynbreukwaarskuwing.",IDC_WARN_INCONSISTENT_EOLS,
                     "Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,7,40,186,10
     CONTROL         "&Verseker konstante lyn eindes wanneer jy stoor.", IDC_CONSISTENT_EOLS,
                     "Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,7,52,182,10
@@ -219,7 +219,7 @@ END
 
 IDD_MUI_WARNLINEENDS DIALOGEX 0, 0, 196, 100
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Inconsistent Line Endings"
+CAPTION "Inkonsekwente Lyn Eindes"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     LTEXT           "Strydige lyn eindes gevind in die lêer:",IDC_STATIC,7,7,180,8
@@ -345,7 +345,7 @@ END
 
 IDD_MUI_WARNINDENTATION DIALOGEX 0, 0, 196, 138
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Inconsistent Indentation"
+CAPTION "Inkonsekwente Indentasie"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     GROUPBOX        "Statistieke: ",IDC_STATIC,7,7,182,48,WS_GROUP

language/np3_af_za/menu_af_za.rc

@@ -316,9 +316,9 @@ BEGIN
         MENUITEM "&Visuele Hakie Passing\tCtrl+Shift+V",    IDM_VIEW_MATCHBRACES
         POPUP "Merk Huidi&ge Lyn\tCtrl+Shift+I"
         BEGIN
-            MENUITEM "&No Highlight",                       IDM_VIEW_HILITCURLN_NONE
-            MENUITEM "Background &Color",                   IDM_VIEW_HILITCURLN_BACK
-            MENUITEM "Outline &Frame",                      IDM_VIEW_HILITCURLN_FRAME
+            MENUITEM "&Geen Uitliggende",                   IDM_VIEW_HILITCURLN_NONE
+            MENUITEM "&Agtergrondkleur",                    IDM_VIEW_HILITCURLN_BACK
+            MENUITEM "Buitelyn &Raamwerk",                  IDM_VIEW_HILITCURLN_FRAME
         END
         POPUP "Mer&k Voorvalle"
         BEGIN
@@ -343,9 +343,9 @@ BEGIN
             MENUITEM "Kode &Vou\tCtrl+Shift+Alt+F",         IDM_VIEW_FOLDING
             MENUITEM "&Wissel Voue\tCtrl+Shift+F",          IDM_VIEW_TOGGLEFOLDS
             MENUITEM "Gefokusde &Aansig\tCtrl+Alt+V",       IDM_VIEW_TOGGLE_VIEW
-            MENUITEM "&Moniteringslogboek",                 IDM_VIEW_CHASING_DOCTAIL
+            MENUITEM "&Monitoring Log",                     IDM_VIEW_CHASING_DOCTAIL
             MENUITEM "Rol na Einde Van Die &Lêer",          IDM_VIEW_SCROLLPASTEOF
-            MENUITEM "Show &Hyperlink Tooltip",             IDM_VIEW_SHOW_HYPLNK_CALLTIP
+            MENUITEM "Wys &Hiperskakel Nutsmiddelwenk",     IDM_VIEW_SHOW_HYPLNK_CALLTIP
         END
         POPUP "Nu&tsbalk"
         BEGIN

language/np3_af_za/strings_af_za.rc

@@ -58,7 +58,7 @@ BEGIN
     IDT_FILE_OPEN           "Oop"
     IDT_FILE_BROWSE         "Snuffel"
     IDT_FILE_SAVE           "Stoor"
-    IDT_FILE_RECENT         "History"
+    IDT_FILE_RECENT         "Geskiedenis"
     IDT_EDIT_UNDO           "Maak Ongedaan"
     IDT_EDIT_REDO           "Doen Oor"
     IDT_EDIT_CUT            "Sny"
@@ -132,9 +132,9 @@ BEGIN
                             "Bestaande Notepad3-venster is besig of het 'n aktiewe dialoog.\nWil jy 'n ander Notepad3-venster oopmaak?"
     IDS_MUI_ERR_ENCODINGNA  "Kodeblad-omskakelingstabelle vir die geselekteerde enkodering is nie op u stelsel beskikbaar nie."
     IDS_MUI_ERR_UNICODE     "Kon nie hierdie Unicode-lêer omskakel nie. \nData sal verlore wees as die lêer gestoor word!"
-    IDS_MUI_ERR_BITMAP      "Error loading bitmap ""%s"".\nNeed dimensions: %i x %i (width >= %i x height)."
+    IDS_MUI_ERR_BITMAP      "Kon nie bitmap ""%s"" laai nie.\nBenodig afmetings: %i x %i (width >= %i x height)."
     IDS_MUI_ERR_ELEVATED_RIGHTS
-                            "Error while elevating user rights!"
+                            "Fout tydens die verhoging van gebruikersregte!"
 END
 
 STRINGTABLE
@@ -148,7 +148,7 @@ BEGIN
                             "Is jy seker jy wil hierdie groot lêer oopmaak?"
     IDS_MUI_WARN_UNKNOWN_EXT
                             "Onbekende lêernaam uitbreiding (%s)!\nLaai data in elk geval?"
-    IDS_MUI_INDENT_CONSISTENT  "The file has a consistent indentation!"
+    IDS_MUI_INDENT_CONSISTENT  "Die lêer het 'n konsekwente indentasie!"
     IDS_MUI_EOLMODENAME_CRLF   "Windows (CR+LF)"
     IDS_MUI_EOLMODENAME_LF     "Unix/Mac (LF)"
     IDS_MUI_EOLMODENAME_CR     "Old Mac (CR)"
@@ -181,8 +181,8 @@ BEGIN
     IDS_MUI_EXPORT_FAIL      "Kon nie stylinstellings uitvoer na ""%s""."
     IDS_MUI_REGEX_INVALID    "Kon nie regular expression evalueer nie. Expression is ongeldig!"
     IDS_MUI_DROP_NO_FILE     "Geen geldige lêernaam opgehaal.\nAs jy van 32-bit toepassing af sak, sleep na Notepad3 se nutsbalk."
-    IDS_MUI_URL_OPEN_FILE    "\nAlt + Click to open the file."
-    IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Click to open link in browser."
+    IDS_MUI_URL_OPEN_FILE    "\nAlt + Klik om die lêer oop te maak."
+    IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Klik om skakel in leser oop te maak."
 END
 
 STRINGTABLE
@@ -226,9 +226,9 @@ BEGIN
     IDS_MUI_TITLE_FIXARB    " Styl '%s' (%s)"
     IDS_MUI_ASSOCIATED_EXT  "Geassosieerde lêernaam uitbreidings:"
     IDS_MUI_EXAMPLE_TEXT    "The quick brown fox jumps over the lazy dog, 0123456789."
-    IDS_MUI_ZERO_LEN_MATCH  "^ Zero-Length Match"
-    IDS_MUI_GOTO_LINE       "Line (1 - %ti):"
-    IDS_MUI_GOTO_COLUMN     "Column (1 - %ti):"
+    IDS_MUI_ZERO_LEN_MATCH  "^ Zero-Lengte Pas"
+    IDS_MUI_GOTO_LINE       "Lyn (1 - %ti):"
+    IDS_MUI_GOTO_COLUMN     "Kolom (1 - %ti):"
 END
 
 STRINGTABLE
@@ -274,7 +274,7 @@ Opsies:\r\n\
 /u\tBegin met verhoogde voorregte.\r\n\
 /v\tDruk lêer dadelik en stop.\r\n\
 /vd\tDruk lêer (maak drukker dialoog oop).\r\n\
-/y\tSearch environment PATH in case of relative filename.\r\n\
+/y\tSoek omgewing PATH in geval van relatiewe lêernaam.\r\n\
 /z\tSlaan oor na (bruikbaar vir registry-basis Notepad-vervanging).\r\n\r\n\
 Voorbeelde:\r\n\
 Notepad3 /utf8sig /crlf d:\\temp\\Test.txt\r\n\
@@ -285,9 +285,9 @@ Notepad3 /v d:\\temp\\Test.txt\r\n\
 
 IDS_MUI_STYLEEDIT_HELP "\
 Lêernaam uitbreidings moet geskei word deur ;\r\n\
-with a backslash (\\), RegEx defines an end-of-filename patterns:\r\n\
-   \\xyz$;   => filenames(basename+ext) with 'xyz' as last chars\r\n\r\n\
-Style format:\r\n\
+met 'n terugslag (\\), RegEx definieer 'n einde-van-lêernaam patrone:\r\n\
+   \\xyz$;   => lêername(basisnaam+ext) met 'xyz' vir laaste karakters\r\n\r\n\
+Stylformaat:\r\n\
 font:Name; size:[+/-]nn.mm; bold; italic; underline;\r\n\
 fore:#ffffff; back:#bbbbbb; eolfilled; indic_gradient\r\n\r\n\
 Styl eienskappe kan gekopieer word deur kopieer en plak of sleep en drop.\

np3portableapp/_buildname.txt

@@ -1 +1 @@
-"Oniguruma"
+"ONIGURUMA"

res/Notepad3.exe.manifest.conf

@@ -3,8 +3,8 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.19.529.2231"
+    version="5.19.529.2235"
     type="win32"
   />
-  <description>Notepad3 Oniguruma</description>
+  <description>Notepad3 ONIGURUMA</description>
 </assembly>

src/VersionEx.h

@@ -8,7 +8,7 @@
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 19
 #define VERSION_REV 529
-#define VERSION_BUILD 2231
+#define VERSION_BUILD 2235
 #define SCINTILLA_VER 415+
 #define ONIGURUMA_REGEX_VER 6.9.2
-#define VERSION_PATCH Oniguruma
+#define VERSION_PATCH ONIGURUMA