diff --git a/team/bundles/org.eclipse.compare/META-INF/MANIFEST.MF b/team/bundles/org.eclipse.compare/META-INF/MANIFEST.MF index ca10e1e5aea..a3e5c70df2f 100644 --- a/team/bundles/org.eclipse.compare/META-INF/MANIFEST.MF +++ b/team/bundles/org.eclipse.compare/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.compare; singleton:=true -Bundle-Version: 3.10.0.qualifier +Bundle-Version: 3.10.100.qualifier Bundle-Activator: org.eclipse.compare.internal.CompareUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java index 123af793be6..67e31b18109 100644 --- a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java +++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java @@ -5421,8 +5421,7 @@ private void updateToolbarLabel() { int differenceCount = fMerger.changesCount(); if (tbm != null) { - String label = differenceCount > 1 ? differenceCount + " Differences" //$NON-NLS-1$ - : differenceCount == 1 ? differenceCount + " Difference" : "No Difference"; //$NON-NLS-1$ //$NON-NLS-2$ + String label = MessageFormat.format(CompareMessages.TextMergeViewer_differences, differenceCount); LabelContributionItem labelContributionItem = new LabelContributionItem(DIFF_COUNT_ID, label); diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.java b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.java index 09fedb6a744..289d69cc099 100644 --- a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.java +++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.java @@ -96,6 +96,7 @@ private CompareMessages() { public static String TextMergeViewer_atEnd_message; public static String TextMergeViewer_atBeginning_title; public static String TextMergeViewer_atBeginning_message; + public static String TextMergeViewer_differences; public static String CompareNavigator_atEnd_title; public static String CompareNavigator_atEnd_message; public static String CompareNavigator_atBeginning_title; diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties index 8cdcff78bb4..b74810b3511 100644 --- a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties +++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties @@ -81,6 +81,8 @@ TextMergeViewer_accessible_right={0} Right: {1} TextMergeViewer_atBeginning_message= Beginning of document reached. Continue from end? TextMergeViewer_accessible_ancestor=Ancestor: {0} +TextMergeViewer_differences={0,choice,0#No Difference|1#1 Difference|1<{0} Differences} + CompareNavigator_atEnd_title= End Reached CompareDialog_commit_button=C&ommit CompareDialog_error_title=Error Saving Changes