diff --git a/ide/buildfiledlg.pas b/ide/buildfiledlg.pas index b3f26c8436..3f20ade5ea 100644 --- a/ide/buildfiledlg.pas +++ b/ide/buildfiledlg.pas @@ -559,7 +559,7 @@ begin RunPage.Caption:=lisBFRun; AlwaysCompileFirstCheckbox.Caption:=lisBFAlwaysBuildBeforeRun; - RunWorkDirGroupbox.Caption:=lisBFWorkingDirectoryLeaveEmptyForFilePath2; + RunWorkDirGroupbox.Caption:=lisBFWorkingDirectoryLeaveEmptyForFilePath; RunCommandGroupbox.Caption:=lisBFRunCommand; ButtonPanel.HelpButton.OnClick := @HelpButtonClick; diff --git a/ide/buildlazdialog.pas b/ide/buildlazdialog.pas index c6b9095311..c4e40e4de8 100644 --- a/ide/buildlazdialog.pas +++ b/ide/buildlazdialog.pas @@ -667,7 +667,7 @@ begin ConfirmBuildCheckBox.Caption := lisLazBuildConfirmBuild; CompileButton.Caption := lisLazBuildBuild; - CompileAdvancedButton.Caption := lisLazBuildBuildAdvanced; + CompileAdvancedButton.Caption := lisLazBuildBuildMany; SaveSettingsButton.Caption := lisLazBuildSaveSettings; CancelButton.Caption := lisLazBuildCancel; HelpButton.Caption := lisMenuHelp; diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas index d65ae5406b..8e07ec1091 100644 --- a/ide/lazarusidestrconsts.pas +++ b/ide/lazarusidestrconsts.pas @@ -328,8 +328,7 @@ resourcestring lisMenuCompile = 'Compile'; lisBFBuild = 'Build'; lisBFRun = 'Run'; - lisBFWorkingDirectoryLeaveEmptyForFilePath = 'Working directory (Leave ' - +'empty for file path)'; + lisBFWorkingDirectoryLeaveEmptyForFilePath = 'Working directory (Leave empty for file path)'; lisBFBuildCommand = 'Build Command'; lisMenuBuild = 'Build'; lisMenuQuickCompile = 'Quick compile'; @@ -337,9 +336,6 @@ resourcestring lisMenuAbortBuild = 'Abort Build'; lisMenuProjectRun = '&Run'; lisBFAlwaysBuildBeforeRun = 'Always Build before Run'; - lisBFWorkingDirectoryLeaveEmptyForFilePath2 = 'Working Directory (Leave ' - +'empty for file path)'; - lisDisAssGotoCurrentAddress = 'Goto current address'; lisDisAssGotoCurrentAddressHint = 'Goto current address'; lisDisAssGotoAddress = 'Goto address'; @@ -2168,7 +2164,6 @@ resourcestring lisRegularExpression = 'Regular expression'; lisInvalidFilter = 'Invalid filter'; lisInvalidExpression = 'Invalid expression:%s%s%s%s'; - lisExcludeFilter2 = 'Exclude filter'; lisPrivate = 'Private'; lisProtected = 'Protected'; lisEMDPublic = 'Public'; @@ -2877,7 +2872,7 @@ resourcestring lisSaveSettings = 'Save Settings'; lisLazBuildCancel = 'Cancel'; lisLazBuildBuild = 'Build'; - lisLazBuildBuildAdvanced = 'Build Advanced'; + lisLazBuildBuildMany = 'Build Many'; lisLazBuildBuildingIDE = 'Building IDE'; lisLazBuildCleanBuild = 'Clean + Build'; lisLazBuildCleanAllBuild = 'Clean All + Build'; @@ -4384,8 +4379,7 @@ resourcestring lisCodeHelpSeeAlsoTag = 'See also'; lisCodeHelpAddPathButton = 'Add path'; lisCodeHelpDeletePathButton = 'Remove path'; - lisEONOTEOnlyAbsolutePathsAreSupportedNow = 'NOTE: only absolute paths are ' - +'supported now'; + lisEONOTEOnlyAbsolutePathsAreSupportedNow = 'NOTE: only absolute paths are supported now'; lisCodeHelpConfirmreplace = 'Confirm replace'; lisCodeHelpReplaceButton = 'Replace'; lisCodeHelpPathsGroupBox = 'FPDoc files path'; @@ -4922,8 +4916,8 @@ resourcestring lisCEToDos = 'ToDos'; lisCEEmptyClassSections = 'Empty class sections'; lisCELongProcLineCount = 'Line count of procedure treated as "long"'; - lisCELongParamListCount = 'Parameters count treating as "many"'; - lisCENestedProcCount = 'Nested procedures count treating as "many"'; + lisCELongParamListCount = 'Parameters count treated as "many"'; + lisCENestedProcCount = 'Nested procedures count treated as "many"'; lisCodeObsCharConst = 'Search for unnamed char constants'; lisCodeObsIgnoreeConstants = 'Ignore next unnamed constants'; lisShow = 'Show'; diff --git a/packager/adddirtopkgdlg.pas b/packager/adddirtopkgdlg.pas index 88a39e1892..85444b4588 100644 --- a/packager/adddirtopkgdlg.pas +++ b/packager/adddirtopkgdlg.pas @@ -102,7 +102,7 @@ begin IncludeGroupBox.Caption:=lisFilter; IncludeRegExCheckBox.Caption:=lisRegularExpression; OnlyTextCheckBox.Caption:=lisFindFileOnlyTextFiles; - ExcludeGroupBox.Caption:=lisExcludeFilter2; + ExcludeGroupBox.Caption:=lisExcludeFilter; ExcludeRegExCheckBox.Caption:=lisRegularExpression; ButtonPanel1.OKButton.OnClick:=@ButtonPanel1OkClick; ButtonPanel1.CancelButton.OnClick:=@ButtonPanel1CancelClick;