NLS
diff --git a/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipse/browser/application/BrowserWorkbenchWindowAdvisor.java b/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipse/browser/application/BrowserWorkbenchWindowAdvisor.java
index cd7a9f9..1e01385 100644
--- a/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipse/browser/application/BrowserWorkbenchWindowAdvisor.java
+++ b/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipse/browser/application/BrowserWorkbenchWindowAdvisor.java
@@ -25,7 +25,7 @@
         configurer.setInitialSize(new Point(400, 750));
         configurer.setShowCoolBar(false);
         configurer.setShowStatusLine(false);
-        configurer.setTitle(BrowserMessages.EclipseLinksApplicationWorkbenchWindowAdvisor_title);
+        configurer.setTitle(BrowserMessages.BrowserWorkbenchWindowAdvisor_title);
     }
 
 }
diff --git a/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipse/browser/view/BrowserMessages.java b/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipse/browser/view/BrowserMessages.java
index 4f3546f..4d6e097 100644
--- a/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipse/browser/view/BrowserMessages.java
+++ b/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipse/browser/view/BrowserMessages.java
@@ -25,31 +25,31 @@
 
 	public static String CollapseAction_actionNameCollapseAll;
 
-	public static String EclipseLinkHandler_errorAttributeMissing;
+	public static String LinkHandler_errorAttributeMissing;
 
-	public static String EclipseLinkHandler_errorUnrecognizedElement;
+	public static String LinkHandler_errorUnrecognizedElement;
 
-	public static String EclipseLinksApplicationWorkbenchWindowAdvisor_title;
+	public static String BrowserWorkbenchWindowAdvisor_title;
 
-	public static String EclipseLinksView_errorMissingModelFile;
+	public static String EclipseBrowserView_errorMissingModelFile;
 
-	public static String EclipseLinksView_errorModelLoad;
+	public static String EclipseBrowserView_errorModelLoad;
 
-	public static String EclipseLinksView_sectionDescProjectLinks;
+	public static String EclipseBrowserView_sectionDescProjectLinks;
 
-	public static String EclipseLinksView_sectionDescSearch;
+	public static String EclipseBrowserView_sectionDescSearch;
 
-	public static String EclipseLinksView_sectionDescUsefulLinks;
+	public static String EclipseBrowserView_sectionDescUsefulLinks;
 
-	public static String EclipseLinksView_sectionTitleProjectLinks;
+	public static String EclipseBrowserView_sectionTitleProjectLinks;
 
-	public static String EclipseLinksView_sectionTitleSearch;
+	public static String EclipseBrowserView_sectionTitleSearch;
 
-	public static String EclipseLinksView_sectionTitleUsefulLinks;
+	public static String EclipseBrowserView_sectionTitleUsefulLinks;
 
-	public static String EclipseLinksView_titleEclipseLinks;
+	public static String EclipseBrowserView_title;
 
-	public static String EclipseSearchSection_buttonNameSearch;
+	public static String SearchSection_buttonNameSearch;
 
 	public static String ExternalBrowserAction_actionNameExternalBrowser;
 
diff --git a/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipse/browser/view/messages.properties b/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipse/browser/view/messages.properties
index f58117e..a746c1e 100644
--- a/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipse/browser/view/messages.properties
+++ b/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipse/browser/view/messages.properties
@@ -1,15 +1,15 @@
-EclipseLinkHandler_errorAttributeMissing=ERROR: Attribute missing
-EclipseLinksView_sectionTitleUsefulLinks=Useful Links
-EclipseLinksView_sectionDescUsefulLinks=Click on a link to open the associated web site in a browser.
-EclipseLinksView_sectionTitleProjectLinks=Project Links
-EclipseLinksView_sectionDescProjectLinks=Double-click on a node to open the associated web site in a browser.
-EclipseLinksView_sectionTitleSearch=Search
-EclipseLinksView_sectionDescSearch=Enter a query into the text field and press enter to perform a Google search.
-EclipseLinksView_titleEclipseLinks=Eclipse Links
-EclipseLinksView_errorMissingModelFile=Cannot find model XML file: ''{0}''
-EclipseSearchSection_buttonNameSearch=Search
-EclipseLinksView_errorModelLoad=Model load failure
-EclipseLinkHandler_errorUnrecognizedElement=ERROR: Unrecognized element: ''{0}''
+LinkHandler_errorAttributeMissing=ERROR: Attribute missing
+EclipseBrowserView_sectionTitleUsefulLinks=Useful Links
+EclipseBrowserView_sectionDescUsefulLinks=Click on a link to open the associated web site in a browser.
+EclipseBrowserView_sectionTitleProjectLinks=Project Links
+EclipseBrowserView_sectionDescProjectLinks=Double-click on a node to open the associated web site in a browser.
+EclipseBrowserView_sectionTitleSearch=Search
+EclipseBrowserView_sectionDescSearch=Enter a query into the text field and press enter to perform a Google search.
+EclipseBrowserView_title=Eclipse Browser
+EclipseBrowserView_errorMissingModelFile=Cannot find model XML file: ''{0}''
+SearchSection_buttonNameSearch=Search
+EclipseBrowserView_errorModelLoad=Model load failure
+LinkHandler_errorUnrecognizedElement=ERROR: Unrecognized element: ''{0}''
 ExternalBrowserAction_actionNameExternalBrowser=Use External Browser
 ExternalBrowserAction_toolTipExternalBrowser=Use an external browser to open links
 OpenLinkAction_actionNameOpenLink=Open Link
@@ -30,4 +30,4 @@
 UsefulLinkManager_errorRequiredAttributeMissing=Required ''{0}'' attribute not specified
 UsefulLinkManager_errorMissingAttribute=Missing attribute: ''{0}''
 UsefulLinkManager_defaultMsgDescriptionNotSpecified=Description not specified.
-EclipseLinksApplicationWorkbenchWindowAdvisor_title=Links
\ No newline at end of file
+BrowserWorkbenchWindowAdvisor_title=Eclipse Browser Application
\ No newline at end of file
diff --git a/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipse/browser/view/model/LinkHandler.java b/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipse/browser/view/model/LinkHandler.java
index a1ddab2..2c8fe4d 100644
--- a/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipse/browser/view/model/LinkHandler.java
+++ b/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipse/browser/view/model/LinkHandler.java
@@ -15,6 +15,7 @@
 import java.util.Stack;
 
 import org.eclipse.browser.view.BrowserMessages;
+import org.eclipse.osgi.util.NLS;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -84,7 +85,7 @@
 		if ((attr_name == null) ||
 				(attr_link == null) ||
 				(attr_description == null)) {
-			throw new SAXException(BrowserMessages.EclipseLinkHandler_errorAttributeMissing);
+			throw new SAXException(BrowserMessages.LinkHandler_errorAttributeMissing);
 		}
 
 		// Get the parent object
@@ -108,7 +109,7 @@
 		} else {
 			// Unrecognized element
 			throw new SAXException(
-					BrowserMessages.bind(BrowserMessages.EclipseLinkHandler_errorUnrecognizedElement, name));
+					NLS.bind(BrowserMessages.LinkHandler_errorUnrecognizedElement, name));
 		}		
 		// Set the link object fields
 		linkObject.setFieldName(attr_name);
diff --git a/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipse/browser/view/ui/EclipseBrowserView.java b/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipse/browser/view/ui/EclipseBrowserView.java
index 4dc0244..9f6a576 100644
--- a/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipse/browser/view/ui/EclipseBrowserView.java
+++ b/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipse/browser/view/ui/EclipseBrowserView.java
@@ -27,6 +27,7 @@
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
 import org.eclipse.swt.layout.GridData;
@@ -154,7 +155,7 @@
 	 */
 	private void createUIHeader() {
 		Form form = createUIForm(fSashForm, 0, 0, GridData.FILL_BOTH);
-		form.setText(BrowserMessages.EclipseLinksView_titleEclipseLinks);
+		form.setText(BrowserMessages.EclipseBrowserView_title);
 	}
 
 	/**
@@ -204,8 +205,8 @@
 		int style = Section.DESCRIPTION | ExpandableComposite.TITLE_BAR
 				| ExpandableComposite.TWISTIE;
 		fEclipseUsefulLinksSection = new UsefulLinksSection(this,
-				parent, fToolkit, style, BrowserMessages.EclipseLinksView_sectionTitleUsefulLinks,
-				BrowserMessages.EclipseLinksView_sectionDescUsefulLinks);
+				parent, fToolkit, style, BrowserMessages.EclipseBrowserView_sectionTitleUsefulLinks,
+				BrowserMessages.EclipseBrowserView_sectionDescUsefulLinks);
 		fEclipseUsefulLinksSection.createUI();		
 	}
 
@@ -214,7 +215,7 @@
 	 */
 	private void createUISectionProjectLinks(Composite parent) {
 		int style = Section.DESCRIPTION | ExpandableComposite.TITLE_BAR;
-		fEclipseProjectLinksSection = new ProjectLinksSection(this, parent, fToolkit, style, BrowserMessages.EclipseLinksView_sectionTitleProjectLinks, BrowserMessages.EclipseLinksView_sectionDescProjectLinks);
+		fEclipseProjectLinksSection = new ProjectLinksSection(this, parent, fToolkit, style, BrowserMessages.EclipseBrowserView_sectionTitleProjectLinks, BrowserMessages.EclipseBrowserView_sectionDescProjectLinks);
 		fEclipseProjectLinksSection.createUI();
 	}
 
@@ -225,8 +226,8 @@
 		int style = Section.DESCRIPTION | ExpandableComposite.TITLE_BAR
 				| ExpandableComposite.TWISTIE;
 		fEclipseSearchSection = new SearchSection(this, parent,
-				fToolkit, style, BrowserMessages.EclipseLinksView_sectionTitleSearch,
-				BrowserMessages.EclipseLinksView_sectionDescSearch);
+				fToolkit, style, BrowserMessages.EclipseBrowserView_sectionTitleSearch,
+				BrowserMessages.EclipseBrowserView_sectionDescSearch);
 		fEclipseSearchSection.createUI();			
 	}
 	
@@ -316,10 +317,10 @@
 		URL url = BrowserPlugin.getDefault().getBundle().getEntry(F_DEFAULT_MODEL_FILE);
 		// Ensure the model XML file was found in the bundle
 		if (url == null) {
-			String message = BrowserMessages.bind(
-					BrowserMessages.EclipseLinksView_errorMissingModelFile, 
+			String message = NLS.bind(
+					BrowserMessages.EclipseBrowserView_errorMissingModelFile, 
 					url.toString());
-			BrowserPlugin.logException(BrowserMessages.EclipseLinksView_errorModelLoad, message, new Exception(message));
+			BrowserPlugin.logException(BrowserMessages.EclipseBrowserView_errorModelLoad, message, new Exception(message));
 			return false;
 		}
 		// Try to load the model
@@ -331,7 +332,7 @@
 			// Load the model
 			fModel.load();			
 		} catch (Exception e) {
-			BrowserPlugin.logException(BrowserMessages.EclipseLinksView_errorModelLoad, e.getMessage(), e);
+			BrowserPlugin.logException(BrowserMessages.EclipseBrowserView_errorModelLoad, e.getMessage(), e);
 			return false;
 		}
 		
diff --git a/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipse/browser/view/ui/actions/OpenLinkAction.java b/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipse/browser/view/ui/actions/OpenLinkAction.java
index 1c81602..56a3be3 100644
--- a/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipse/browser/view/ui/actions/OpenLinkAction.java
+++ b/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipse/browser/view/ui/actions/OpenLinkAction.java
@@ -19,6 +19,7 @@
 import org.eclipse.browser.view.BrowserPluginImages;
 import org.eclipse.browser.view.model.LinkObject;
 import org.eclipse.jface.action.Action;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.browser.IWebBrowser;
@@ -118,7 +119,7 @@
 			setLink(null);
 			setName(null);
 		} else {
-			setToolTipText(BrowserMessages.bind(
+			setToolTipText(NLS.bind(
 					BrowserMessages.OpenLinkAction_toolTipOpenLink, 
 					linkObject.getFieldName()));
 			setLink(linkObject.getFieldLink());
diff --git a/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipse/browser/view/ui/sections/SearchSection.java b/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipse/browser/view/ui/sections/SearchSection.java
index de7d9a8..9672b4f 100644
--- a/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipse/browser/view/ui/sections/SearchSection.java
+++ b/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipse/browser/view/ui/sections/SearchSection.java
@@ -73,7 +73,7 @@
 	 * @param parent
 	 */
 	private void createUIButtonSearch(Composite parent) {
-		fSearchButton = getToolkit().createButton(parent, BrowserMessages.EclipseSearchSection_buttonNameSearch, SWT.PUSH);
+		fSearchButton = getToolkit().createButton(parent, BrowserMessages.SearchSection_buttonNameSearch, SWT.PUSH);
 		GridData data = new GridData(GridData.VERTICAL_ALIGN_CENTER);
 		fSearchButton.setLayoutData(data);
 	}
diff --git a/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipse/browser/view/util/UsefulLinkManager.java b/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipse/browser/view/util/UsefulLinkManager.java
index 6e29d0b..d304dd5 100644
--- a/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipse/browser/view/util/UsefulLinkManager.java
+++ b/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipse/browser/view/util/UsefulLinkManager.java
@@ -18,6 +18,7 @@
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.osgi.util.NLS;
 
 /**
  * UsefulLinkManager
@@ -66,10 +67,10 @@
 			if ((name == null) ||
 					(name.length() == 0)) {
 				BrowserPlugin.logException(
-						BrowserMessages.bind(
+						NLS.bind(
 								BrowserMessages.UsefulLinkManager_errorRequiredAttributeMissing, 
 								F_ATTRIBUTE_NAME), 
-						BrowserMessages.bind(
+						NLS.bind(
 								BrowserMessages.UsefulLinkManager_errorMissingAttribute, 
 								F_ATTRIBUTE_NAME), 
 						new Exception());
@@ -78,10 +79,10 @@
 			if ((link == null) ||
 					(link.length() == 0)) {
 				BrowserPlugin.logException(
-						BrowserMessages.bind(
+						NLS.bind(
 								BrowserMessages.UsefulLinkManager_errorRequiredAttributeMissing, 
 								F_ATTRIBUTE_LINK), 
-						BrowserMessages.bind(
+						NLS.bind(
 								BrowserMessages.UsefulLinkManager_errorMissingAttribute, 
 								F_ATTRIBUTE_LINK), 
 						new Exception());