--- a/src/eric7/i18n/eric7_en.ts Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/i18n/eric7_en.ts Tue Jul 25 16:41:52 2023 +0200 @@ -7633,7 +7633,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="982" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> <location filename="../Preferences/ConfigurationDialog.py" line="950" /> <location filename="../Preferences/ConfigurationDialog.py" line="919" /> <location filename="../Preferences/ConfigurationDialog.py" line="888" /> @@ -7748,6 +7748,7 @@ <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="971" /> <location filename="../Preferences/ConfigurationDialog.py" line="673" /> <location filename="../Preferences/ConfigurationDialog.py" line="380" /> <location filename="../Preferences/ConfigurationDialog.py" line="345" /> @@ -7782,6 +7783,7 @@ <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="978" /> <location filename="../Preferences/ConfigurationDialog.py" line="687" /> <location filename="../Preferences/ConfigurationDialog.py" line="394" /> <source>Searching</source> @@ -7796,6 +7798,7 @@ <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="985" /> <location filename="../Preferences/ConfigurationDialog.py" line="701" /> <location filename="../Preferences/ConfigurationDialog.py" line="408" /> <source>Style</source> @@ -7818,11 +7821,14 @@ <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="992" /> <location filename="../Preferences/ConfigurationDialog.py" line="436" /> <source>Autocompletion</source> <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1013" /> + <location filename="../Preferences/ConfigurationDialog.py" line="999" /> <location filename="../Preferences/ConfigurationDialog.py" line="464" /> <location filename="../Preferences/ConfigurationDialog.py" line="443" /> <source>QScintilla</source> @@ -7836,11 +7842,13 @@ <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1006" /> <location filename="../Preferences/ConfigurationDialog.py" line="457" /> <source>Calltips</source> <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1020" /> <location filename="../Preferences/ConfigurationDialog.py" line="715" /> <location filename="../Preferences/ConfigurationDialog.py" line="478" /> <source>Highlighters</source> @@ -7853,18 +7861,21 @@ <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1027" /> <location filename="../Preferences/ConfigurationDialog.py" line="729" /> <location filename="../Preferences/ConfigurationDialog.py" line="492" /> <source>Styles</source> <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1034" /> <location filename="../Preferences/ConfigurationDialog.py" line="736" /> <location filename="../Preferences/ConfigurationDialog.py" line="499" /> <source>Keywords</source> <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1041" /> <location filename="../Preferences/ConfigurationDialog.py" line="743" /> <location filename="../Preferences/ConfigurationDialog.py" line="506" /> <source>Properties</source> @@ -7908,7 +7919,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="989" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> <location filename="../Preferences/ConfigurationDialog.py" line="957" /> <location filename="../Preferences/ConfigurationDialog.py" line="926" /> <location filename="../Preferences/ConfigurationDialog.py" line="895" /> @@ -7949,28 +7960,28 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1081" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1158" /> <source>Enter search text...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1156" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1233" /> <source>Preferences</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1162" /> - <source>Please select an entry of the list -to display the configuration page.</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Preferences/ConfigurationDialog.py" line="1239" /> + <source>Please select an entry of the list +to display the configuration page.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1316" /> <source>Configuration Page Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1240" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1317" /> <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished" /> </message> @@ -14837,12 +14848,12 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="246" /> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="262" /> <source>Tab and Indent Override</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="247" /> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="263" /> <source>Shall the selected entries really be removed?</source> <translation type="unfinished" /> </message> @@ -15006,7 +15017,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="442" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="464" /> <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="0" /> <source>Fill to end of line</source> <translation type="unfinished" /> @@ -15140,74 +15151,74 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="438" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="460" /> <source>Enabled</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="439" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461" /> <source>Disabled</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="443" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465" /> <source>Select fill to end of line for all styles</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="589" /> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="570" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="611" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="592" /> <source>Export Highlighting Styles</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="572" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="594" /> <source>Highlighting Styles File (*.ehj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="590" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="612" /> <source><p>The highlighting styles file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="646" /> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="617" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="668" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="639" /> <source>Import Highlighting Styles</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="619" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="641" /> <source>Highlighting Styles File (*.ehj);;XML Highlighting Styles File (*.e6h *.e4h)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="647" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="669" /> <source><p>The highlighting styles file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="786" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="808" /> <source>Delete Sub-Style</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="787" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="809" /> <source><p>Shall the sub-style <b>{0}</b> really be deleted?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="823" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="845" /> <source>{0} - Copy</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="850" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="872" /> <source>Reset Sub-Styles to Default</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="851" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="873" /> <source><p>Do you really want to reset all defined sub-styles of <b>{0}</b> to the default values?</p></source> <translation type="unfinished" /> </message> @@ -15288,22 +15299,22 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="170" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="192" /> <source>Reset to Default</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="171" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="193" /> <source>Shall the current keyword set really be reset to default values?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="195" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="217" /> <source>Reset All to Default</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="196" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="218" /> <source>Shall all keyword sets of the current language really be reset to default values?</source> <translation type="unfinished" /> </message> @@ -16697,6 +16708,36 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>General</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Margins foreground:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Select the foreground color for the margins</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Margins background:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Select the background color for the margins</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Line Numbers Margin</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Select whether line numbers margin should be shown.</source> <translation type="unfinished" /> </message> @@ -16707,6 +16748,26 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Press to select the font for the editor line numbers</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Line Numbers Font</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>2345</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Fold Margin</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Select whether the fold margin should be shown.</source> <translation type="unfinished" /> </message> @@ -16777,16 +16838,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Foldmarkers foreground:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Select the foreground color for the margins</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Foldmargin background:</source> <translation type="unfinished" /> </message> @@ -16797,7 +16848,7 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Margins background:</source> + <source>Foldmarkers foreground:</source> <translation type="unfinished" /> </message> <message> @@ -16807,16 +16858,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Margins foreground:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Select the background color for the margins</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Foldmarkers background:</source> <translation type="unfinished" /> </message> @@ -16827,21 +16868,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Press to select the font for the editor line numbers</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Line Numbers Font</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>2345</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Selection</source> <translation type="unfinished" /> </message>