diff --git a/ide/diskdiffsdialog.pas b/ide/diskdiffsdialog.pas index 05c7f205f0..ee4db92632 100644 --- a/ide/diskdiffsdialog.pas +++ b/ide/diskdiffsdialog.pas @@ -390,7 +390,7 @@ begin BtnPanel.CancelButton.Caption:=lisDiskDiffIgnoreAllDiskChanges; IDEImages.AssignImage(WarnSpeedButton, 'state_warning'); - WarnLabel.Caption:=lisDiskDiffSomeFilesChangedLocally; + WarnLabel.Caption:=lisDiskDiffSomeFilesHaveLocalChanges; WarnLabel.Visible:=False; WarnSpeedButton.Visible:=False; diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas index be7b8ec5b3..d856881804 100644 --- a/ide/lazarusidestrconsts.pas +++ b/ide/lazarusidestrconsts.pas @@ -4253,7 +4253,7 @@ resourcestring lisDiskDiffSomeFilesHaveChangedOnDisk = 'Some files have changed on disk:'; lisDiskDiffClickOnOneOfTheAboveItemsToSeeTheDiff = 'Click on one of the ' +'above items to see the diff'; - lisDiskDiffSomeFilesChangedLocally = 'Some files changed locally.' + lisDiskDiffSomeFilesHaveLocalChanges = 'Some files have local changes.' +' Either local or external changes will be overwritten.'; lisDiskDiffReloadCheckedFilesFromDisk = 'Reload checked files from disk'; lisDiskDiffIgnoreAllDiskChanges = 'Ignore all disk changes';