IDE: improved error messages for RegisterUnit

git-svn-id: trunk@31130 -

ide/lazarusidestrconsts.pas

@@ -3749,8 +3749,13 @@ resourcestring
 
   // package system
   lisPkgSysInvalidUnitname = 'Invalid Unitname: %s';
-  lisPkgSysUnitNotFound = 'Unit not found: %s%s%s';
-  lisPkgSysUnitWasRemovedFromPackage = 'Unit %s%s%s was removed from package';
+  lisPkgSysUnitWasNotFoundInTheLpkFileProbablyThisLpkFileWasN = 'Unit "%s" was'
+    +' not found in the lpk file.%sProbably this lpk file was not used for '
+    +'building this IDE. Or the package misuses the procedure RegisterUnit.';
+  lisPkgSysUnitWasRemovedFromPackageLpk2 = 'Unit "%s" was removed from package'
+    +' (lpk)';
+  lisPkgSysUnitWasRemovedFromPackageLpk = 'Unit "%s" was removed from package '
+    +'(lpk)';
   lisPkgSysCanNotRegisterComponentsWithoutUnit = 'Can not register components '
     +'without unit';
   lisPkgSysInvalidComponentClass = 'Invalid component class';

packager/packagesystem.pas

@@ -1296,7 +1296,7 @@ begin
 
   // check package
   if FRegistrationPackage=nil then begin
-    RegistrationError('');
+    RegistrationError('Unit: '+TheUnitName);
     exit;
   end;
   try
@@ -1315,15 +1315,15 @@ begin
         FRegistrationFile:=
           FRegistrationPackage.FindUnit(FRegistrationUnitName,false);
         if FRegistrationFile=nil then begin
-          RegistrationError(Format(lisPkgSysUnitNotFound, ['"',
-            FRegistrationUnitName, '"']));
+          RegistrationError(Format(
+            lisPkgSysUnitWasNotFoundInTheLpkFileProbablyThisLpkFileWasN, [
+            FRegistrationUnitName, #13]));
         end else begin
           if not (pffReportedAsRemoved in FRegistrationFile.Flags) then begin
             RegistrationError(
-              Format(lisPkgSysUnitWasRemovedFromPackage, ['"',
-                FRegistrationUnitName, '"']));
-            FRegistrationFile.Flags:=
-                                   FRegistrationFile.Flags+[pffReportedAsRemoved];
+              Format(lisPkgSysUnitWasRemovedFromPackageLpk2, [
+                FRegistrationUnitName]));
+            FRegistrationFile.Flags:=FRegistrationFile.Flags+[pffReportedAsRemoved];
           end;
         end;
       end;