diff options
6 files changed, 14 insertions, 6 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java index b463392ac..e9e71aa51 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java @@ -853,7 +853,7 @@ public final class CompareUIPlugin extends AbstractUIPlugin { }
public static void log(Throwable e) {
- log(new Status(IStatus.ERROR, getPluginId(), INTERNAL_ERROR, CompareMessages.getString("JavaPlugin.internal_error"), e)); //$NON-NLS-1$
+ log(new Status(IStatus.ERROR, getPluginId(), INTERNAL_ERROR, CompareMessages.getString("ComparePlugin.internal_error"), e)); //$NON-NLS-1$
}
public static void log(IStatus status) {
diff --git a/bundles/org.eclipse.compare/plugin.properties b/bundles/org.eclipse.compare/plugin.properties index 776c58511..b5dfb7381 100644 --- a/bundles/org.eclipse.compare/plugin.properties +++ b/bundles/org.eclipse.compare/plugin.properties @@ -123,3 +123,7 @@ DiffNode.nameFormat= {0} / {1} #
Differencer.progressFormat= Comparing {0}
+#
+# Patch: rejected patch markers
+#
+rejectedPatchMarker.name= Rejected Patch
diff --git a/bundles/org.eclipse.compare/plugin.xml b/bundles/org.eclipse.compare/plugin.xml index d8fdbf8df..82c941017 100644 --- a/bundles/org.eclipse.compare/plugin.xml +++ b/bundles/org.eclipse.compare/plugin.xml @@ -7,7 +7,7 @@ <plugin
name="%pluginName"
id="org.eclipse.compare"
- version="1.0"
+ version="1.5.1"
provider-name="Object Technology International, Inc."
class="org.eclipse.compare.internal.CompareUIPlugin">
@@ -43,7 +43,7 @@ <!-- Extensions -->
<extension point="org.eclipse.core.resources.markers"
- id="rejectedPatchMarker" name="RejectedPatchMarker">
+ id="rejectedPatchMarker" name="%rejectedPatchMarker.name">
<super type="org.eclipse.core.resources.taskmarker"/>
<persistent value="true"/>
</extension>
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java index b463392ac..e9e71aa51 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java @@ -853,7 +853,7 @@ public final class CompareUIPlugin extends AbstractUIPlugin { }
public static void log(Throwable e) {
- log(new Status(IStatus.ERROR, getPluginId(), INTERNAL_ERROR, CompareMessages.getString("JavaPlugin.internal_error"), e)); //$NON-NLS-1$
+ log(new Status(IStatus.ERROR, getPluginId(), INTERNAL_ERROR, CompareMessages.getString("ComparePlugin.internal_error"), e)); //$NON-NLS-1$
}
public static void log(IStatus status) {
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties index 776c58511..b5dfb7381 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties @@ -123,3 +123,7 @@ DiffNode.nameFormat= {0} / {1} #
Differencer.progressFormat= Comparing {0}
+#
+# Patch: rejected patch markers
+#
+rejectedPatchMarker.name= Rejected Patch
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml index d8fdbf8df..82c941017 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml @@ -7,7 +7,7 @@ <plugin
name="%pluginName"
id="org.eclipse.compare"
- version="1.0"
+ version="1.5.1"
provider-name="Object Technology International, Inc."
class="org.eclipse.compare.internal.CompareUIPlugin">
@@ -43,7 +43,7 @@ <!-- Extensions -->
<extension point="org.eclipse.core.resources.markers"
- id="rejectedPatchMarker" name="RejectedPatchMarker">
+ id="rejectedPatchMarker" name="%rejectedPatchMarker.name">
<super type="org.eclipse.core.resources.taskmarker"/>
<persistent value="true"/>
</extension>
|