[git] i18n for GitDiffFromHistoryHandler

GitOrigin-RevId: 79e6ef248312933256c4d9a9e76322fc5429bfec
This commit is contained in:
Julia Beliaeva
2020-08-19 03:19:12 +00:00
committed by intellij-monorepo-bot
parent 202d233929
commit d31f6110db
2 changed files with 2 additions and 2 deletions
@@ -774,6 +774,7 @@ history.indexing.disabled.notification.dismiss.link=Don't show again
git.history.diff.handler.choose.parent.popup=Choose Parent to Compare
git.history.diff.handler.load.changes.process=Loading changes...
git.history.diff.handler.git.show.error=Error happened while executing git show {0}:{1}
git.history.diff.handler.no.changes.in.file.info=There were no changes in {0} in this merge commit, besides those which were made in both branches
git.log.show.commit.in.log.process=Searching for Revision {0}
git.compare.branches.empty.status={0} contains all commits from {1}
git.compare.branches.explanation.message=Commits that exist in {0} but don''t exist in {1}
@@ -114,8 +114,7 @@ public final class GitDiffFromHistoryHandler extends BaseDiffFromHistoryHandler<
List<VcsFileRevision> revisions = session != null ? session.getRevisionList() : null;
checkIfFileWasTouchedAndFindParentsInBackground(filePath, rev, parents, revisions, info -> {
if (!info.wasFileTouched()) {
String message = String.format("There were no changes in %s in this merge commit, besides those which were made in both branches",
filePath.getName());
String message = GitBundle.message("git.history.diff.handler.no.changes.in.file.info", filePath.getName());
VcsBalloonProblemNotifier.showOverVersionControlView(this.myProject, message, MessageType.INFO);
}
showPopup(event, rev, filePath, info.getParents());