IDE: adjust lineendings of some resource strings.

git-svn-id: trunk@45551 -

ide/buildmanager.pas

@@ -1391,8 +1391,8 @@ function TBuildManager.CheckAmbiguousSources(const AFilename: string;
     afaAsk:
       begin
         Result:=IDEMessageDialog(lisAmbiguousFileFound,
-          Format(lisThereIsAFileWithTheSameNameAndASimilarExtension, [LineEnding,
+          Format(lisThereIsAFileWithTheSameNameAndASimilarExtension,
-               AFilename, LineEnding, AmbiguousFilename, LineEnding, LineEnding]),
+                 [LineEnding, AFilename, LineEnding, AmbiguousFilename, LineEnding+LineEnding]),
           mtWarning,[mbYes,mbIgnore,mbAbort]);
         case Result of
         mrYes:    Result:=DeleteAmbiguousFile(AmbiguousFilename);
@@ -1475,7 +1475,7 @@ begin
         if EnvironmentOptions.AmbiguousFileAction=afaAsk then begin
           if IDEMessageDialog(lisDeleteAmbiguousFile,
             Format(lisAmbiguousFileFoundThisFileCanBeMistakenWithDelete,
-                   [CurFilename, LineEnding, ShortFilename, LineEnding, LineEnding]),
+                   [CurFilename, LineEnding, ShortFilename, LineEnding+LineEnding]),
             mtConfirmation,[mbYes,mbNo])=mrNo
           then continue;
         end;

ide/customformeditor.pp

@@ -2015,7 +2015,7 @@ begin
     LFMFilename:=ChangeFileExt(TUnitInfo(List.ContextObject).Filename,'.lfm');
   end;
   if LFMFilename<>'' then
-    Msg:=Format(lisCFEInFile, [Msg, LFMFilename, LineEnding]);
+    Msg:=Format(lisCFEInFile, [LFMFilename]) + LineEnding;
 
   if List.CurReadErrorMsg<>'' then
     Msg:=Msg+List.CurReadErrorMsg+LineEnding;

ide/debugmanager.pas

@@ -726,8 +726,7 @@ begin
   then begin
 
     if IDEMessageDialog(lisFileNotFound,
-      Format(lisTheFileWasNotFoundDoYouWantToLocateItYourself,
+      Format(lisTheFileWasNotFoundDoYouWantToLocateItYourself, [SrcFile, LineEnding]),
-             [SrcFile, LineEnding, LineEnding, LineEnding]),
       mtConfirmation, [mbYes, mbNo]) <> mrYes
     then Exit;
 
@@ -2138,7 +2137,7 @@ begin
         else
           if IDEMessageDialog(lisLaunchingApplicationInvalid,
             Format(lisTheLaunchingApplicationBundleDoesNotExists,
-              [LaunchingCmdLine, LineEnding, LineEnding, LineEnding, LineEnding]),
+              [LaunchingCmdLine, LineEnding, LineEnding, LineEnding+LineEnding]),
             mtError, [mbYes, mbNo, mbCancel]) = mrYes then
           begin
             if not BuildBoss.CreateProjectApplicationBundle then Exit;
@@ -2161,7 +2160,7 @@ begin
         else begin
           IDEMessageDialog(lisLaunchingApplicationInvalid,
             Format(lisTheLaunchingApplicationDoesNotExistsOrIsNotExecuta,
-                   [LaunchingCmdLine, LineEnding, LineEnding, LineEnding]),
+                   [LaunchingCmdLine, LineEnding, LineEnding+LineEnding]),
             mtError, [mbOK]);
           Exit;
         end;
@@ -2176,7 +2175,7 @@ begin
       else begin
         IDEMessageDialog(lisDebuggerInvalid,
           Format(lisTheDebuggerDoesNotExistsOrIsNotExecutableSeeEnviro,
-            [EnvironmentOptions.DebuggerFilename, LineEnding, LineEnding, LineEnding]),
+            [EnvironmentOptions.DebuggerFilename, LineEnding, LineEnding+LineEnding]),
           mtError,[mbOK]);
         Exit;
       end;

ide/dialogprocs.pas

@@ -702,7 +702,7 @@ begin
   LazarusIDE.DoJumpToCodeToolBossError;
   if Ask then begin
     Result:=IDEQuestionDialog(lisCCOErrorCaption,
-      Format(lisTheCodetoolsFoundAnError, [LineEnding, ErrMsg, LineEnding]),
+      Format(lisTheCodetoolsFoundAnError, [LineEnding, ErrMsg]),
       mtWarning, [mrIgnore, lisIgnoreAndContinue, mrAbort]);
     if Result=mrIgnore then Result:=mrCancel;
   end else begin

ide/diskdiffsdialog.pas

@@ -293,10 +293,8 @@ begin
       APackage:=TLazPackage(FileOwner);
       if AltFilename<>'' then begin
         if CompareFilenames(AltFilename,APackage.Filename)<>0 then
-          Result^.Diff+=Format(lisLpkHasVanishedOnDiskUsingAsAlternative, [
+          Result^.Diff+=Format(lisLpkHasVanishedOnDiskUsingAsAlternative,
-            LineEnding
+                               [LineEnding+AltFilename+LineEnding]);
-            +AltFilename+LineEnding
-            +LineEnding]);
         Filename:=AltFilename;
       end
       else if APackage.LPKSource<>nil then

ide/lazarusidestrconsts.pas

@@ -675,7 +675,7 @@ resourcestring
   lisSkipFile = 'Skip file';
   lisUnableToTransformBinaryComponentStreamOfTIntoText = 'Unable to transform '
     +'binary component stream of %s:T%s into text.';
-  lisTheFileWasNotFoundIgnoreWillGoOnLoadingTheProject = 'The file "%s"%swas not '
+  lisTheFileWasNotFoundIgnoreWillGoOnLoadingTheProject = 'The file "%s" was not '
     +'found.%sIgnore will go on loading the project,%sAbort  will stop the loading.';
   lisSkipFileAndContinueLoading = 'Skip file and continue loading';
   lisAbortLoadingProject = 'Abort loading project';
@@ -684,8 +684,8 @@ resourcestring
   lisProjectInfoFileDetected = 'Project info file detected';
   lisTheFileSeemsToBeTheProgramFileOfAnExistingLazarusP = 'The file %s seems '
     +'to be the program file of an existing Lazarus Project.';
-  lisTheFileSeemsToBeAProgramCloseCurrentProject = 'The file "%s"%sseems to '
+  lisTheFileSeemsToBeAProgramCloseCurrentProject = 'The file "%s" seems to '
-    +'be a program. Close current project and create a new Lazarus project '
+    +'be a program.%sClose current project and create a new Lazarus project '
     +'for this program?%s"No" will load the file as normal source.';
   lisProgramDetected = 'Program detected';
   lisUnableToConvertTextFormDataOfFileIntoBinaryStream = 'Unable to convert '
@@ -793,7 +793,7 @@ resourcestring
     +' It is recommended to use lowercase filename.%s%sRename file lowercase?';
   lisDeleteAmbiguousFile = 'Delete ambiguous file?';
   lisAmbiguousFileFoundThisFileCanBeMistakenWithDelete = 'Ambiguous file '
-    +'found: "%s"%sThis file can be mistaken with "%s"%s%sDelete the ambiguous file?';
+    +'found: "%s"%sThis file can be mistaken with "%s"%sDelete the ambiguous file?';
   lisLazarusEditorV = 'Lazarus IDE v%s';
   lisnewProject = '(new project)';
   liscompiling = '%s (compiling ...)';
@@ -3633,8 +3633,8 @@ resourcestring
   lisCleanUpUnitPath = 'Clean up unit path?';
   lisTheDirectoryIsNoLongerNeededInTheUnitPathRemoveIt =
     'The directory "%s" is no longer needed in the unit path.%sRemove it?';
-  lisTheFileWasNotFoundDoYouWantToLocateItYourself = 'The file "%s"%swas '
+  lisTheFileWasNotFoundDoYouWantToLocateItYourself = 'The file "%s" was '
-    +'not found.%sDo you want to locate it yourself ?%s';
+    +'not found.%sDo you want to locate it yourself?';
   lisRunToFailed = 'Run-to failed';
   lisDbgMangNoDebuggerSpecified = 'No debugger specified';
   lisDbgMangThereIsNoDebuggerSpecifiedSettingBreakpointsHaveNo = 'There is no '
@@ -3643,13 +3643,13 @@ resourcestring
   lisDbgMangSetTheBreakpointAnyway = 'Set the breakpoint anyway';
   lisLaunchingApplicationInvalid = 'Launching application invalid';
   lisTheLaunchingApplicationDoesNotExistsOrIsNotExecuta = 'The launching application '
-    +'"%s"%sdoes not exist or is not executable.%s%sSee Run -> Run parameters -> Local';
+    +'"%s"%sdoes not exist or is not executable.%sSee Run -> Run parameters -> Local';
   lisTheLaunchingApplicationBundleDoesNotExists = 'The Application Bundle %s'
     +'%sneeded for execution does not exist or is not executable.%sDo you want to create one?'
-    +'%s%sSee Project -> Project Options -> Application for settings.';
+    +'%sSee Project -> Project Options -> Application for settings.';
   lisDebuggerInvalid = 'Debugger invalid';
   lisTheDebuggerDoesNotExistsOrIsNotExecutableSeeEnviro = 'The debugger "%s"%s'
-    +'does not exist or is not executable.%s%sSee Tools -> Options -> Debugger options';
+    +'does not exist or is not executable.%sSee Tools -> Options -> Debugger options';
   lisUnableToRun = 'Unable to run';
   lisTheDestinationDirectoryDoesNotExistPleaseCheckTheP = 'The destination '
     +'directory "%s" does not exist.%sPlease check the project target file '
@@ -3851,21 +3851,25 @@ resourcestring
   lisPkgMangThePackageNameOfTheFileIsInvalid = 'The package name "%s" of%s'
     +'the file "%s" is invalid.';
   lisPkgMangPackageConflicts = 'Package conflicts';
-  lisPkgMangThereIsAlreadyAPackageLoadedFromFile = 'There is already a package "%s" '
+  lisPkgMangThereIsAlreadyAPackageLoadedFromFile = 'There is already a package "%s" loaded'
-    +'loaded%sfrom file "%s".%sSee Package -> Package Graph.%sReplace is impossible.';
+    +'%sfrom file "%s".'
+    +'%sSee Package -> Package Graph.'
+    +'%sReplace is impossible.';
   lisPkgMangSavePackage = 'Save package?';
   lisPkgMangLoadingPackageWillReplacePackage = 'Loading package %s will '
     +'replace package %s%sfrom file %s.%sThe old package is modified.%s%sSave '
     +'old package %s?';
   lisPkgMangNewPackage = 'NewPackage';
-  lisProbablyYouNeedToInstallSomePackagesForBeforeConti = 'Probably you need '
+  lisProbablyYouNeedToInstallSomePackagesForBeforeConti =
-    +'to install some packages before continuing.%s%sWarning:%sThe '
+     'Probably you need to install some packages before continuing.'
-    +'project uses the following design time packages, which might be needed '
+    +'%sWarning:'
+    +'%sThe project uses the following design time packages, which might be needed '
     +'to open the form in the designer. If you continue, you might get errors '
     +'about missing components and the form loading will probably create very '
-    +'unpleasant results.%s%sIt is recommended to cancel and install these packages first.%s%s';
+    +'unpleasant results.'
+    +'%sIt is recommended to cancel and install these packages first.';
   lisPackageNeedsInstallation = 'Package needs installation';
-  lisUnitInPackage = '%s unit %s in package %s%s';
+  lisUnitInPackage = '%s unit %s in package %s';
   lisPkgMangSkipThisPackage = 'Skip this package';
   lisPkgMangInvalidFileExtension = 'Invalid file extension';
   lisPkgMangTheFileIsNotALazarusPackage = 'The file "%s" is not a Lazarus package.';
@@ -3900,9 +3904,9 @@ resourcestring
   lisErrorLoadingFile2 = 'Error loading file "%s":';
   lisLoadingFailed = 'Loading %s failed.';
   lisPkgMangAddingNewDependencyForProjectPackage = '%sAdding new Dependency '
-    +'for project %s: package %s%s';
+    +'for project %s: package %s';
   lisPkgMangAddingNewDependencyForPackagePackage = '%sAdding new Dependency '
-    +'for package %s: package %s%s';
+    +'for package %s: package %s';
   lisPkgMangTheFollowingUnitsWillBeAddedToTheUsesSectionOf = '%sThe following '
     +'units will be added to the uses section of%s%s:%s%s%s';
   lisConfirmChanges = 'Confirm changes';
@@ -3924,9 +3928,10 @@ resourcestring
     +'the package %s will automatically install the package:';
   lisPkgMangRebuildLazarus = 'Rebuild Lazarus?';
   lisPkgMangThePackageWasMarkedForInstallationCurrentlyLazarus = 'The package "%s" '
-    +'was marked for installation.%sCurrently Lazarus only supports '
+    +'was marked for installation.'
-    +'static linked packages. The real installation needs rebuilding and '
+    +'%sCurrently Lazarus only supports static linked packages. '
-    +'restarting of Lazarus.%s%sDo you want to rebuild Lazarus now?';
+    +'The real installation needs rebuilding and restarting of Lazarus.'
+    +'%sDo you want to rebuild Lazarus now?';
   lisPkgMangPackageIsRequired = 'Package is required';
   lisPkgMangThePackageIsRequiredByWhichIsMarkedForInstallation = 'The package %s '
     +'is required by %s, which is marked for installation.%sSee package graph.';
@@ -3934,7 +3939,8 @@ resourcestring
   lisPkgMangUninstallPackage2 = 'Uninstall package %s?';
   lisPkgMangThePackageWasMarkedCurrentlyLazarus = 'The package "%s" was marked.'
     +'%sCurrently Lazarus only supports static linked packages. The real un-installation '
-    +'needs rebuilding and restarting of Lazarus.%s%sDo you want to rebuild Lazarus now?';
+    +'needs rebuilding and restarting of Lazarus.'
+    +'%sDo you want to rebuild Lazarus now?';
   lisPkgMangThisIsAVirtualPackageItHasNoSourceYetPleaseSaveThe = 'This is a '
     +'virtual package. It has no source yet. Please save the package first.';
   lisPkgMangPleaseCompileThePackageFirst = 'Please compile the package first.';
@@ -4678,7 +4684,7 @@ resourcestring
   lisOpenSymlink = 'Open symlink';
   lisFileLinkError = 'File link error';
   lisWriteErrorFile = 'Write error: %s%sFile: %s%s%s';
-  lisTheCodetoolsFoundAnError = 'The Codetools found an error:%s%s%s';
+  lisTheCodetoolsFoundAnError = 'The Codetools found an error:%s%s';
   lisIgnoreAndContinue = 'Ignore and continue';
   lisNotImplemented = 'Not implemented';
   lisNotImplementedYet = 'Not implemented yet:%s%s';
@@ -4866,9 +4872,9 @@ resourcestring
   lisFilter3 = 'Filter: %s';
   lisInvalidPublishingDirectory = 'Invalid publishing Directory';
   lisSourceDirectoryAndDestinationDirectoryAreTheSameMa = 'Source directory '
-    +'"%s"%sand destination directory "%s"%sare the same.%s%sMaybe you '
+    +'"%s"%sand destination directory "%s"%sare the same. Maybe you '
     +'misunderstand this feature.%sIt will clean/recreate the destination '
-    +'directory%sand copies the package/project into it.';
+    +'directory and copy the package/project into it.';
   lisClearDirectory = 'Clear Directory?';
   lisInOrderToCreateACleanCopyOfTheProjectPackageAllFil = 'In order to create '
     +'a clean copy of the project/package, all files in the following '
@@ -5382,7 +5388,7 @@ resourcestring
   lisCFEStream = '%sStream=%s';
   lisCFERoot = '%sRoot=%s:%s';
   lisCFEClassNotFound = '%s%sClass "%s" not found.';
-  lisCFEInFile = '%sIn file %s%s';
+  lisCFEInFile = 'In file %s';
   lisCFETheComponentEditorOfClassHasCreatedTheError = 'The component editor '
     +'of class "%s"has created the error:%s"%s"';
   lisShowSetupDialogForMostImportantSettings = 'Show setup dialog for most '

ide/sourcefilemanager.pas

@@ -2381,8 +2381,8 @@ begin
   if CompareFilenames(SrcDir,DestDir)=0
   then begin
     IDEMessageDialog(lisInvalidPublishingDirectory,
-      Format(lisSourceDirectoryAndDestinationDirectoryAreTheSameMa, [SrcDir, LineEnding,
+      Format(lisSourceDirectoryAndDestinationDirectoryAreTheSameMa,
-          DestDir, LineEnding, LineEnding, LineEnding, LineEnding, LineEnding]),
+             [SrcDir, LineEnding, DestDir, LineEnding, LineEnding]),
       mtError, [mbCancel]);
     Result:=mrCancel;
     exit;
@@ -4868,7 +4868,7 @@ begin
     // this is a file, that was loaded last time, but was removed from disk
     Result:=IDEQuestionDialog(lisFileNotFound,
       Format(lisTheFileWasNotFoundIgnoreWillGoOnLoadingTheProject,
-             [AFilename, LineEnding, LineEnding, LineEnding]),
+             [AFilename, LineEnding, LineEnding]),
       mtError, [mrIgnore, lisSkipFileAndContinueLoading,
                 mrAbort, lisAbortLoadingProject]);
     exit;
@@ -4887,7 +4887,7 @@ begin
   end;
 
   if IDEMessageDialog(lisFileNotFound,
-      Format(lisFileNotFoundDoYouWantToCreateIt,[AFilename,LineEnding])+LineEnding,
+      Format(lisFileNotFoundDoYouWantToCreateIt,[AFilename,LineEnding]),
       mtInformation,[mbYes,mbNo])=mrYes then
   begin
     // create new file

packager/addtopackagedlg.pas

@@ -347,7 +347,7 @@ begin
     if IDEComponentPalette.FindComponent(AnUnitName)<>nil then begin
       if IDEMessageDialog(lisA2PAmbiguousUnitName,
         Format(lisA2PTheUnitNameIsTheSameAsAnRegisteredComponent,
-               ['"', AnUnitName, '"', LineEnding]),
+               [AnUnitName, LineEnding]),
         mtWarning,[mbCancel,mbIgnore])<>mrIgnore
       then
         exit;

packager/pkgmanager.pas

@@ -1359,9 +1359,8 @@ begin
       ConflictPkg:=TObject(PathList[PathList.Count-1]) as TLazPackage;
       DoShowPackageGraphPathList(PathList);
       Result:=IDEMessageDialogAb(lisPkgMangCircularDependencies,
-        Format(lisPkgMangThePackageIsCompiledAutomaticallyAndItsOutputDirec, [
+        Format(lisPkgMangThePackageIsCompiledAutomaticallyAndItsOutputDirec,
-          ConflictPkg.Name, ConflictPkg.GetOutputDirectory, LineEnding+LineEnding,
+          [ConflictPkg.Name, ConflictPkg.GetOutputDirectory, LineEnding+LineEnding, LineEnding]),
-          LineEnding, LineEnding, LineEnding]),
         mtError,Btns,ShowAbort);
       if not ShowAbort then
         Result := mrCancel; // User confirmed error, implicitly cancel the action
@@ -1373,14 +1372,13 @@ begin
       PkgFile1,PkgFile2,ConflictPkg)
     then begin
       if (PkgFile1<>nil) and (PkgFile2<>nil) then begin
-        s:=Format(lisPkgMangThereAreTwoUnitsWithTheSameName1From2From, [LineEnding,
+        s:=Format(lisPkgMangThereAreTwoUnitsWithTheSameName1From2From,
-          LineEnding, PkgFile1.Filename, PkgFile1.LazPackage.IDAsString,
+          [LineEnding+LineEnding, PkgFile1.Filename, PkgFile1.LazPackage.IDAsString,
-          LineEnding, PkgFile2.Filename, PkgFile2.LazPackage.IDAsString,
+           LineEnding, PkgFile2.Filename, PkgFile2.LazPackage.IDAsString]) + LineEnding;
-          LineEnding, LineEnding]);
       end else if (PkgFile1<>nil) and (ConflictPkg<>nil) then begin
-        s:=Format(lisPkgMangThereIsAUnitWithTheSameNameAsAPackage1From2, [LineEnding,
+        s:=Format(lisPkgMangThereIsAUnitWithTheSameNameAsAPackage1From2,
-          LineEnding, PkgFile1.Filename, PkgFile1.LazPackage.IDAsString,
+          [LineEnding+LineEnding, PkgFile1.Filename, PkgFile1.LazPackage.IDAsString,
-          LineEnding, ConflictPkg.IDAsString, LineEnding, LineEnding]);
+           LineEnding, ConflictPkg.IDAsString]) + LineEnding;
       end else
         s:='Internal inconsistency FindAmbiguousUnits: '
           +'Please report this bug and how you got here.'+LineEnding;
@@ -1397,11 +1395,11 @@ begin
       @PackageGraphFindFPCUnit,PkgFile1,ConflictPkg)
     then begin
       if (ConflictPkg<>nil) then begin
-        s:=Format(lisPkgMangThereIsAFPCUnitWithTheSameNameAsAPackage, [LineEnding,
+        s:=Format(lisPkgMangThereIsAFPCUnitWithTheSameNameAsAPackage,
-          LineEnding, ConflictPkg.IDAsString, LineEnding, LineEnding]);
+          [LineEnding+LineEnding, ConflictPkg.IDAsString]) + LineEnding;
       end else if (PkgFile1<>nil) then begin
-        s:=Format(lisPkgMangThereIsAFPCUnitWithTheSameNameFrom, [LineEnding, LineEnding,
+        s:=Format(lisPkgMangThereIsAFPCUnitWithTheSameNameFrom,
-          PkgFile1.Filename, PkgFile1.LazPackage.IDAsString, LineEnding, LineEnding]);
+          [LineEnding+LineEnding, PkgFile1.Filename, PkgFile1.LazPackage.IDAsString]) + LineEnding;
       end else
         s:='Internal inconsistency FindFPCConflictUnits: '
           +'Please report this bug and how you got here.'+LineEnding;
@@ -2115,19 +2113,20 @@ begin
                                               AProject.FirstRequiredDependency);
   if MissingUnits<>nil then begin
     if Interactive then begin 
-      Msg:=Format(lisProbablyYouNeedToInstallSomePackagesForBeforeConti, [LineEnding,
+      Msg:=Format(lisProbablyYouNeedToInstallSomePackagesForBeforeConti,
-        LineEnding, LineEnding, LineEnding, LineEnding, LineEnding, LineEnding]);
+        [LineEnding+LineEnding, LineEnding, LineEnding+LineEnding]) + LineEnding+LineEnding;
       PkgList:=TObjectList.Create(false);
       try
         for i:=0 to MissingUnits.Count-1 do begin
           PkgFile:=TPkgFile(MissingUnits[i]);
           if PkgList.IndexOf(PkgFile.LazPackage)<0 then
             PkgList.Add(PkgFile.LazPackage);
-          Msg:=Format(lisUnitInPackage, [Msg, PkgFile.Unit_Name,
+          Msg:=Format(lisUnitInPackage,
-            PkgFile.LazPackage.IDAsString, LineEnding]);
+            [Msg, PkgFile.Unit_Name, PkgFile.LazPackage.IDAsString]) + LineEnding;
         end;
         Result:=IDEQuestionDialog(lisPackageNeedsInstallation,
-          Msg,mtWarning,[mrIgnore,'Continue without install',mrYes,'Install these packages',mrCancel,'Cancel','IsDefault']);
+          Msg,mtWarning,
+          [mrIgnore,'Continue without install',mrYes,'Install these packages',mrCancel,'Cancel','IsDefault']);
         if Result=mrIgnore then begin
           // continue
         end else if Result=mrYes then
@@ -3101,21 +3100,19 @@ var
         RequiredPackage:=TLazPackage(MissingDependencies.Objects[i]);
         RequiredPackage:=TLazPackage(RedirectPackageDependency(RequiredPackage));
         if UnitOwner is TProject then begin
-          PackageAdditions:=Format(
+          PackageAdditions:=Format(lisPkgMangAddingNewDependencyForProjectPackage,
-            lisPkgMangAddingNewDependencyForProjectPackage, [PackageAdditions,
+            [PackageAdditions, TProject(UnitOwner).GetTitle, RequiredPackage.Name]) + LineEnding+LineEnding;
-            TProject(UnitOwner).GetTitle, RequiredPackage.Name, LineEnding+LineEnding]);
         end else if UnitOwner is TLazPackage then begin
-          PackageAdditions:=Format(
+          PackageAdditions:=Format(lisPkgMangAddingNewDependencyForPackagePackage,
-            lisPkgMangAddingNewDependencyForPackagePackage, [PackageAdditions,
+            [PackageAdditions, TLazPackage(UnitOwner).Name, RequiredPackage.Name]) + LineEnding+LineEnding;
-            TLazPackage(UnitOwner).Name, RequiredPackage.Name, LineEnding+LineEnding]);
         end;
       end;
     end;
     //DebugLn('TPkgManager.AddUnitDependenciesForComponentClasses PackageAdditions=',PackageAdditions);
     Msg:='';
     if UsesAdditions<>'' then begin
-      Msg:=Format(lisPkgMangTheFollowingUnitsWillBeAddedToTheUsesSectionOf, [
+      Msg:=Format(lisPkgMangTheFollowingUnitsWillBeAddedToTheUsesSectionOf,
-        Msg, LineEnding, UnitFilename, LineEnding, UsesAdditions, LineEnding+LineEnding]);
+        [Msg, LineEnding, UnitFilename, LineEnding, UsesAdditions]) + LineEnding+LineEnding;
     end;
     if PackageAdditions<>'' then begin
       Msg:=Msg+PackageAdditions;
@@ -4084,7 +4081,7 @@ begin
   // ask user to rebuild Lazarus now
   Result:=IDEMessageDialog(lisPkgMangRebuildLazarus,
     Format(lisPkgMangThePackageWasMarkedForInstallationCurrentlyLazarus,
-           [APackage.IDAsString, LineEnding, LineEnding, LineEnding]),
+           [APackage.IDAsString, LineEnding, LineEnding+LineEnding]),
     mtConfirmation,[mbYes,mbNo]);
   if Result<>mrYes then begin
     Result:=mrOk;
@@ -4166,7 +4163,7 @@ begin
       // ask user to rebuilt Lazarus now
       Result:=IDEMessageDialog(lisPkgMangRebuildLazarus,
         Format(lisPkgMangThePackageWasMarkedCurrentlyLazarus,
-               [APackage.IDAsString, LineEnding, LineEnding, LineEnding]),
+               [APackage.IDAsString, LineEnding, LineEnding+LineEnding]),
         mtConfirmation,[mbYes,mbNo]);
       if Result=mrNo then begin
         Result:=mrOk;