paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-22 13:59:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: improved 'Resave forms with i18n' error messages

Browse Source 
git-svn-id: trunk@52596 -
This commit is contained in:
maxim 2016-07-02 12:48:45 +00:00
parent 3b284c4674
commit b1cab7270d
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ide/lazarusidestrconsts.pas
View File

@ -308,6 +308,10 @@ resourcestring
lisDiscardChanges = 'Discard changes';
lisDiscardChangesAll = 'Discard all changes';
lisDoNotCloseTheProject = 'Do not close the project';
lisErrorSavingForm = 'Error saving form';
lisCannotSaveForm = 'Cannot save form %s';
lisErrorOpeningForm = 'Error opening form';
lisCannotOpenForm = 'Cannot open form %s';
lisConvert = 'Convert';
lisPLDShowGlobalLinksIn = 'Show global links in ';
lisPLDShowUserLinksIn = 'Show user links in ';
@ -3391,7 +3395,6 @@ resourcestring
lisLazBuildManageProfiles ='Manage Build Profiles';
lisLazBuildProfile ='Profile to build';
lisLazBuildErrorWritingFile = 'Error writing file';
lisCannotWriteFile = 'Cannot write file %s';
lisLazBuildUnableToWriteFile = 'Unable to write file "%s":%s';
lisLazBuildNormalIDE = 'Normal IDE';
lisLazBuildDebugIDE = 'Debug IDE';
@ -4139,7 +4142,6 @@ resourcestring
lisPkgMangUnableToWriteStateFileOfPackageError = 'Unable to write state '
+'file "%s"%sof package %s.%sError: %s';
lisPkgMangErrorReadingFile = 'Error reading file';
lisCannotReadFile = 'Cannot read file %s';
lisProjMangUnableToReadStateFileOfProjectError = 'Unable to read state '
+'file %s of project %s%sError: %s';
lisPkgMangUnableToReadStateFileOfPackageError = 'Unable to read state file '

8
ide/main.pp
View File

@ -4050,8 +4050,8 @@ begin
begin
ReadSaveFailFlag:=true;
if (WriteStatus=mrAbort) or
(IDEMessageDialog(lisLazBuildErrorWritingFile, Format(
lisCannotWriteFile, [AnUnitInfo.Filename]), mtError, [
(IDEMessageDialog(lisErrorSavingForm, Format(lisCannotSaveForm, [
AnUnitInfo.Filename]), mtError, [
mbRetry, mbAbort])=mrAbort) then
AbortFlag:=true;
end;
@ -4060,8 +4060,8 @@ begin
begin
ReadSaveFailFlag:=true;
if (OpenStatus=mrAbort) or
(IDEMessageDialog(lisPkgMangErrorReadingFile, Format(
lisCannotReadFile, [AnUnitInfo.Filename]), mtError, [mbRetry,
(IDEMessageDialog(lisErrorOpeningForm, Format(lisCannotOpenForm, [
AnUnitInfo.Filename]), mtError, [mbRetry,
mbAbort])=mrAbort) then
AbortFlag:=true;
end;