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

IDE: Formatting resource strings and variables. No real changes.

Browse Source 
git-svn-id: trunk@64706 -
This commit is contained in:
juha 2021-03-01 09:16:24 +00:00
parent 64ce0937ca
commit 69565b2caf
2 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ide/lazarusidestrconsts.pas
View File

@ -3791,8 +3791,7 @@ resourcestring
lisCodeToolsDefsName = 'Name:';
lisOnlyMessagesWithTheseFPCIDsCommaSeparated = 'Only messages with these FPC'
+' IDs (comma separated):';
lisOnlyMessagesFittingThisRegularExpression = 'Only messages fitting this '
+'regular expression:';
lisOnlyMessagesFittingThisRegularExpression = 'Only messages fitting this regular expression:';
lisURLOnWikiTheBaseUrlIs = 'URL on wiki (the base url is %s)';
lisTestURL = 'Test URL';
lisDeleteThisAddition = 'Delete this addition';
@ -3802,11 +3801,9 @@ resourcestring
lisSelectedAddition = 'Selected addition:';
lisNoMessageSelected = '(no message selected)';
lisAdditionFitsTheCurrentMessage = 'Addition fits the current message';
lisAdditionDoesNotFitTheCurrentMessage = 'Addition does not fit the current '
+'message';
lisAdditionDoesNotFitTheCurrentMessage = 'Addition does not fit the current message';
lisFilterAlreadyExists = 'Filter already exists';
lisAFilterWithTheNameAlreadyExists = 'A filter with the name "%s" already '
+'exists.';
lisAFilterWithTheNameAlreadyExists = 'A filter with the name "%s" already exists.';
lisSaveMessages = 'Save messages';
lisCodeToolsDefsDescription = 'Description:';
lisCodeToolsDefsVariable = 'Variable:';
@ -3816,13 +3813,13 @@ resourcestring
lisCodeToolsDefsautoGenerated = '%s, auto generated';
lisCodeToolsDefsnoneSelected = 'none selected';
lisCodeToolsDefsInvalidParent = 'Invalid parent';
lisACanNotHoldTControlsYouCanOnlyPutNonVisualComponen = 'A %s cannot hold '
+'TControls.%sYou can only put nonvisual components on it.';
lisACanNotHoldTControlsYouCanOnlyPutNonVisualComponen = 'A %s cannot hold TControls.'
+'%sYou can only put nonvisual components on it.';
lisUpdateReferences = 'Update references?';
lisTheUnitIsUsedByOtherFilesUpdateReferencesAutomatic = 'The unit %s is '
+'used by other files.%sUpdate references automatically?';
lisCodeToolsDefsAutoCreatedNodesReadOnly = 'Auto created nodes cannot be '
+'edited,%snor can they have non auto created child nodes.';
lisTheUnitIsUsedByOtherFilesUpdateReferencesAutomatic = 'The unit %s is used by other files.'
+'%sUpdate references automatically?';
lisCodeToolsDefsAutoCreatedNodesReadOnly = 'Auto created nodes cannot be edited,'
+'%snor can they have non auto created child nodes.';
lisCodeToolsDefsInvalidParentNode = 'Invalid parent node';
lisCodeToolsDefsParentNodeCanNotContainCh = 'Parent node cannot contain child nodes.';
lisCodeToolsDefsNewNode = 'NewNode';

27
ide/sourcefilemanager.pas
View File

@ -5353,25 +5353,16 @@ end;
function RenameUnit(AnUnitInfo: TUnitInfo; NewFilename, NewUnitName: string;
var LFMCode, LRSCode: TCodeBuffer): TModalResult;
var
NewLFMFilename: String;
OldSourceCode: String;
NewSource: TCodeBuffer;
NewFilePath: String;
NewLRSFilePath: String;
OldFilePath: String;
OldLRSFilePath: String;
OldFilename: String;
NewLRSFilename: String;
NewLFMFilename, NewLRSFilename: String;
NewFilePath, NewLRSFilePath: String;
OldFilename, OldLFMFilename, OldLRSFilename, OldPPUFilename: String;
OldFilePath, OldLRSFilePath: String;
OldSourceCode, OldUnitPath: String;
AmbiguousFilename, OutDir, S: string;
NewHighlighter: TLazSyntaxHighlighter;
AmbiguousFiles: TStringList;
AmbiguousText: string;
i: Integer;
AmbiguousFilename: String;
OldUnitPath: String;
OldLFMFilename: String;
OldLRSFilename: String;
OldPPUFilename: String;
OutDir: string;
Owners: TFPList;
OldFileExisted: Boolean;
ConvTool: TConvDelphiCodeTool;
@ -5588,11 +5579,11 @@ begin
and (CompareFilenames(OldFilePath,NewFilePath)=0)
and (CompareFilenames(AmbiguousFiles[0],ExtractFilename(OldFilename))=0)
then
AmbiguousText:=Format(lisDeleteOldFile, [ExtractFilename(OldFilename)])
S:=Format(lisDeleteOldFile, [ExtractFilename(OldFilename)])
else
AmbiguousText:=Format(lisThereAreOtherFilesInTheDirectoryWithTheSameName,
S:=Format(lisThereAreOtherFilesInTheDirectoryWithTheSameName,
[LineEnding, LineEnding, AmbiguousFiles.Text, LineEnding]);
Result:=IDEMessageDialog(lisAmbiguousFilesFound, AmbiguousText,
Result:=IDEMessageDialog(lisAmbiguousFilesFound, S,
mtWarning,[mbYes,mbNo,mbAbort]);
if Result=mrAbort then exit;
if Result=mrYes then begin