diff --git a/components/jcf2/IdePlugin/lazarus/jcfuiconsts.pas b/components/jcf2/IdePlugin/lazarus/jcfuiconsts.pas
index 65ac4c2c24..5d1934da83 100644
--- a/components/jcf2/IdePlugin/lazarus/jcfuiconsts.pas
+++ b/components/jcf2/IdePlugin/lazarus/jcfuiconsts.pas
@@ -36,6 +36,39 @@ resourcestring
   lisClarifyDoRun = 'Do &run';
   lisClarifyRunOnlyThese = 'Run &only these';
 
+  //Spaces tab
+  lisSpacesSpaces = 'Spaces';
+  lisSpacesFixSpacing = 'Fix &spacing';
+  lisSpacesSpaceBeforeClassHeritage = 'Space before class &heritage';
+  lisSpacesSpacesBeforeColonIn = 'Spaces &before colon in';
+  lisSpacesVarDeclarations = '&Var declarations';
+  lisSpacesConstDeclarations = 'C&onst declarations';
+  lisSpacesProcedureParameters = '&Procedure parameters';
+  lisSpacesFunctionReturnTypes = '&Function return types';
+  lisSpacesClassVariables = '&Class variables';
+  lisSpacesRecordFields = '&Record fields';
+  lisSpacesCaseLAbel = 'Case l&abel';
+  lisSpacesLabel = '&Label';
+  lisSpacesInGeneric = 'In &generic';
+  lisSpacesSpacesAroundOperators = 'Spaces around &operators';
+  lisSpacesAlways = 'Always';
+  lisSpacesLeaveAsIs = 'Leave as is';
+  lisSpacesNever = 'Never';
+  lisSpacesInsertSpaceBeforeBracket = '&Insert space before bracket';
+  lisSpacesInFunctionDeclaration = 'In function &declaration';
+  lisSpacesInFunctionCall = 'In function &call';
+  lisSpacesBeforeInExpression = 'Before [ in expression';
+  lisSpacesInsertSpaceInsideBrackets = 'Insert space inside brackets';
+  lisSpacesAfterOpen = 'After open';
+  lisSpacesBeforeEnd = 'Before end';
+  lisSpacesMoveSpacesToBeforeColon = 'Move spaces to before colon';
+  lisSpacesTabCharacters = '&Tab characters';
+  lisSpacesTurnTabsToSpaces = 'Turn tabs to spaces';
+  lisSpacesSpacesPerTab = 'Spaces per tab';
+  lisSpacesTurnSpacesToTabs = 'Turn spaces to tabs';
+  lisSpacesSpacesForTab = 'Spaces for tab';
+  lisSpacesMaxSpacesInCode = '&Max spaces in code';
+
 implementation
 
 end.
diff --git a/components/jcf2/Ui/Settings/frClarifySpaces.pas b/components/jcf2/Ui/Settings/frClarifySpaces.pas
index 2e54de5d4b..01cd9437af 100644
--- a/components/jcf2/Ui/Settings/frClarifySpaces.pas
+++ b/components/jcf2/Ui/Settings/frClarifySpaces.pas
@@ -97,7 +97,7 @@ implementation
 {$R *.lfm}
 
 uses
-  JcfHelp, JcfSettings, SetSpaces, SettingsTypes;
+  JcfHelp, JcfSettings, SetSpaces, SettingsTypes, jcfuiconsts;
 
 constructor TfClarifySpaces.Create(AOwner: TComponent);
 begin
@@ -107,12 +107,49 @@ end;
 
 function TfClarifySpaces.GetTitle: String;
 begin
-  Result := 'Spaces';
+  Result := lisSpacesSpaces;
 end;
 
 procedure TfClarifySpaces.Setup(ADialog: TAbstractOptionsEditorDialog);
 begin
-  //
+  cbFixSpacing.Caption := lisSpacesFixSpacing;
+  cbSpaceClassHeritage.Caption := lisSpacesSpaceBeforeClassHeritage;
+
+  gbColon.Caption := lisSpacesSpacesBeforeColonIn;
+  lblSpaceBeforeColonVar.Caption := lisSpacesVarDeclarations;
+  lblSpaceBeforeColonConst.Caption := lisSpacesConstDeclarations;
+  lblSpaceBeforeColonParam.Caption := lisSpacesProcedureParameters;
+  lblSpaceBeforeColonFn.Caption := lisSpacesFunctionReturnTypes;
+  lblSpacesBeforeColonClassVar.Caption := lisSpacesClassVariables;
+  lblSpacesBeforeColonRecordField.Caption := lisSpacesRecordFields;
+  lblSpacesBeforeCaseLabel.Caption := lisSpacesCaseLAbel;
+  lbSpacesBeforeLabel.Caption := lisSpacesLabel;
+  lblSpacesBeforeColonGeneric.Caption := lisSpacesInGeneric;
+
+  rgOperators.Caption := lisSpacesSpacesAroundOperators;
+  rgOperators.Items[0] := lisSpacesAlways;
+  rgOperators.Items[1] := lisSpacesLeaveAsIs;
+  rgOperators.Items[2] := lisSpacesNever;
+
+  GroupBoxInsertSpaceBeforeBracket.Caption := lisSpacesInsertSpaceBeforeBracket;
+  cbInsertSpaceBeforeBracketinFunctionDeclaration.Caption :=
+    lisSpacesInFunctionDeclaration;
+  cbInsertSpaceBeforeBracketinFunctionCall.Caption := lisSpacesInFunctionCall;
+  cbBeforeOpenSquareBracketInExpression.Caption := lisSpacesBeforeInExpression;
+
+  GroupBoxSpacesInsideBrackets.Caption := lisSpacesInsertSpaceInsideBrackets;
+  cbInsertSpaceAfterOpen.Caption := lisSpacesAfterOpen;
+  CheckBoxInsertSpaceBeforeEnd.Caption := lisSpacesBeforeEnd;
+
+  cbMoveSpacesToBeforeColon.Caption := lisSpacesMoveSpacesToBeforeColon;
+
+  gbTabs.Caption := lisSpacesTabCharacters;
+  cbTabsToSpaces.Caption := lisSpacesTurnTabsToSpaces;
+  Label1.Caption := lisSpacesSpacesPerTab;
+  cbSpacesToTabs.Caption := lisSpacesTurnSpacesToTabs;
+  Label3.Caption := lisSpacesSpacesForTab;
+
+  cbMaxSpaces.Caption := lisSpacesMaxSpacesInCode;
 end;
 
 {-------------------------------------------------------------------------------