Merge remote-tracking branch 'Notepad3_upstream_Rizone/master' into Dev_Fixes4Release

2026-06-11 21:03:05 +08:00 · 2018-11-13 08:27:48 +01:00 · 2018-11-13 08:27:48 +01:00 · faff0e0f3a
commit faff0e0f3a
parent 94fc854e2d e9296f227a
18 changed files with 2 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -49,7 +49,7 @@ Thumbs.db
 /src/VersionEx.h
 /minipath/src/VersionEx.h

-#/Version_*.cmd
+/Version_*.cmd
 /Versions/build.txt
 /np3portableapp/_buildname.txt

--- a/language/np3_af_za/dialogs_af_za.rc
+++ b/language/np3_af_za/dialogs_af_za.rc
--- a/language/np3_be_by/dialogs_be_by.rc
+++ b/language/np3_be_by/dialogs_be_by.rc
--- a/language/np3_be_by/strings_be_by.rc
+++ b/language/np3_be_by/strings_be_by.rc
--- a/language/np3_de_de/dialogs_de_de.rc
+++ b/language/np3_de_de/dialogs_de_de.rc
--- a/language/np3_en_gb/dialogs_en_gb.rc
+++ b/language/np3_en_gb/dialogs_en_gb.rc
--- a/language/np3_en_us/dialogs_en_us.rc
+++ b/language/np3_en_us/dialogs_en_us.rc
--- a/language/np3_es_es/dialogs_es_es.rc
+++ b/language/np3_es_es/dialogs_es_es.rc
--- a/language/np3_fr_fr/dialogs_fr_fr.rc
+++ b/language/np3_fr_fr/dialogs_fr_fr.rc
--- a/language/np3_fr_fr/strings_fr_fr.rc
+++ b/language/np3_fr_fr/strings_fr_fr.rc
--- a/language/np3_ja_jp/dialogs_ja_jp.rc
+++ b/language/np3_ja_jp/dialogs_ja_jp.rc
--- a/language/np3_ja_jp/strings_ja_jp.rc
+++ b/language/np3_ja_jp/strings_ja_jp.rc
--- a/language/np3_nl_nl/dialogs_nl_nl.rc
+++ b/language/np3_nl_nl/dialogs_nl_nl.rc
--- a/language/np3_ru_ru/dialogs_ru_ru.rc
+++ b/language/np3_ru_ru/dialogs_ru_ru.rc
--- a/language/np3_ru_ru/strings_ru_ru.rc
+++ b/language/np3_ru_ru/strings_ru_ru.rc
--- a/language/np3_zh_cn/dialogs_zh_cn.rc
+++ b/language/np3_zh_cn/dialogs_zh_cn.rc
--- a/language/np3_zh_cn/strings_zh_cn.rc
+++ b/language/np3_zh_cn/strings_zh_cn.rc
--- a/np3portableapp/Notepad3Portable/App/AppInfo/installer.ini
+++ b/np3portableapp/Notepad3Portable/App/AppInfo/installer.ini
@ -19,6 +19,7 @@ GERMAN=true
 JAPANESE=true
 RUSSIAN=true
 SIMPCHINESE=true
+SPANISH=true
 [DirectoriesToPreserve]
 [DirectoriesToRemove]
 [FilesToPreserve]