Bug 86386 - [API] Support for javadoc location per jar
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/AddVMDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/AddVMDialog.java
index c777eaa..f3fc86b 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/AddVMDialog.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/AddVMDialog.java
@@ -386,7 +386,7 @@
 	}
 	
 	private void browseForJavadocURL() {
-		URL[] urls= BuildPathDialogAccess.configureJavadocLocation(getShell(), "AddVMDialog.Select_Javadoc_location__3", getURL());
+		URL[] urls= BuildPathDialogAccess.configureJavadocLocation(getShell(), JREMessages.getString("AddVMDialog.0"), getURL()); //$NON-NLS-1$
 
 		if (urls != null) {
 			if (urls[0] == null) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREMessages.properties b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREMessages.properties
index 13a6440..cd8f403 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREMessages.properties
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREMessages.properties
@@ -61,13 +61,20 @@
 AddVMDialog.JRE_system_libraries__1=JRE system libraries:
 AddVMDialog.Java&doc_URL__1=Ja&vadoc URL:
 AddVMDialog.Bro&wse..._2=Bro&wse...
-AddVMDialog.Select_Javadoc_location__3=Select Javadoc location:
 AddVMDialog.JRE_name_must_be_a_valid_file_name__{0}_1=JRE name must be a valid file name: {0}
 AddVMDialog.Invalid_URL_syntax_specified_for_Javadoc_location._1=Invalid URL syntax specified for Javadoc location.
+AddVMDialog.23=Default VM &Arguments:
+AddVMDialog.0=JRE
 
 VMLibraryBlock.Use_default_system_libraries_1=&Use default system libraries
 VMLibraryBlock.Libraries_cannot_be_empty._1=Libraries cannot be empty.
-VMLibraryBlock.Default_libraries_do_not_exist._1=Default libraries do not exist.
 
-AddVMDialog.23=Default VM &Arguments:
 JREsUpdater.0=Save VM Definitions
+VMLibraryBlock.0=Source attachment: 
+VMLibraryBlock.1=(none)
+VMLibraryBlock.2=Javadoc location: 
+VMLibraryBlock.4=U&p
+VMLibraryBlock.5=&Down
+VMLibraryBlock.6=Re&move
+VMLibraryBlock.7=Add E&xternal JARs...
+VMLibraryBlock.8=Ed&it...
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/VMLibraryBlock.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/VMLibraryBlock.java
index 1857c2c..66710bc 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/VMLibraryBlock.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/VMLibraryBlock.java
@@ -17,7 +17,6 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
-
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
@@ -125,20 +124,20 @@
 				SubElement subElement= (SubElement) element;
 				StringBuffer text= new StringBuffer();
 				if (subElement.getType() == SubElement.SOURCE_PATH) {
-					text.append("Source attachment: ");
+					text.append(JREMessages.getString("VMLibraryBlock.0")); //$NON-NLS-1$
 					IPath systemLibrarySourcePath= subElement.getParent().getSystemLibrarySourcePath();
 					if (systemLibrarySourcePath != null && !Path.EMPTY.equals(systemLibrarySourcePath)) {
 						text.append(systemLibrarySourcePath.toOSString());
 					} else {
-						text.append("(none)");
+						text.append(JREMessages.getString("VMLibraryBlock.1")); //$NON-NLS-1$
 					}
 				} else {
-					text.append("Javadoc location: ");
+					text.append(JREMessages.getString("VMLibraryBlock.2")); //$NON-NLS-1$
 					URL javadocLocation= subElement.getParent().getJavadocLocation();
 					if (javadocLocation != null) {
 						text.append(javadocLocation.toExternalForm());
 					} else {
-						text.append("(none)");
+						text.append(JREMessages.getString("VMLibraryBlock.1")); //$NON-NLS-1$
 					}
 				}
 				return text.toString();
@@ -431,19 +430,19 @@
 		pathButtonComp.setLayoutData(gd);
 		pathButtonComp.setFont(font);
 		
-		fUpButton= createPushButton(pathButtonComp, "U&p");
+		fUpButton= createPushButton(pathButtonComp, JREMessages.getString("VMLibraryBlock.4")); //$NON-NLS-1$
 		fUpButton.addSelectionListener(this);
 		
-		fDownButton= createPushButton(pathButtonComp, "&Down");
+		fDownButton= createPushButton(pathButtonComp, JREMessages.getString("VMLibraryBlock.5")); //$NON-NLS-1$
 		fDownButton.addSelectionListener(this);
 
-		fRemoveButton= createPushButton(pathButtonComp, "Re&move");
+		fRemoveButton= createPushButton(pathButtonComp, JREMessages.getString("VMLibraryBlock.6")); //$NON-NLS-1$
 		fRemoveButton.addSelectionListener(this);
 
-		fAddButton= createPushButton(pathButtonComp, "Add E&xternal JARs...");
+		fAddButton= createPushButton(pathButtonComp, JREMessages.getString("VMLibraryBlock.7")); //$NON-NLS-1$
 		fAddButton.addSelectionListener(this);
 		
-		fEditButton= createPushButton(pathButtonComp, "Ed&it");
+		fEditButton= createPushButton(pathButtonComp, JREMessages.getString("VMLibraryBlock.8")); //$NON-NLS-1$
 		fEditButton.addSelectionListener(this);
 
 		return comp;