Merge branch 'main' into 'main'

fix for TControl.GetDefaultColor never recursing up to parent See merge request freepascal.org/lazarus/lazarus!452
JCF2: restored i18n of a caption after 34a6103a12
2025-04-05 21:18:06 +02:00 · 2025-04-03 21:50:38 +00:00 · 2025-04-04 00:48:47 +03:00
1 changed files with 1 additions and 1 deletions
--- a/components/jcf2/Ui/Settings/fRegistrySettings.pas
+++ b/components/jcf2/Ui/Settings/fRegistrySettings.pas
@ -233,7 +233,7 @@ begin
  rgWriteSettingsFile.Caption := lisCnfGenWriteSettings;
  rgWriteSettingsFile.Items[0] := lisCnfGenAlways;
  rgWriteSettingsFile.Items[1] := lisCnfGenFail;
-  //rgWriteSettingsFile.Items[2] := lisCnfGenNever;
+  rgWriteSettingsFile.Items[2] := lisCnfGenNever;
  rgShowParseTree.Caption := lisCnfGenShowParseTree;
  rgShowParseTree.Items[0] := lisCnfGenAlways;
  rgShowParseTree.Items[1] := lisCnfGenOnParseError;
Author	SHA1	Message	Date
robert rozee	54f8aff8bb	Merge branch 'main' into 'main' fix for TControl.GetDefaultColor never recursing up to parent See merge request freepascal.org/lazarus/lazarus!452	2025-04-03 21:50:38 +00:00
Maxim Ganetsky	d88e3444dd	JCF2: restored i18n of a caption after `34a6103a12`	2025-04-04 00:48:47 +03:00