[115727] externalize strings that need them or mark them as non-nls

diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/XMLCorePlugin.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/XMLCorePlugin.java
index 18b5ef8..f2b8a31 100644
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/XMLCorePlugin.java
+++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/XMLCorePlugin.java

@@ -27,9 +27,9 @@
 public class XMLCorePlugin extends Plugin {
 	//The shared instance.
 	private static XMLCorePlugin plugin;	
-    public static final String USER_CATALOG_ID = "user_catalog";
-	public static final String DEFAULT_CATALOG_ID = "default_catalog";
-	public static final String SYSTEM_CATALOG_ID = "system_catalog";
+    public static final String USER_CATALOG_ID = "user_catalog"; //$NON-NLS-1$
+	public static final String DEFAULT_CATALOG_ID = "default_catalog"; //$NON-NLS-1$
+	public static final String SYSTEM_CATALOG_ID = "system_catalog"; //$NON-NLS-1$
     private CatalogSet catalogSet = new CatalogSet();
 	   
 
@@ -58,7 +58,7 @@
     private String getPluginStateLocation(String fileName)
     {
       String location = getStateLocation().append(fileName).toString();
-      String file_protocol = "file:";
+      String file_protocol = "file:"; //$NON-NLS-1$
       if (location != null && !location.startsWith(file_protocol))
       {
     	  location = file_protocol + location;

diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelhandler/EmbeddedXML.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelhandler/EmbeddedXML.java
index 823a357..d4216e7 100644
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelhandler/EmbeddedXML.java
+++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelhandler/EmbeddedXML.java

@@ -90,7 +90,7 @@
 	public boolean canHandleMimeType(String mimeType) {
 		boolean canHandle = getSupportedMimeTypes().contains(mimeType);
 		if(!canHandle) {
-			canHandle = mimeType.endsWith("+xml");
+			canHandle = mimeType.endsWith("+xml"); //$NON-NLS-1$
 		}
 		return canHandle;
 	}