IDE: Remove some duplicate resource strings.

git-svn-id: trunk@45325 -
2025-04-11 05:07:56 +02:00 · 2014-06-03 19:01:24 +00:00 · 2014-06-03 19:01:24 +00:00 · 258ea1153d
commit 258ea1153d
parent 03aed28f3e
8 changed files with 38 additions and 60 deletions
--- a/ide/buildmanager.pas
+++ b/ide/buildmanager.pas
@ -1584,9 +1584,8 @@ begin
              if ConsoleVerbosity>=0 then
                DebugLn(['TBuildManager.CheckUnitPathForAmbiguousPascalFiles CurUnitName="',CurUnitName,'" CurFilename="',CurFilename,'" OtherUnitName="',PUnitFile(ANode.Data)^.FileUnitName,'" OtherFilename="',PUnitFile(ANode.Data)^.Filename,'"']);
              // pascal unit exists twice
-              Result:=IDEQuestionDialog(lisAmbiguousUnitFound2,
-                Format(lisTheUnitExistsTwiceInTheUnitPathOfThe, [CurUnitName,
-                  ContextDescription])
+              Result:=IDEQuestionDialog(lisAmbiguousUnitFound,
+                Format(lisTheUnitExistsTwiceInTheUnitPathOfThe,[CurUnitName,ContextDescription])
                +LineEnding
                +LineEnding
                +'1. "'+PUnitFile(ANode.Data)^.Filename+'"'+LineEnding
--- a/ide/dialogprocs.pas
+++ b/ide/dialogprocs.pas
@ -166,8 +166,7 @@ begin
    end else begin
      DlgButtons:=[mbCancel,mbRetry]+ExtraButtons;
      Result:=IDEMessageDialog(lisUnableToCopyFile,
-        Format(lisUnableToCopyFileTo2,
-               ['"', SrcFilename, '"', LineEnding, '"', DestFilename, '"']),
+        Format(lisUnableToCopyFileTo,['"',SrcFilename,'"',LineEnding,'"',DestFilename,'"']),
        mtError,DlgButtons);
      if (Result<>mrRetry) then exit;
    end;
@ -206,7 +205,7 @@ begin
        Result:=mrCancel;
      end else begin
        ACaption:=lisFileNotText;
-        AText:=Format(lisFileDoesNotLookLikeATextFileOpenItAnyway2,
+        AText:=Format(lisFileDoesNotLookLikeATextFileOpenItAnyway,
                      ['"', AFilename, '"', LineEnding, LineEnding]);
        Result:=IDEMessageDialogAb(ACaption, AText, mtConfirmation,
                           [mbOk, mbIgnore],ShowAbort);
@ -278,9 +277,8 @@ begin
      Result:=mrOk;
    end else begin
      ACaption:=lisWriteError;
-      AText:=Format(lisUnableToWriteToFile, ['"', Filename, '"']);
-      Result:=IDEMessageDialog(ACaption,AText,mtError,
-                               [mbAbort, mbRetry, mbIgnore]);
+      AText:=Format(lisUnableToWriteToFile2, [Filename]);
+      Result:=IDEMessageDialog(ACaption,AText,mtError,[mbAbort, mbRetry, mbIgnore]);
      if Result=mrAbort then exit;
      if Result=mrIgnore then Result:=mrOk;
    end;
@ -412,7 +410,7 @@ begin
      break;
    end else begin
      Result:=IDEMessageDialog(lisUnableToWriteFile,
-        Format(lisUnableToWriteToFile, ['"', Buffer.Filename, '"']),
+        Format(lisUnableToWriteToFile2, [Buffer.Filename]),
        mtError,ErrorButtons+[mbCancel]);
      if Result<>mrRetry then exit;
    end;
@ -444,8 +442,7 @@ begin
    if WarnOverwrite then begin
      Result:=IDEQuestionDialog(lisOverwriteFile,
        Format(lisAFileAlreadyExistsReplaceIt, ['"', AFilename, '"', LineEnding]),
-        mtConfirmation,
-        [mrYes, lisOverwriteFileOnDisk, mbCancel]);
+        mtConfirmation, [mrYes, lisOverwriteFileOnDisk, mbCancel]);
      if Result=mrCancel then exit;
    end;
    if CreateBackup then begin
@ -471,8 +468,7 @@ begin
    end;
  except
    Result:=IDEMessageDialog(lisUnableToWriteFile,
-      Format(lisUnableToWriteToFile, ['"', AFilename, '"']), mtError, [
-        mbCancel, mbAbort]);
+      Format(lisUnableToWriteToFile2, [AFilename]), mtError, [mbCancel, mbAbort]);
    exit;
  end;
  // check readable
@ -487,8 +483,8 @@ begin
    end;
  except
    Result:=IDEMessageDialog(lisUnableToReadFile,
-      Format(lisUnableToReadFilename, ['"', AFilename, '"']), mtError, [
-        mbCancel, mbAbort]);
+      Format(lisUnableToReadFile2, ['"', AFilename, '"']),
+      mtError, [mbCancel, mbAbort]);
    exit;
  end;
  Result:=mrOk;
@ -500,8 +496,7 @@ begin
  Result:=mrOk;
  while not FileIsWritable(Filename) do begin
    Result:=IDEMessageDialog(lisFileIsNotWritable,
-      Format(lisUnableToWriteToFile, ['"', Filename, '"']),
-      mtError,ErrorButtons+[mbCancel]);
+      Format(lisUnableToWriteToFile2, [Filename]), mtError,ErrorButtons+[mbCancel]);
    if Result<>mrRetry then exit;
  end;
 end;
@ -570,7 +565,7 @@ begin
      if not DirPathExists(Dir) then begin
        while not CreateDirUTF8(Dir) do begin
          Result:=IDEMessageDialog(lisPkgMangUnableToCreateDirectory,
-            Format(lisUnableToCreateDirectory2, ['"', Dir, '"']),
+            Format(lisUnableToCreateDirectory, ['"', Dir, '"']),
            mtError,ErrorButtons+[mbCancel]);
          if Result<>mrRetry then exit;
        end;
--- a/ide/idewindowhelp.pas
+++ b/ide/idewindowhelp.pas
@ -158,8 +158,8 @@ begin
    end;
  except
    on E: Exception do begin
-      IDEMessageDialog(lisCodeToolsDefsWriteError, Format(lisErrorWritingFile2,
-        [Filename+LineEnding+E.Message]),
+      IDEMessageDialog(lisCodeToolsDefsWriteError,
+        Format(lisErrorWritingFile, [Filename+LineEnding+E.Message]),
        mtError,[mbOk]);
    end;
  end;
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@ -677,7 +677,6 @@ resourcestring
  lisUnableToCreateFile3 = 'Unable to create file%s%s%s%s';
  lisCopyError2 = 'Copy error';
  lisSourceDirectoryDoesNotExist = 'Source directory %s%s%s does not exist.';
-  lisUnableToCreateDirectory = 'Unable to create directory %s%s%s.';
  lisUnableToCopyFileTo = 'Unable to copy file %s%s%s%sto %s%s%s';
  lisSorryThisTypeIsNotYetImplemented = 'Sorry, this type is not yet implemented';
  lisFileHasChangedSave = 'File %s%s%s has changed. Save?';
@ -696,21 +695,16 @@ resourcestring
  lisUnableToRenameFile = 'Unable to rename file';
  lisUnableToCopyFile = 'Unable to copy file';
  lisWriteError = 'Write Error';
-  lisFileDoesNotLookLikeATextFileOpenItAnyway2 = 'File %s%s%s%sdoes not look '
-    +'like a text file.%sOpen it anyway?';
+  lisFileDoesNotLookLikeATextFileOpenItAnyway =
+    'File %s%s%s%sdoes not look like a text file.%sOpen it anyway?';
  lisUnableToCreateBackupDirectory = 'Unable to create backup directory %s%s%s.';
-  lisSourceAndDestinationAreTheSame =
-    'Source and Destination are the same:%s%s';
+  lisSourceAndDestinationAreTheSame = 'Source and Destination are the same:%s%s';
  lisUnableToRenameFileTo2 = 'Unable to rename file %s%s%s%sto %s%s%s.';
-  lisUnableToCopyFileTo2 = 'Unable to copy file %s%s%s%sto %s%s%s.';
-  lisFileDoesNotLookLikeATextFileOpenItAnyway = 'File %s%s%s%sdoes not look '
-    +'like a text file.%sOpen it anyway?';
  lisInvalidCommand = 'Invalid command';
  lisTheCommandAfterIsNotExecutable = 'The command after %s%s%s is not executable.';
  lisUnableToCleanUpDestinationDirectory = 'Unable to clean up destination directory';
  lisCommandAfterInvalid = 'Command after invalid';
-  lisTheCommandAfterPublishingIsInvalid = 'The command after publishing is '
-    +'invalid:%s%s%s%s';
+  lisTheCommandAfterPublishingIsInvalid = 'The command after publishing is invalid:%s%s%s%s';
  lisUnableToCleanUpPleaseCheckPermissions = 'Unable to clean up %s%s%s.%'
    +'sPlease check permissions.';
  lisCommandAfterPublishingModule = 'Command after publishing module';
@ -746,12 +740,13 @@ resourcestring
  lisYouCanNotBuildLazarusWhileDebuggingOrCompiling = 'You cannot build '
    +'Lazarus while debugging or compiling.';
  lisReadError = 'Read Error';
-  lisUnableToReadFile2 = 'Unable to read file %s%s%s!';
+  lisUnableToReadFile = 'Unable to read file';
+  lisUnableToReadFile2 = 'Unable to read file %s%s%s.';
  lisUnableToReadTheProjectInfoFile = 'Unable to read the project info file%s%s%s%s.';
  lisUnableToReadLpi = 'Unable to read lpi';
  lisStrangeLpiFile = 'Strange lpi file';
  lisTheFileDoesNotLookLikeALpiFile = 'The file %s does not look like a lpi file.';
-  lisAmbiguousUnitFound2 = 'Ambiguous unit found';
+  lisAmbiguousUnitFound = 'Ambiguous unit found';
  lisTheUnitExistsTwiceInTheUnitPathOfThe = 'The unit %s exists twice in the '
    +'unit path of the %s:';
  lisHintCheckIfTwoPackagesContainAUnitWithTheSameName = 'Hint: Check if two '
@ -802,9 +797,9 @@ resourcestring
    +'sHint: The "Make Resourcestring" function expects a string constant in a '
    +'single file. Please select the expression and try again.';
  lisSelectionExceedsStringConstant = 'Selection exceeds string constant';
-  lisHintTheMakeResourcestringFunctionExpectsAStringCon2 = 'Hint: The "Make '
-    +'Resourcestring" function expects a string constant.%sPlease select only '
-    +'a string expression and try again.';
+  lisHintTheMakeResourcestringFunctionExpectsAStringCon = 'Hint: The "Make '
+    +'Resourcestring" function expects a string constant.%sPlease select the '
+    +'expression and try again.';
  lisNoResourceStringSectionFound = 'No ResourceString Section found';
  lisUnableToFindAResourceStringSectionInThisOrAnyOfThe = 'Unable to find a '
    +'ResourceString section in this or any of the used units.';
@ -2140,7 +2135,6 @@ resourcestring
  lisFailedToCreateApplicationBundleFor = 'Failed to create Application '
    +'Bundle for "%s"';
  lisThisProjectHasNoMainSourceFile = 'This project has no main source file';
-  lisErrorLoadingFile2 = 'Error loading file "%s":%s%s';
  lisNoneClickToChooseOne = 'none, click to choose one';
  lisTreeNeedsRefresh = 'Tree needs refresh';
  lisEMDEmptyMethods = 'Empty Methods';
@ -2433,11 +2427,9 @@ resourcestring
  uemPrevBookmark = 'Goto Previous Bookmark';
  uemBookmarkN = 'Bookmark';
  lisChangeEncoding = 'Change Encoding';
-  lisEncodingOfFileOnDiskIsNewEncodingIs2 = 'Encoding of file %s%s%s%son disk '
-    +'is %s. New encoding is %s.';
  lisChangeFile = 'Change file';
-  lisEncodingOfFileOnDiskIsNewEncodingIs = 'Encoding of file %s%s%s%son disk '
-    +'is %s. New encoding is %s.';
+  lisEncodingOfFileOnDiskIsNewEncodingIs =
+    'Encoding of file %s%s%s%son disk is %s. New encoding is %s.';
  lisReopenWithAnotherEncoding = 'Reopen with another encoding';
  lisAbandonChanges = 'Abandon changes?';
  lisAllYourModificationsToWillBeLostAndTheFileReopened = 'All your modificatio'
@ -3134,7 +3126,6 @@ resourcestring

  // codetools defines
  lisCodeToolsDefsWriteError = 'Write error';
-  lisErrorWritingFile2 = 'Error writing file %s';
  lisErrorWritingFile = 'Error writing file "%s"';
  lisFPDocErrorWriting = 'Error writing "%s"%s%s';
  lisFPDocFPDocSyntaxError = 'FPDoc syntax error';
@ -3203,6 +3194,7 @@ resourcestring
  lisCodeToolsDefsKylixMainDirectoryDesc = 'The %s main directory,%swhere '
    +'Borland has installed all %s sources.%sFor example: /home/user/kylix%s';
  lisCodeToolsDefsCreateDefinesForProject = 'Create Defines for %s Project';
+  lisCodeToolsDefsProjectDirectory = 'Project directory';
  lisCodeToolsDefsprojectDirectory2 = '%s project directory';
  lisCodeToolsDefsTheProjectDirectory = 'The %s project directory,%swhich '
    +'contains the .dpr, dpk file.';
@ -3322,9 +3314,6 @@ resourcestring
  lisSuccess = 'Success';
  lisAllBlocksLooksOk = 'All blocks look ok.';
  lisTheApplicationBundleWasCreatedFor = 'The Application Bundle was created for "%s"';
-  lisHintTheMakeResourcestringFunctionExpectsAStringCon = 'Hint: The "Make '
-    +'Resourcestring" function expects a string constant.%sPlease select the '
-    +'expression and try again.';

  // diff dialog
  lisDiffDlgText1 = 'Text1';
@ -3467,11 +3456,8 @@ resourcestring
    +'yet in the unit path.%sAdd it?';
  lisUnableToCreateFilename = 'Unable to create file %s%s%s.';
  lisUnableToWriteFile = 'Unable to write file';
-  lisUnableToWriteToFile = 'Unable to write to file %s%s%s.';
-  lisUnableToWriteToFile2= 'Unable to write to file "%s".';
+  lisUnableToWriteToFile2 = 'Unable to write to file "%s".';
  lisFileIsNotWritable = 'File is not writable';
-  lisUnableToReadFile = 'Unable to read file';
-  lisUnableToReadFilename = 'Unable to read file %s%s%s.';
  lisErrorDeletingFile = 'Error deleting file';
  lisInvalidMask = 'Invalid Mask';
  lisTheFileMaskIsNotAValidRegularExpression = 'The file mask "%s" is not a '
@ -3496,8 +3482,6 @@ resourcestring
  lisProjAddThePackageNameIsInvalidPlaseChooseAnExistingPackag = 'The package '
    +'name %s%s%s is invalid.%sPlase choose an existing package.';
  lisProjAddDependencyAlreadyExists = 'Dependency already exists';
-  lisUnableToAddTheDependencyBecauseThePackageHasAlread2 = 'Unable to add the '
-    +'dependency %s, because the package %s has already a dependency to %s';
  lisVersionMismatch = 'Version mismatch';
  lisUnableToAddTheDependencyBecauseThePackageHasAlread = 'Unable to add the '
    +'dependency %s, because the package %s has already a dependency %s';
@ -3720,7 +3704,6 @@ resourcestring
  lisPkgMangDeleteOldPackageFile = 'Delete Old Package File?';
  lisPkgMangDeleteOldPackageFile2 = 'Delete old package file %s%s%s?';
  lisPkgMangDeleteFailed = 'Delete failed';
-  lisAmbiguousUnitFound = 'Ambiguous Unit found';
  lisTheFileWasFoundInOneOfTheSourceDirectoriesOfThePac = 'The file %s%s%s%s'
    +'was found in one of the source directories of the package %s and looks '
    +'like a compiled unit. Compiled units must be in the output directory of '
@ -3773,7 +3756,7 @@ resourcestring
  lisPkgMangUnableToReadStateFileOfPackageError = 'Unable to read state file %'
    +'s%s%s%sof package %s.%sError: %s';
  lisPkgMangUnableToCreateDirectory = 'Unable to create directory';
-  lisUnableToCreateDirectory2 = 'Unable to create directory %s%s%s';
+  lisUnableToCreateDirectory = 'Unable to create directory %s%s%s.';
  lisPkgMangUnableToCreateOutputDirectoryForPackage = 'Unable to create '
    +'output directory %s%s%s%sfor package %s.';
  lisPkgMangUnableToDeleteFilename = 'Unable to delete file';
@ -3837,6 +3820,7 @@ resourcestring
    +'file for package %s is not a valid executable:%s%s';
  lisPkgMangpackageMainSourceFile = 'package main source file';
  lisErrorLoadingFile = 'Error loading file';
+  lisErrorLoadingFile2 = 'Error loading file "%s":';
  lisLoadingFailed = 'Loading %s failed.';
  lisPkgMangAddingNewDependencyForProjectPackage = '%sAdding new Dependency '
    +'for project %s: package %s%s';
--- a/ide/main.pp
+++ b/ide/main.pp
@ -6531,7 +6531,7 @@ begin
  end;
  if not FileReadable then begin
    Result:=IDEQuestionDialog(lisUnableToReadFile,
-      Format(lisUnableToReadFilename, ['"', AFilename, '"']),
+      Format(lisUnableToReadFile2, ['"', AFilename, '"']),
      mtError, [mrCancel, lisSkipFile, mrAbort, lisAbortAllLoading]);
    exit;
  end;
@ -10511,7 +10511,7 @@ begin
      or (CompareCaret(SelectedEndPos,EndPos)<0)
      then begin
        IDEMessageDialog(lisSelectionExceedsStringConstant,
-        Format(lisHintTheMakeResourcestringFunctionExpectsAStringCon2, [LineEnding]),
+        Format(lisHintTheMakeResourcestringFunctionExpectsAStringCon, [LineEnding]),
        mtError,[mbCancel]);
        exit;
      end;
--- a/ide/sourceeditor.pp
+++ b/ide/sourceeditor.pp
@ -6013,7 +6013,7 @@ begin
              mtConfirmation, [mrYes, lisChangeFile, mrCancel], '')
          else
            CurResult:=IDEQuestionDialog(lisChangeEncoding,
-              Format(lisEncodingOfFileOnDiskIsNewEncodingIs2, ['"',
+              Format(lisEncodingOfFileOnDiskIsNewEncodingIs, ['"',
                SrcEdit.CodeBuffer.Filename, '"', LineEnding, OldEncoding, NewEncoding]),
              mtConfirmation, [mrYes, lisChangeFile, mrOk,
                lisReopenWithAnotherEncoding, mrCancel], '');
--- a/packager/addtopackagedlg.pas
+++ b/packager/addtopackagedlg.pas
@ -461,7 +461,7 @@ begin
    DebugLn(['CheckAddingDependency ',LazPackage.Name,' requiring ',NewPkgName,', but is already provided by ',ProvidingAPackage.IDAsString]);
    if WarnIfAlreadyThere then
      IDEMessageDialog(lisProjAddDependencyAlreadyExists,
-        Format(lisUnableToAddTheDependencyBecauseThePackageHasAlread2, [
+        Format(lisUnableToAddTheDependencyBecauseThePackageHasAlread, [
          RequiredPackage.IDAsString, LazPackage.Name, ProvidingAPackage.Name]),
        mtError,[mbCancel]);
    exit(mrIgnore);
@ -1348,8 +1348,8 @@ begin
  except
    on E: Exception do begin
      IDEMessageDialog(lisCCOErrorCaption,
-        Format(lisErrorLoadingFile2, [AFilename, LineEnding, E.Message]), mtError, [
-          mbCancel]);
+        Format(lisErrorLoadingFile2,[AFilename]) + LineEnding + E.Message,
+        mtError, [mbCancel]);
      ComponentIconSpeedButton.Glyph.Clear;
      FComponentIconFilename:='';
      ComponentIconSpeedButton.Hint:=lisNoneClickToChooseOne;
--- a/packager/pkgmanager.pas
+++ b/packager/pkgmanager.pas
@ -743,7 +743,7 @@ begin
    except
      on E: Exception do begin
        MessageDlg(lisCCOErrorCaption,
-          Format(lisErrorLoadingFile2, [Params.IconFile, LineEnding, E.Message]),
+          Format(lisErrorLoadingFile2,[Params.IconFile]) + LineEnding + E.Message,
        mtError, [mbCancel], 0);
      end;
    end;