Merge branch 'notepad-plus-plus:master' into master

artpoli · Nov 20, 2024 · 00a583b · 00a583b
2 parents 6b02e50 + 4c9adcb
commit 00a583b
Show file tree

Hide file tree

Showing 158 changed files with 1,327 additions and 807 deletions.
diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log
@@ -1,33 +1,21 @@
-Notepad++ v8.7 bug-fixes & new enhancements:
-
- 1. Update to scintilla 5.5.2 & Lexilla 5.4.0.
- 2. Fix monitoring large files with frequent writes freezing the UI issue.
- 3. Fix regression of multiple selections in comboboxes of Find dialog.
- 4. Fix a single undo reverting many changes issue.
- 5. Improve Styler Configurator performance considerably.
- 6. Fix CVE-2014-9456 (but CVE-2014-9456 is not a "Security Vulnerability").
- 7. Make find dialog status messages color customizable via Style Configurator.
- 8. Make individual tab color customizable via Style Configurator.
- 9. Add new plugin command NPPM_GETNATIVELANGFILENAME & notification NPPN_NATIVELANGCHANGED for native language being changed. 
-10. Fix Folder as Workspace sorting problem for network storage (Samba, WebDAV, WSL, etc.).
-11. Fix closing unsaved clone document causing periodic backup loss issue.
-12. Fix Style Config's "User-defined keywords" not being saved properly after emptying it.
-13. Add user-defined keyword ability for some supported programming languages (ActionScript, ASP, Bash, C, C++, C#, GDScript, Go, HTML, Java, JavaScript).
-14. Add Fluent Icons for enhancing FunctionList, Folder as Workspace & project panels' icons in lite mode.
-15. Fix Python smart indent issue when a string or comment line ends with a colon.
-16. Add file type filters for UDL in Save dialogs.
-17. Add TOML language (TOML format) support.
-18. Add function list for TeX/LaTeX.
-19. Recognize Cython files as Python.
-20. Fix edit zone not getting focus while clicking the active tab.
-21. Add the ability to open the copy automatically after the “Save a Copy” command.
-22. Fix inability to paste after removing read-only via menu.
-23. Add one more option for auto-indent so C-Like language indent can be disabled.
-24. Fix Style Configurator regression: "URL hovered"'s "Go to Settings" not working.
+Notepad++ v8.7.1 bug-fixes & new enhancements:
+
+ 1. Update cURL in Notepad++ updater (WinGUp) for fixing cURL's CVE-2024-7264 issue.
+ 2. Fix opened network files hanging while the network disconnected.
+ 3. Fix not being able to open folder via cammand argument regression.
+ 4. Update to Scintilla 5.5.3 & Lexilla 5.4.1.
+ 5. Fix modified Find dialog status msg colors not being remembered through sessions.
+ 6. Fix hanging issue while hiding lines.
+ 7. Make left behide hide line close marker removable.
+ 8. Fix Find dialog status bar wrong messaging (regression).
+ 9. Fix URL parsing issue with '?' after '#'.
+10. Add "Close to system tray" ability.
+11. Add tab created time tooltip for new opened untitled tab.
+12. Improve GUI to avoid user confusion between Global override & Default Styles.
 
 
 Get more info on
-https://notepad-plus-plus.org/downloads/v8.7/
+https://notepad-plus-plus.org/downloads/v8.7.1/
 
 
 Included plugins:
@@ -39,4 +27,4 @@ Included plugins:
 
 Updater (Installer only):
 
-* WinGUp (for Notepad++) v5.3
+* WinGUp (for Notepad++) v5.3.1
diff --git a/PowerEditor/installer/nativeLang/abkhazian.xml b/PowerEditor/installer/nativeLang/abkhazian.xml
@@ -1133,7 +1133,6 @@ Updated to v8.2.1:
 					<Item id="6822" name="Арезервтә копиа амҩа:"/>
 				</Backup>
 				<AutoCompletion title="Автохыркәшара">
-					<Item id="6115" name="Авто-хьаҵ Ацәаҳәа Ҿыц аҟны"/>
 					<Item id="6807" name="Автохыркәшара"/>
 					<Item id="6808" name="Иаҿактәуп аҭагаларақәа рыцԥхьаӡа рзы автоматикала ахарҭәара"/>
 					<Item id="6809" name="Афункциақәа рхыркәшара"/>
@@ -1485,7 +1484,6 @@ Updated to v8.2.1:
 			<find-result-title-info-selections value="($INT_REPLACE1$ аиқәшәарақәа $INT_REPLACE2$ аҟны иалкаақәоу $INT_REPLACE3$ рҟынтәи)"/>
 			<find-result-title-info-extra value=" - Ацәаҳәақәа рФильтр Арежим: иаанарԥшуеит афильтрра алҵшәақәа мацара"/>
 			<find-result-hits value="(Аиқәшәарақәа $INT_REPLACE$)"/>
-			<find-result-hits-and-line-hits value="($INT_REPLACE1$ аиқәшәарақәа ацәаҳәақәа $INT_REPLACE2$ рҟны)"/>
 			<find-regex-zero-length-match value="ноль аура змоу аиқәшәара"/>
 			<session-save-folder-as-workspace value="Еиқәырхатәуп Акаталог Апроект ҳасабла"/>
 			<tab-untitled-string value="аҿыц "/>

diff --git a/PowerEditor/installer/nativeLang/afrikaans.xml b/PowerEditor/installer/nativeLang/afrikaans.xml
@@ -476,7 +476,6 @@
 
 					<Item id="6331" name="Wys slegs leêr naam in titelstaaf"/>
 					<Item id="6114" name="Aktiveer"/>
-					<Item id="6115" name="Auto-indent"/>
 					<Item id="6117" name="Aktiveer MRU optrede"/>
 
 				</MISC>

diff --git a/PowerEditor/installer/nativeLang/albanian.xml b/PowerEditor/installer/nativeLang/albanian.xml
@@ -754,7 +754,6 @@
 				</Backup>
 
 				<AutoCompletion title="Auto-plotësimi">
-					<Item id="6115" name="Auto-kryeradhë"/>
 					<Item id="6807" name="Auto-plotësimi"/>
 					<Item id="6808" name="Aftëso auto-plotësimin në secilën hyrje"/>
 					<Item id="6809" name="Plotësimi i funksionit"/>

diff --git a/PowerEditor/installer/nativeLang/arabic.xml b/PowerEditor/installer/nativeLang/arabic.xml
@@ -870,7 +870,6 @@
 				</Backup>
 
 				<AutoCompletion title="الإكمال التلقائي">
-					<Item id="6115" name="إزاحة تلقائية"/>
 					<Item id="6807" name="الإكمال التلقائي"/>
 					<Item id="6808" name="تفعيل الإكمال التلقائي لكل إدخال"/>
 					<Item id="6809" name="إكمال الإقتران"/>

diff --git a/PowerEditor/installer/nativeLang/aragonese.xml b/PowerEditor/installer/nativeLang/aragonese.xml
@@ -729,7 +729,6 @@ By ChesÃƒÂºs D. Trigo [[email protected]] & softaragones [softaragones@soft
 				</Backup>
 
 				<AutoCompletion title="AutocompleciÃƒÂ³n">
-					<Item id="6115" name="Sangrar automaticament"/>
 					<Item id="6807" name="AutocompleciÃƒÂ³n"/>
 					<Item id="6808" name="Permitir l'autocompleciÃƒÂ³n en cada dentrada"/>
 					<Item id="6809" name="Autocompletar funcions"/>

diff --git a/PowerEditor/installer/nativeLang/azerbaijani.xml b/PowerEditor/installer/nativeLang/azerbaijani.xml
@@ -550,7 +550,6 @@
 
 					<Item id="6331" name="Başlıqda yalnız faylın adını göstər"/>
 					<Item id="6114" name="İcazə ver"/>
-					<Item id="6115" name="Auto-indent"/>
 					<Item id="6117" name="Enable MRU behaviour"/>
 				</MISC>
 

diff --git a/PowerEditor/installer/nativeLang/basque.xml b/PowerEditor/installer/nativeLang/basque.xml
@@ -1069,7 +1069,6 @@ Zutabe-markatzaile anitz zehaztu ditzakezu zenbakiak zuriuneen bidez banatuta."/
 				</Backup>
 
 				<AutoCompletion title="Osaketa automatikoa">
-					<Item id="6115" name="Koskatze automatikoa"/>
 					<Item id="6807" name="Osaketa automatikoa"/>
 					<Item id="6808" name="Gaitu osaketa automatikoa sarrera bakoitzean"/>
 					<Item id="6809" name="Funtzio-osaketa"/>

diff --git a/PowerEditor/installer/nativeLang/belarusian.xml b/PowerEditor/installer/nativeLang/belarusian.xml
@@ -1111,7 +1111,6 @@ The comments are here for explanation, it's not necessary to translate them.
 				</Backup>
 
 				<AutoCompletion title="Аўтазавяршэнне">
-					<Item id="6115" name="Аўтаводступ"/>
 					<Item id="6807" name="Аўтазавяршэнне"/>
 					<Item id="6808" name="Уключыць аўтазавяршэнне для кожнага ўвядзення"/>
 					<Item id="6809" name="Завяршэнне функцый"/>

diff --git a/PowerEditor/installer/nativeLang/bengali.xml b/PowerEditor/installer/nativeLang/bengali.xml
@@ -722,7 +722,6 @@
 				</Backup>
 
 				<AutoCompletion title="Auto-Completion">
-					<Item id="6115" name="অটো-ইন্ডেন্ট"/>
 					<Item id="6807" name="স্বয়ং সম্পূর্ণতা(Auto-Completion)"/>
 					<Item id="6808" name="প্রতিটি ইনপুট জন্য স্বয়ংক্রিয় সমাপ্তির সক্রিয়"/>
 					<Item id="6809" name="শেষ ফাংশন"/>

diff --git a/PowerEditor/installer/nativeLang/bosnian.xml b/PowerEditor/installer/nativeLang/bosnian.xml
@@ -532,7 +532,6 @@
 
 					<Item id="6331" name="U titl baru prikaži samo naziv fajla"/>
 					<Item id="6114" name="Uključi sklopku dokumenata (Ctrl+Tab)"/>
-					<Item id="6115" name="Automatska uvlaka redova"/>
 					<Item id="6117" name="Uključi MRU ponašanje"/>
 
 				</MISC>

diff --git a/PowerEditor/installer/nativeLang/brazilian_portuguese.xml b/PowerEditor/installer/nativeLang/brazilian_portuguese.xml
@@ -1216,7 +1216,6 @@ Translation note:
 				</Backup>
 
 				<AutoCompletion title="Autocompletar">
-					<Item id="6115" name="Autoindentar"/>
 					<Item id="6807" name="Autocompletar"/>
 					<Item id="6808" name="Habilitar autocompletar para cada entrada"/>
 					<Item id="6809" name="Completar função"/>

diff --git a/PowerEditor/installer/nativeLang/breton.xml b/PowerEditor/installer/nativeLang/breton.xml
@@ -862,7 +862,6 @@
 				</Backup>
 
 				<AutoCompletion title="Em-glokaat">
-					<Item id="6115" name="Em-endantañ"/>
 					<Item id="6807" name="Em-glokaat"/>
 					<Item id="6808" name="Enaouiñ an em-glokaat war bep enmont"/>
 					<Item id="6809" name="Arc'hweladur klokat"/>

diff --git a/PowerEditor/installer/nativeLang/bulgarian.xml b/PowerEditor/installer/nativeLang/bulgarian.xml
@@ -1158,7 +1158,6 @@
 					<Item id="6860" name="Двойка #1:"/>
 					<Item id="6863" name="Двойка #2:"/>
 					<Item id="6866" name="Двойка #3:"/>
-					<Item id="6115" name="Автоматичен отстъп"/>
 				</AutoCompletion>
 				<!-- Прозорци и дата -->
 				<MultiInstance title="Прозорци и дата">

diff --git a/PowerEditor/installer/nativeLang/catalan.xml b/PowerEditor/installer/nativeLang/catalan.xml
@@ -852,7 +852,6 @@ By Hiro5 <groccat at gmail>
 					<Item id="6803" name="Directori:"/>
 				</Backup>
 				<AutoCompletion title="Autocompleció">
-					<Item id="6115" name="Sagnat automàtic"/>
 					<Item id="6807" name="Autocompleció"/>
 					<Item id="6808" name="Permetre Autocompleció a cada entrada"/>
 					<Item id="6809" name="Autocompleta funcions"/>

diff --git a/PowerEditor/installer/nativeLang/chineseSimplified.xml b/PowerEditor/installer/nativeLang/chineseSimplified.xml
@@ -1203,7 +1203,6 @@ Translation note:
 				</Backup>
 
 				<AutoCompletion title="自动补全">
-					<Item id="6115" name="自动缩进"/>
 					<Item id="6807" name="自动补全"/>
 					<Item id="6808" name="所有输入均启用自动补全"/>
 					<Item id="6809" name="函数自动补全"/>

diff --git a/PowerEditor/installer/nativeLang/corsican.xml b/PowerEditor/installer/nativeLang/corsican.xml
@@ -1242,7 +1242,6 @@ Additionnal information about Corsican localization:
 				</Backup>
 
 				<AutoCompletion title="Empiimentu autumaticu">
-					<Item id="6115" name="Indentazione autumatica"/>
 					<Item id="6807" name="Empiimentu autumaticu"/>
 					<Item id="6808" name="Attivà st’empiimentu à ogni entrata"/>
 					<Item id="6809" name="Cumpiimentu di funzione"/>

diff --git a/PowerEditor/installer/nativeLang/croatian.xml b/PowerEditor/installer/nativeLang/croatian.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!--
 	Croatian localization for Notepad++
-	Updated 21 October 2024 by Elvis Gambiraža ([email protected])
+	Updated 18 November 2024 by Elvis Gambiraža ([email protected])
 	All the comments are for explanation, they are not for translation.
 -->
 <NotepadPlus>
-	<Native-Langue name="Hrvatski" filename="croatian.xml" version="8.7.1">
+	<Native-Langue name="Hrvatski" filename="croatian.xml" version="8.7.2">
 		<Menu>
 			<Main>
 				<!-- Main Menu Entries -->
@@ -639,15 +639,15 @@
 					<Item id="2219" name="Zadane ključne riječi"/>
 					<Item id="2221" name="Korisnički određene ključne riječi"/>
 					<Item id="2225" name="Sintaksa:"/>
-					<Item id="2226" name="Uključi zadanu boju teksta za sve stilove"/>
-					<Item id="2227" name="Uključi zadanu boju pozadine za sve stilove"/>
-					<Item id="2228" name="Uključi zadani font za sve stilove"/>
-					<Item id="2229" name="Uključi zadanu veličinu fonta za sve stilove"/>
-					<Item id="2230" name="Uključi podebljani font kao zadano za sve stilove"/>
-					<Item id="2231" name="Uključi kurzivni font kao zadano za sve stilove"/>
-					<Item id="2232" name="Uključi podcrtani font kao zadano za sve stilove"/>
+					<Item id="2226" name="Obvezna boja teksta svih stilova"/>
+					<Item id="2227" name="Obvezna boja pozadine svih stilova"/>
+					<Item id="2228" name="Obvezni font za sve stilove"/>
+					<Item id="2229" name="Obvezna veličina fonta za sve stilove"/>
+					<Item id="2230" name="Obvezni podebljani font za sve stilove"/>
+					<Item id="2231" name="Obvezni kurzivni font za sve stilove"/>
+					<Item id="2232" name="Obvezni podcrtani font za sve stilove"/>
 					<Item id="2234" name="Idi na postavke"/>
-					<!-- Don't translate "&quot;Global override&quot; -->
+					<!-- Don't translate "Global override" -->
 					<Item id="2235" name="Što je Global override?"/>
 				</SubDialog>
 			</StyleConfig>
@@ -967,6 +967,7 @@
 					<Item id="6110" name="Vrh aktivnog jezička u boji"/>
 					<Item id="6112" name="Gumb za zatvaranje na svakom jezičku"/>
 					<Item id="6113" name="Zatvori karticu dvoklikom"/>
+					<Item id="6115" name="Omogući prikvačivanje kartica"/>
 					<Item id="6118" name="Sakrij"/>
 					<Item id="6119" name="U više redaka"/>
 					<Item id="6120" name="Okomito"/>
@@ -1227,7 +1228,6 @@
 				</Backup>
 
 				<AutoCompletion title="Automatsko dopunjavanje">
-					<Item id="6115" name="Automatska uvlaka redaka"/>
 					<Item id="6807" name="Automatsko dopunjavanje"/>
 					<Item id="6808" name="Automatsko dopunjavanje pri svakom unosu"/>
 					<Item id="6809" name="Dopunjavanje funkcija"/>
@@ -1331,6 +1331,7 @@
 						<Element name="Bez akcije u"/>
 						<Element name="Minimiziraj u"/>
 						<Element name="Zatvori u"/>
+						<Element name="Minimiziraj / Zatvori u"/>
 					</ComboBox>
 					<Item id="6308" name="sistemsku traku"/>
 					<Item id="6312" name="Automatsko prepoznavanje stanja datoteke"/>
@@ -1736,9 +1737,9 @@ Nađi u svim datotekama s izuzetkom svih mapa log ili logs rekurzivno:
 			<finder-collapse-all value="Smotaj sve"/>
 			<finder-uncollapse-all value="Razmotaj sve"/>
 			<finder-copy value="Kopiraj odabrani redak/odabrane retke"/>
-			<finder-copy-paths value="Kopiraj naziv puta/nazive putova"/>
+			<finder-copy-selected-paths value="Kopiraj odabrani naziv puta/nazive putova"/>
 			<finder-clear-all value="Očisti sve"/>
-			<finder-open-all value="Otvori sve"/>
+			<finder-open-selected-paths value="Otvori odabrani naziv puta/nazive putova"/>
 			<finder-purge-for-every-search value="Očisti za svako pretraživanje"/>
 			<finder-wrap-long-lines value="Prijelom dugih redaka"/>
 			<common-ok value="U redu"/>
@@ -1840,8 +1841,8 @@ Postavite vrijednost na 0 za onemogućavanje automatskog uključivanja."/>
 C, C++, Java, C#, Objective-C, PHP, JavaScript, JSP, CSS, Perl, Rust, PowerShell i JSON.
 
 Ako odaberete napredni način, ali ne uređujete datoteke na gore navedenim jezicima, uvlaka će ostati u osnovnom načinu."/>
-			<!-- Don't translate "&quot;Global override&quot; and &quot;Default Style&quot; -->
-			<global-override-tip value="Omogućavanje &quot;Global override&quot; ovdje, nadjačat će taj parametar u svim stilovima jezika. Ono što vjerojatno stvarno želite, je koristiti postavke &quot;Default Style&quot; umjesto toga."/>
+			<!-- Don't translate "Global override" and "Default Style" -->
+			<global-override-tip value="Omogućavanje &quot;Global override&quot; ovdje, nadjačat će taj parametar u svim stilovima sintaksi. Ono što vjerojatno stvarno želite, je koristiti postavke &quot;Default Style&quot; umjesto toga."/>
 		</MiscStrings>
 	</Native-Langue>
 </NotepadPlus>
diff --git a/PowerEditor/installer/nativeLang/czech.xml b/PowerEditor/installer/nativeLang/czech.xml
@@ -1236,7 +1236,6 @@
 						<Element name="Zavírat do"/>
 					</ComboBox>
 					<Item id="6114" name="Povolit přepínání"/>
-					<Item id="6115" name="Automatické odsazování"/>
 					<Item id="6117" name="Povolit MRU (nedávno použité)"/>
 					<Item id="6308" name="oznamovací oblast"/>
 					<Item id="6312" name="Automatická detekce stavu souboru"/>
@@ -1272,8 +1271,6 @@
 					<Item id="6825" name="Pamatovat si nedostupné soubory z poslední relace (zástupné dokumenty/karty)"/>
 				</Backup>
 				<AutoCompletion title="Automat. dokončování">
-					<Item id="6115" name="Automatické odsazování"/>
-					<Item id="6807" name="Automatické dokončování"/>
 					<Item id="6808" name="Povolit autom. dokončování každého vstupu"/>
 					<Item id="6809" name="Dokončování funkcí"/>
 					<Item id="6810" name="Dokončování slov"/>

diff --git a/PowerEditor/installer/nativeLang/danish.xml b/PowerEditor/installer/nativeLang/danish.xml
@@ -1145,7 +1145,6 @@ Brug mellemrum til at angive flere markører."/>
 				</Backup>
 
 				<AutoCompletion title="Automatik">
-					<Item id="6115" name="Automatisk indrykning"/>
 					<Item id="6807" name="Automatisk fuldførelse"/>
 					<Item id="6808" name="Aktivér automatisk fuldførelse"/>
 					<Item id="6809" name="Fuldfør funktioner"/>

diff --git a/PowerEditor/installer/nativeLang/dutch.xml b/PowerEditor/installer/nativeLang/dutch.xml
@@ -1212,7 +1212,6 @@ Last modified on 2024-06-06 by Thomas De Rocker (RockyTDR).
 				</Backup>
 
 				<AutoCompletion title="Automatisch aanvullen">
-					<Item id="6115" name="Automatisch inspringen"/>
 					<Item id="6807" name="Automatisch aanvullen"/>
 					<Item id="6808" name="Inschakelen"/>
 					<Item id="6809" name="Functies aanvullen"/>

diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml
@@ -638,7 +638,7 @@ Translation note:
 					<Item id="2231" name="Force italic choice for all styles"/>
 					<Item id="2232" name="Force underline choice for all styles"/>
 					<Item id="2234" name="Go to settings"/>
-					<!-- Don't translate "&quot;Global override&quot; -->
+					<!-- Don't translate "Global override" -->
 					<Item id="2235" name="What is Global override?"/>
 				</SubDialog>
 			</StyleConfig>
@@ -958,6 +958,7 @@ Translation note:
 					<Item id="6110" name="Draw a colored bar on active tab"/>
 					<Item id="6112" name="Show close button on each tab"/>
 					<Item id="6113" name="Double click to close document"/>
+					<Item id="6115" name="Enable pin tab feature"/>
 					<Item id="6118" name="Hide"/>
 					<Item id="6119" name="Multi-line"/>
 					<Item id="6120" name="Vertical"/>
@@ -1217,7 +1218,6 @@ Translation note:
 				</Backup>
 
 				<AutoCompletion title="Auto-Completion">
-					<Item id="6115" name="Auto-indent"/>
 					<Item id="6807" name="Auto-Completion"/>
 					<Item id="6808" name="Enable auto-completion on each input"/>
 					<Item id="6809" name="Function completion"/>
@@ -1317,6 +1317,7 @@ Translation note:
 						<Element name="No action to"/>
 						<Element name="Minimize to"/>
 						<Element name="Close to"/>
+						<Element name="Minimize / Close to"/>
 					</ComboBox>
 					<Item id="6308" name="system tray"/>
 					<Item id="6312" name="File Status Auto-Detection"/>
@@ -1551,6 +1552,7 @@ Press the OK button to open the Find dialog or set focus on it.
 
 If you require the backward regex searching feature, consult the user manual for instructions on enabling it."/>
 			<PrintError title="0" message="Cannot start printer document."/><!-- Use title="0" to use Windows OS default translated "Error" title. -->
+			<FileToLoadSizeCheckFailed title="File to load size-check failed" message="Cannot obtain the file size before loading!"/>
 		</MessageBox>
 		<ClipboardHistory>
 			<PanelTitle name="Clipboard History"/>
@@ -1719,9 +1721,9 @@ Find in all files but exclude all folders log or logs recursively:
 			<finder-collapse-all value="Fold all"/>
 			<finder-uncollapse-all value="Unfold all"/>
 			<finder-copy value="Copy Selected Line(s)"/>
-			<finder-copy-paths value="Copy Pathname(s)"/>
+			<finder-copy-selected-paths value="Copy Selected Pathname(s)"/>
 			<finder-clear-all value="Clear all"/>
-			<finder-open-all value="Open all"/>
+			<finder-open-selected-paths value="Open Selected Pathname(s)"/>
 			<finder-purge-for-every-search value="Purge for every search"/>
 			<finder-wrap-long-lines value="Word wrap long lines"/>
 			<common-ok value="OK"/>
@@ -1821,7 +1823,7 @@ Click on &quot;?&quot; button on right to open website with User Manual."/>
 C, C++, Java, C#, Objective-C, PHP, JavaScript, JSP, CSS, Perl, Rust, PowerShell and JSON.
 
 If you select advanced mode but do not edit files in the aforementioned languages, the indentation will remain in basic mode."/>
-			<!-- Don't translate "&quot;Global override&quot; and &quot;Default Style&quot; -->
+			<!-- Don't translate "Global override" and "Default Style" -->
 			<global-override-tip value="Enabling &quot;Global override&quot; here will override that parameter in all language styles. What you probably really want is to use the &quot;Default Style&quot; settings instead"/>
 		</MiscStrings>
 	</Native-Langue>