### Eclipse Workspace Patch 1.0
#P org.eclipse.mylyn
Index: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaQueryTypeWizardPage.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaQueryTypeWizardPage.java,v
retrieving revision 1.16
diff -u -r1.16 BugzillaQueryTypeWizardPage.java
--- org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaQueryTypeWizardPage.java	12 Sep 2008 04:15:33 -0000	1.16
+++ org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaQueryTypeWizardPage.java	1 Nov 2008 11:42:23 -0000
@@ -11,6 +11,7 @@
 
 package org.eclipse.mylyn.internal.bugzilla.ui.tasklist;
 
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.wizard.IWizardPage;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.mylyn.internal.bugzilla.ui.search.BugzillaSearchPage;
@@ -27,13 +28,13 @@
  */
 public class BugzillaQueryTypeWizardPage extends WizardPage {
 
-	private static final String BUTTON_LABEL_QUERY = "&Create query from existing URL";
+	private static final String BUTTON_LABEL_QUERY = Messages.BugzillaQueryTypeWizardPage_Create_query_from_existing_URL;
 
-	private static final String BUTTON_LABEL_FORM = "Cre&ate query using form";
+	private static final String BUTTON_LABEL_FORM = Messages.BugzillaQueryTypeWizardPage_Create_query_using_form;
 
-	private static final String TITLE = "Choose query type";
+	private static final String TITLE = Messages.BugzillaQueryTypeWizardPage_Choose_query_type;
 
-	private static final String DESCRIPTION = "Select from the available query types.";
+	private static final String DESCRIPTION = Messages.BugzillaQueryTypeWizardPage_Select_from_the_available_query_types;
 
 	private Button buttonCustom;
 
@@ -71,6 +72,7 @@
 
 		setPageComplete(true);
 		setControl(composite);
+		Dialog.applyDialogFont(composite);
 	}
 
 	@Override
Index: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskListMigrator.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskListMigrator.java,v
retrieving revision 1.7
diff -u -r1.7 BugzillaTaskListMigrator.java
--- org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskListMigrator.java	12 Sep 2008 04:15:33 -0000	1.7
+++ org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskListMigrator.java	1 Nov 2008 11:42:23 -0000
@@ -28,11 +28,11 @@
  */
 public class BugzillaTaskListMigrator extends AbstractTaskListMigrator {
 
-	private static final String TAG_BUGZILLA_REPORT = "BugzillaReport";
+	private static final String TAG_BUGZILLA_REPORT = "BugzillaReport"; //$NON-NLS-1$
 
-	private static final String KEY_SEVERITY = "bugzilla.severity";
+	private static final String KEY_SEVERITY = "bugzilla.severity"; //$NON-NLS-1$
 
-	private static final String KEY_PRODUCT = "bugzilla.product";
+	private static final String KEY_PRODUCT = "bugzilla.product"; //$NON-NLS-1$
 
 	@Override
 	public String getConnectorKind() {
Index: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/StackTrace.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/StackTrace.java,v
retrieving revision 1.8
diff -u -r1.8 StackTrace.java
--- org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/StackTrace.java	12 Sep 2008 04:15:33 -0000	1.8
+++ org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/StackTrace.java	1 Nov 2008 11:42:23 -0000
@@ -105,11 +105,11 @@
 
 		// setup the regex used to determine if it looks like we are at a
 		// stack trace and whether it is something that should be skipped
-		String regexExceptionType = "^(.*\\.)+.+(Exception|Error|Throwable).*";
-		String regexSkip = ".*\\.\\..*";
+		String regexExceptionType = "^(.*\\.)+.+(Exception|Error|Throwable).*"; //$NON-NLS-1$
+		String regexSkip = ".*\\.\\..*"; //$NON-NLS-1$
 
 		// get all of the individual lines for the string
-		String[] lines = s.split("\r\n|\n");
+		String[] lines = s.split("\r\n|\n"); //$NON-NLS-1$
 
 		// the character start of the current stack trace
 		int charStackStart = 0;
@@ -205,8 +205,8 @@
 	 *         charPos is updated as well as i
 	 */
 	private static String getNextAt(String[] lines, int[] i, int[] charPos) {
-		String regexAtString = "^at.*";
-		String regexEndString = ".*:\\d+\\)$";
+		String regexAtString = "^at.*"; //$NON-NLS-1$
+		String regexEndString = ".*:\\d+\\)$"; //$NON-NLS-1$
 		int index = i[0];
 		String l1, l2, l3, l4;
 		l1 = l2 = l3 = l4 = null;
@@ -289,9 +289,9 @@
 	 * @return The StackTrace for the given data
 	 */
 	private static StackTrace getStackTrace(List<String> l, int offset, int length, Object comment) {
-		String s = "";
+		String s = ""; //$NON-NLS-1$
 		for (String s2 : l) {
-			s += s2 + "\r\n";
+			s += s2 + "\r\n"; //$NON-NLS-1$
 		}
 
 		return new StackTrace(s, offset, length, comment);
@@ -352,21 +352,21 @@
 		String sFixed = s;
 
 		// replace all special regex characters
-		sFixed = sFixed.replaceAll("\\\\", "\\\\\\\\");
-		sFixed = sFixed.replaceAll("\\$", "\\\\\\$");
-		sFixed = sFixed.replaceAll("\\.", "\\\\.");
-		sFixed = sFixed.replaceAll("\\?", "\\\\?");
-		sFixed = sFixed.replaceAll("\\{", "\\\\{");
-		sFixed = sFixed.replaceAll("\\}", "\\\\}");
-		sFixed = sFixed.replaceAll("\\(", "\\\\(");
-		sFixed = sFixed.replaceAll("\\)", "\\\\)");
-		sFixed = sFixed.replaceAll("\\[", "\\\\[");
-		sFixed = sFixed.replaceAll("\\]", "\\\\]");
-		sFixed = sFixed.replaceAll("\\+", "\\\\+");
-		sFixed = sFixed.replaceAll("\\*", "\\\\*");
-		sFixed = sFixed.replaceAll("\\|", "\\\\|");
-		sFixed = sFixed.replaceAll("\\^", "\\\\^");
-		sFixed = sFixed.replaceAll("\\/", "\\\\/");
+		sFixed = sFixed.replaceAll("\\\\", "\\\\\\\\"); //$NON-NLS-1$ //$NON-NLS-2$
+		sFixed = sFixed.replaceAll("\\$", "\\\\\\$"); //$NON-NLS-1$ //$NON-NLS-2$
+		sFixed = sFixed.replaceAll("\\.", "\\\\."); //$NON-NLS-1$ //$NON-NLS-2$
+		sFixed = sFixed.replaceAll("\\?", "\\\\?"); //$NON-NLS-1$ //$NON-NLS-2$
+		sFixed = sFixed.replaceAll("\\{", "\\\\{"); //$NON-NLS-1$ //$NON-NLS-2$
+		sFixed = sFixed.replaceAll("\\}", "\\\\}"); //$NON-NLS-1$ //$NON-NLS-2$
+		sFixed = sFixed.replaceAll("\\(", "\\\\("); //$NON-NLS-1$ //$NON-NLS-2$
+		sFixed = sFixed.replaceAll("\\)", "\\\\)"); //$NON-NLS-1$ //$NON-NLS-2$
+		sFixed = sFixed.replaceAll("\\[", "\\\\["); //$NON-NLS-1$ //$NON-NLS-2$
+		sFixed = sFixed.replaceAll("\\]", "\\\\]"); //$NON-NLS-1$ //$NON-NLS-2$
+		sFixed = sFixed.replaceAll("\\+", "\\\\+"); //$NON-NLS-1$ //$NON-NLS-2$
+		sFixed = sFixed.replaceAll("\\*", "\\\\*"); //$NON-NLS-1$ //$NON-NLS-2$
+		sFixed = sFixed.replaceAll("\\|", "\\\\|"); //$NON-NLS-1$ //$NON-NLS-2$
+		sFixed = sFixed.replaceAll("\\^", "\\\\^"); //$NON-NLS-1$ //$NON-NLS-2$
+		sFixed = sFixed.replaceAll("\\/", "\\\\/"); //$NON-NLS-1$ //$NON-NLS-2$
 
 		return sFixed;
 	}
Index: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaCustomQueryWizardPage.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaCustomQueryWizardPage.java,v
retrieving revision 1.34
diff -u -r1.34 BugzillaCustomQueryWizardPage.java
--- org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaCustomQueryWizardPage.java	12 Sep 2008 04:15:33 -0000	1.34
+++ org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaCustomQueryWizardPage.java	1 Nov 2008 11:42:23 -0000
@@ -12,6 +12,7 @@
 
 package org.eclipse.mylyn.internal.bugzilla.ui.tasklist;
 
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
 import org.eclipse.mylyn.tasks.core.IRepositoryQuery;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
@@ -33,13 +34,13 @@
  */
 public class BugzillaCustomQueryWizardPage extends AbstractRepositoryQueryPage {
 
-	private static final String LABEL_CUSTOM_TITLE = "&Query Title:";
+	private static final String LABEL_CUSTOM_TITLE = Messages.BugzillaCustomQueryWizardPage_Query_Title;
 
-	private static final String LABEL_CUSTOM_QUERY = "Query &URL";
+	private static final String LABEL_CUSTOM_QUERY = Messages.BugzillaCustomQueryWizardPage_Query_URL;
 
-	private static final String TITLE = "Create query from URL";
+	private static final String TITLE = Messages.BugzillaCustomQueryWizardPage_Create_query_from_URL;
 
-	private static final String DESCRIPTION = "Enter the title and URL for the query";
+	private static final String DESCRIPTION = Messages.BugzillaCustomQueryWizardPage_Enter_the_title_and_URL_for_the_query;
 
 	private Text queryText;
 
@@ -91,6 +92,7 @@
 			queryTitle.setText(query.getSummary());
 			queryText.setText(query.getUrl());
 		}
+		Dialog.applyDialogFont(composite);
 	}
 
 	@Override
@@ -109,7 +111,7 @@
 			if (queryText.getText().length() > 0) {
 				return true;
 			}
-			setErrorMessage("Please specify Query URL");
+			setErrorMessage(Messages.BugzillaCustomQueryWizardPage_Please_specify_Query_URL);
 		}
 		return false;
 	}
Index: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaCustomQueryDialog.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaCustomQueryDialog.java,v
retrieving revision 1.6
diff -u -r1.6 BugzillaCustomQueryDialog.java
--- org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaCustomQueryDialog.java	12 Sep 2008 04:15:33 -0000	1.6
+++ org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaCustomQueryDialog.java	1 Nov 2008 11:42:23 -0000
@@ -29,7 +29,7 @@
 public class BugzillaCustomQueryDialog extends Dialog {
 	private String url;
 
-	private String name = "";
+	private String name = ""; //$NON-NLS-1$
 
 	private String startingUrl = null;
 
@@ -67,7 +67,7 @@
 		custom.setLayout(gl);
 
 		Label l = new Label(custom, SWT.NONE);
-		l.setText("Bugzilla Query Category Name");
+		l.setText(Messages.BugzillaCustomQueryDialog_Bugzilla_Query_Category_Name);
 
 		nameText = new Text(custom, SWT.BORDER | SWT.SINGLE);
 		if (name != null) {
@@ -78,7 +78,7 @@
 		nameText.setLayoutData(gd);
 
 		l = new Label(custom, SWT.NONE);
-		l.setText("Max Hits Returned (-1 means all)");
+		l.setText(Messages.BugzillaCustomQueryDialog_Max_Hits_Returned__1_means_all_);
 
 		maxHitsText = new Text(custom, SWT.BORDER | SWT.SINGLE);
 		if (maxHits != null) {
@@ -89,7 +89,7 @@
 		maxHitsText.setLayoutData(gd);
 
 		l = new Label(custom, SWT.NONE);
-		l.setText("Query URL");
+		l.setText(Messages.BugzillaCustomQueryDialog_Query_URL);
 
 		queryText = new Text(custom, SWT.BORDER | SWT.SINGLE);
 		if (startingUrl != null) {
Index: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java,v
retrieving revision 1.88
diff -u -r1.88 BugzillaRepositorySettingsPage.java
--- org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java	12 Sep 2008 04:15:33 -0000	1.88
+++ org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java	1 Nov 2008 11:42:23 -0000
@@ -54,21 +54,21 @@
  */
 public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPage {
 
-	private static final String TOOLTIP_AUTODETECTION_ENABLED = "Override auto detection of Platform and OS for new bug reports.";
+	private static final String TOOLTIP_AUTODETECTION_ENABLED = Messages.BugzillaRepositorySettingsPage_Override_auto_detection_of_Platform_and_OS_for_new_bug_reports;
 
-	private static final String TOOLTIP_AUTODETECTION_DISABLED = "Available once repository has been created.";
+	private static final String TOOLTIP_AUTODETECTION_DISABLED = Messages.BugzillaRepositorySettingsPage_Available_once_repository_has_been_created;
 
 	//private static final String TOOLTIP_CACHED_CONFIGURATION = "Use for repositories that explicitly state that they support this customization.";
 
 	//private static final String LABEL_CACHED_CONFIGURATION = "Cached configuration:";
 
-	private static final String LABEL_SHORT_LOGINS = "Local users enabled:";
+	private static final String LABEL_SHORT_LOGINS = Messages.BugzillaRepositorySettingsPage_Local_users_enabled;
 
-	public static final String LABEL_AUTOMATIC_VERSION = "Automatic (Use Validate Settings)";
+	public static final String LABEL_AUTOMATIC_VERSION = Messages.BugzillaRepositorySettingsPage_Automatic__Use_Validate_Settings_;
 
-	private static final String TITLE = "Bugzilla Repository Settings";
+	private static final String TITLE = Messages.BugzillaRepositorySettingsPage_Bugzilla_Repository_Settings;
 
-	private static final String DESCRIPTION = "Example: https://bugs.eclipse.org/bugs (do not include index.cgi)";
+	private static final String DESCRIPTION = Messages.BugzillaRepositorySettingsPage_EXAMPLE_HTTP_WWW_ECLIPSE_ORG_BUGS;
 
 	protected Combo repositoryVersionCombo;
 
@@ -116,7 +116,7 @@
 		addRepositoryTemplatesToServerUrlCombo();
 
 		Label repositoryVersionLabel = new Label(parent, SWT.NONE);
-		repositoryVersionLabel.setText("Repository version: ");
+		repositoryVersionLabel.setText(Messages.BugzillaRepositorySettingsPage_Repository_version_);
 		repositoryVersionCombo = new Combo(parent, SWT.READ_ONLY);
 
 		repositoryVersionCombo.add(LABEL_AUTOMATIC_VERSION);
@@ -188,7 +188,7 @@
 		}
 
 		Label defaultPlatformLabel = new Label(parent, SWT.NONE);
-		defaultPlatformLabel.setText("Autodetect platform and os");
+		defaultPlatformLabel.setText(Messages.BugzillaRepositorySettingsPage_AUTOTETECT_PLATFORM_AND_OS);
 		if (null == repository) {
 			defaultPlatformLabel.setToolTipText(TOOLTIP_AUTODETECTION_DISABLED);
 		} else {
@@ -214,7 +214,7 @@
 							public void run(IProgressMonitor monitor) throws InvocationTargetException,
 									InterruptedException {
 								try {
-									monitor.beginTask("Retrieving repository configuration", IProgressMonitor.UNKNOWN);
+									monitor.beginTask(Messages.BugzillaRepositorySettingsPage_Retrieving_repository_configuration, IProgressMonitor.UNKNOWN);
 									repositoryConfiguration = BugzillaCorePlugin.getRepositoryConfiguration(repository,
 											false, monitor);
 									if (repositoryConfiguration != null) {
@@ -264,7 +264,7 @@
 		defaultOSCombo = new Combo(platformOSContainer, SWT.READ_ONLY);
 		populateOsCombo();
 
-		new Label(parent, SWT.NONE).setText("Language: ");
+		new Label(parent, SWT.NONE).setText(Messages.BugzillaRepositorySettingsPage_Language_);
 		languageSettingCombo = new Combo(parent, SWT.DROP_DOWN);
 
 		for (BugzillaLanguageSettings bugzillaLanguageSettings : BugzillaCorePlugin.getDefault().getLanguageSettings()) {
@@ -272,7 +272,7 @@
 		}
 		if (repository != null) {
 			String language = repository.getProperty(IBugzillaConstants.BUGZILLA_LANGUAGE_SETTING);
-			if (language != null && !language.equals("") && languageSettingCombo.indexOf(language) >= 0) {
+			if (language != null && !language.equals("") && languageSettingCombo.indexOf(language) >= 0) { //$NON-NLS-1$
 				languageSettingCombo.select(languageSettingCombo.indexOf(language));
 			}
 		}
@@ -298,7 +298,7 @@
 				defaultOSCombo.select(0);
 			}
 		} else {
-			defaultOSCombo.add("All");
+			defaultOSCombo.add(Messages.BugzillaRepositorySettingsPage_All);
 			defaultOSCombo.select(0);
 		}
 		defaultOSCombo.getParent().pack(true);
@@ -320,7 +320,7 @@
 				defaultPlatformCombo.select(0);
 			}
 		} else {
-			defaultPlatformCombo.add("All");
+			defaultPlatformCombo.add(Messages.BugzillaRepositorySettingsPage_All);
 			defaultPlatformCombo.select(0);
 		}
 		defaultPlatformCombo.getParent().pack(true);
@@ -348,7 +348,7 @@
 				}
 				if (i == -1) {
 					StatusHandler.log(new Status(IStatus.INFO, BugzillaUiPlugin.ID_PLUGIN,
-							"Could not resolve repository version: " + version));
+							"Could not resolve repository version: " + version)); //$NON-NLS-1$
 					i = repositoryVersionCombo.indexOf(IBugzillaConstants.SERVER_VERSION_DEFAULT.toString());
 					if (i != -1) {
 						repositoryVersionCombo.select(i);
@@ -388,7 +388,7 @@
 		boolean erg = super.isPageComplete();
 		if (erg) {
 			if (getVersion().compareTo(LABEL_AUTOMATIC_VERSION) == 0) {
-				setErrorMessage("Validate Settings or select repository version under Additional Settings section.");
+				setErrorMessage(Messages.BugzillaRepositorySettingsPage_Validate_Settings_or_select_repository_version_under_Additional_Settings_section);
 				erg = false;
 			}
 		}
@@ -451,7 +451,7 @@
 			IStatus status;
 			if (e instanceof MalformedURLException) {
 				status = new BugzillaStatus(IStatus.WARNING, BugzillaCorePlugin.ID_PLUGIN,
-						RepositoryStatus.ERROR_NETWORK, "Server URL is invalid.");
+						RepositoryStatus.ERROR_NETWORK, Messages.BugzillaRepositorySettingsPage_Server_URL_is_invalid);
 			} else if (e instanceof CoreException) {
 				status = ((CoreException) e).getStatus();
 			} else if (e instanceof IOException) {
@@ -470,7 +470,7 @@
 				monitor = new NullProgressMonitor();
 			}
 			try {
-				monitor.beginTask("Validating server settings", IProgressMonitor.UNKNOWN);
+				monitor.beginTask(Messages.BugzillaRepositorySettingsPage_Validating_server_settings, IProgressMonitor.UNKNOWN);
 				BugzillaClient client = null;
 
 				boolean checkVersion = versions[0] == null;
Index: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaConnectorUi.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaConnectorUi.java,v
retrieving revision 1.37
diff -u -r1.37 BugzillaConnectorUi.java
--- org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaConnectorUi.java	23 Oct 2008 02:18:24 -0000	1.37
+++ org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaConnectorUi.java	1 Nov 2008 11:42:23 -0000
@@ -12,6 +12,7 @@
 
 package org.eclipse.mylyn.internal.bugzilla.ui.tasklist;
 
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
@@ -46,18 +47,18 @@
  */
 public class BugzillaConnectorUi extends AbstractRepositoryConnectorUi {
 
-	private static final String regexp = "(duplicate of|bug|task)( ?#? ?)(\\d+)";
+	private static final String regexp = "(duplicate of|bug|task)( ?#? ?)(\\d+)"; //$NON-NLS-1$
 
 	private static final Pattern PATTERN = Pattern.compile(regexp, Pattern.CASE_INSENSITIVE);
 
 	@Override
 	public String getAccountCreationUrl(TaskRepository taskRepository) {
-		return taskRepository.getRepositoryUrl() + "/createaccount.cgi";
+		return taskRepository.getRepositoryUrl() + "/createaccount.cgi"; //$NON-NLS-1$
 	}
 
 	@Override
 	public String getAccountManagementUrl(TaskRepository taskRepository) {
-		return taskRepository.getRepositoryUrl() + "/userprefs.cgi";
+		return taskRepository.getRepositoryUrl() + "/userprefs.cgi"; //$NON-NLS-1$
 	}
 
 	@Override
@@ -68,11 +69,12 @@
 	@Override
 	public String getReplyText(TaskRepository taskRepository, ITask task, ITaskComment taskComment, boolean includeTask) {
 		if (taskComment == null) {
-			return "(In reply to comment #0)";
+			return Messages.BugzillaConnectorUi__In_reply_to_comment_0_;
 		} else if (includeTask) {
-			return "(In reply to " + task.getTaskKey() + " comment #" + taskComment.getNumber() + ")";
+			return MessageFormat.format(Messages.BugzillaConnectorUi__In_reply_to_X_comment_X_, task.getTaskKey(),
+					taskComment.getNumber());
 		} else {
-			return "(In reply to comment #" + taskComment.getNumber() + ")";
+			return MessageFormat.format(Messages.BugzillaConnectorUi__In_reply_to_comment_X_, taskComment.getNumber());
 		}
 	}
 
@@ -81,11 +83,11 @@
 	@Override
 	public List<LegendElement> getLegendElements() {
 		List<LegendElement> legendItems = new ArrayList<LegendElement>();
-		legendItems.add(LegendElement.createTask("blocker", BugzillaImages.OVERLAY_CRITICAL));
-		legendItems.add(LegendElement.createTask("critical", BugzillaImages.OVERLAY_CRITICAL));
-		legendItems.add(LegendElement.createTask("major", BugzillaImages.OVERLAY_MAJOR));
-		legendItems.add(LegendElement.createTask("enhancement", BugzillaImages.OVERLAY_ENHANCEMENT));
-		legendItems.add(LegendElement.createTask("trivial", BugzillaImages.OVERLAY_MINOR));
+		legendItems.add(LegendElement.createTask("blocker", BugzillaImages.OVERLAY_CRITICAL)); //$NON-NLS-1$
+		legendItems.add(LegendElement.createTask("critical", BugzillaImages.OVERLAY_CRITICAL)); //$NON-NLS-1$
+		legendItems.add(LegendElement.createTask("major", BugzillaImages.OVERLAY_MAJOR)); //$NON-NLS-1$
+		legendItems.add(LegendElement.createTask("enhancement", BugzillaImages.OVERLAY_ENHANCEMENT)); //$NON-NLS-1$
+		legendItems.add(LegendElement.createTask("trivial", BugzillaImages.OVERLAY_MINOR)); //$NON-NLS-1$
 		return legendItems;
 	}
 
@@ -94,13 +96,13 @@
 		String severity = task.getAttribute(BugzillaAttribute.BUG_SEVERITY.getKey());
 		if (severity != null) {
 			// XXX: refactor to use configuration
-			if ("blocker".equals(severity) || "critical".equals(severity)) {
+			if ("blocker".equals(severity) || "critical".equals(severity)) { //$NON-NLS-1$ //$NON-NLS-2$
 				return BugzillaImages.OVERLAY_CRITICAL;
-			} else if ("major".equals(severity)) {
+			} else if ("major".equals(severity)) { //$NON-NLS-1$
 				return BugzillaImages.OVERLAY_MAJOR;
-			} else if ("enhancement".equals(severity)) {
+			} else if ("enhancement".equals(severity)) { //$NON-NLS-1$
 				return BugzillaImages.OVERLAY_ENHANCEMENT;
-			} else if ("trivial".equals(severity) || "minor".equals(severity)) {
+			} else if ("trivial".equals(severity) || "minor".equals(severity)) { //$NON-NLS-1$ //$NON-NLS-2$
 				return BugzillaImages.OVERLAY_MINOR;
 			} else {
 				return null;
@@ -183,7 +185,7 @@
 
 		int start = -1;
 
-		if (m.group().startsWith("duplicate")) {
+		if (m.group().startsWith("duplicate")) { //$NON-NLS-1$
 			start = m.start() + m.group().indexOf(m.group(TASK_NUM_GROUP));
 		} else {
 			start = m.start();
Index: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaSearchHandler.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaSearchHandler.java,v
retrieving revision 1.2
diff -u -r1.2 BugzillaSearchHandler.java
--- org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaSearchHandler.java	12 Sep 2008 04:15:33 -0000	1.2
+++ org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaSearchHandler.java	1 Nov 2008 11:42:21 -0000
@@ -36,7 +36,7 @@
 			String searchString) {
 		try {
 			String queryUrl = taskRepository.getRepositoryUrl()
-					+ "/buglist.cgi?long_desc_type=allwordssubstr&long_desc="
+					+ "/buglist.cgi?long_desc_type=allwordssubstr&long_desc=" //$NON-NLS-1$
 					+ URLEncoder.encode(searchString, taskRepository.getCharacterEncoding());
 			query.setUrl(queryUrl);
 		} catch (UnsupportedEncodingException e) {
Index: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaUiExtensionReader.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaUiExtensionReader.java,v
retrieving revision 1.12
diff -u -r1.12 BugzillaUiExtensionReader.java
--- org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaUiExtensionReader.java	3 Oct 2008 02:49:45 -0000	1.12
+++ org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaUiExtensionReader.java	1 Nov 2008 11:42:21 -0000
@@ -27,27 +27,27 @@
  */
 public class BugzillaUiExtensionReader {
 
-	public static final String EXTENSION_LANGUAGES = "org.eclipse.mylyn.bugzilla.core.languages";
+	public static final String EXTENSION_LANGUAGES = "org.eclipse.mylyn.bugzilla.core.languages"; //$NON-NLS-1$
 
-	public static final String EXTENSION_TMPL_LANGUAGE = "language";
+	public static final String EXTENSION_TMPL_LANGUAGE = "language"; //$NON-NLS-1$
 
-	public static final String ATTR_LANG_VALUE = "value";
+	public static final String ATTR_LANG_VALUE = "value"; //$NON-NLS-1$
 
-	public static final String ELMNT_LANG_NAME = "name";
+	public static final String ELMNT_LANG_NAME = "name"; //$NON-NLS-1$
 
-	public static final String ELMNT_LANG_ERROR_LOGIN = "error_login";
+	public static final String ELMNT_LANG_ERROR_LOGIN = "error_login"; //$NON-NLS-1$
 
-	public static final String ELMNT_LANG_ERROR_COLLISION = "error_collision";
+	public static final String ELMNT_LANG_ERROR_COLLISION = "error_collision"; //$NON-NLS-1$
 
-	public static final String ELMNT_LANG_ERROR_COMMENT_REQIRED = "error_comment_required";
+	public static final String ELMNT_LANG_ERROR_COMMENT_REQIRED = "error_comment_required"; //$NON-NLS-1$
 
-	public static final String ELMNT_LANG_ERROR_LOGGED_OUT = "error_logged_out";
+	public static final String ELMNT_LANG_ERROR_LOGGED_OUT = "error_logged_out"; //$NON-NLS-1$
 
-	public static final String ELMNT_LANG_BAD_LOGIN = "bad_login";
+	public static final String ELMNT_LANG_BAD_LOGIN = "bad_login"; //$NON-NLS-1$
 
-	public static final String ELMNT_LANG_PROCESSED = "processed";
+	public static final String ELMNT_LANG_PROCESSED = "processed"; //$NON-NLS-1$
 
-	public static final String ELMNT_LANG_CHANGES_SUBMITTED = "changes_submitted";
+	public static final String ELMNT_LANG_CHANGES_SUBMITTED = "changes_submitted"; //$NON-NLS-1$
 
 	private static boolean coreExtensionsRead = false;
 
@@ -78,16 +78,16 @@
 
 			for (IConfigurationElement configElement : element.getChildren()) {
 				String name = configElement.getName();
-				if (name != null && name.equals("languageAttribute")) {
-					String command = configElement.getAttribute("command");
-					String response = configElement.getAttribute("response");
+				if (name != null && name.equals("languageAttribute")) { //$NON-NLS-1$
+					String command = configElement.getAttribute("command"); //$NON-NLS-1$
+					String response = configElement.getAttribute("response"); //$NON-NLS-1$
 					bugzillaLanguageSettings.addLanguageAttribute(command, response);
 				}
 			}
 			BugzillaRepositoryConnector.addLanguageSetting(bugzillaLanguageSettings);
 		} else {
 			StatusHandler.log(new Status(IStatus.WARNING, BugzillaUiPlugin.ID_PLUGIN,
-					"Could not load language template extension " + element.getName()));
+					"Could not load language template extension " + element.getName())); //$NON-NLS-1$
 		}
 	}
 }
Index: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaUiPlugin.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaUiPlugin.java,v
retrieving revision 1.59
diff -u -r1.59 BugzillaUiPlugin.java
--- org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaUiPlugin.java	12 Sep 2008 04:15:33 -0000	1.59
+++ org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaUiPlugin.java	1 Nov 2008 11:42:21 -0000
@@ -33,43 +33,43 @@
  */
 public class BugzillaUiPlugin extends AbstractUIPlugin {
 
-	public static final String ID_PLUGIN = "org.eclipse.mylyn.bugzilla.ui";
+	public static final String ID_PLUGIN = "org.eclipse.mylyn.bugzilla.ui"; //$NON-NLS-1$
 
-	public static final String SEARCH_PAGE_ID = BugzillaUiPlugin.ID_PLUGIN + ".search.bugzillaSearchPage";
+	public static final String SEARCH_PAGE_ID = BugzillaUiPlugin.ID_PLUGIN + ".search.bugzillaSearchPage"; //$NON-NLS-1$
 
-	public static final String SEARCH_PAGE_CONTEXT = BugzillaUiPlugin.ID_PLUGIN + ".bugzillaSearchContext";
+	public static final String SEARCH_PAGE_CONTEXT = BugzillaUiPlugin.ID_PLUGIN + ".bugzillaSearchContext"; //$NON-NLS-1$
 
-	public static final String EDITOR_PAGE_CONTEXT = BugzillaUiPlugin.ID_PLUGIN + ".bugzillaEditorContext";
+	public static final String EDITOR_PAGE_CONTEXT = BugzillaUiPlugin.ID_PLUGIN + ".bugzillaEditorContext"; //$NON-NLS-1$
 
 	// The is's for hit markers used in the label provider and sorters
-	public static final String HIT_MARKER_ATTR_ID = "taskId";
+	public static final String HIT_MARKER_ATTR_ID = "taskId"; //$NON-NLS-1$
 
-	public static final String HIT_MARKER_ATTR_REPOSITORY = "repository";
+	public static final String HIT_MARKER_ATTR_REPOSITORY = "repository"; //$NON-NLS-1$
 
-	public static final String HIT_MARKER_ATTR_HREF = "href";
+	public static final String HIT_MARKER_ATTR_HREF = "href"; //$NON-NLS-1$
 
-	public static final String HIT_MARKER_ATTR_DESC = "summary";
+	public static final String HIT_MARKER_ATTR_DESC = "summary"; //$NON-NLS-1$
 
-	public static final String HIT_MARKER_ATTR_LABEL = "label";
+	public static final String HIT_MARKER_ATTR_LABEL = "label"; //$NON-NLS-1$
 
-	public static final String HIT_MARKER_ATTR_SEVERITY = "severity";
+	public static final String HIT_MARKER_ATTR_SEVERITY = "severity"; //$NON-NLS-1$
 
-	public static final String HIT_MARKER_ATTR_PRIORITY = "priority";
+	public static final String HIT_MARKER_ATTR_PRIORITY = "priority"; //$NON-NLS-1$
 
-	public static final String HIT_MARKER_ATTR_PLATFORM = "platform";
+	public static final String HIT_MARKER_ATTR_PLATFORM = "platform"; //$NON-NLS-1$
 
-	public static final String HIT_MARKER_ATTR_STATE = "state";
+	public static final String HIT_MARKER_ATTR_STATE = "state"; //$NON-NLS-1$
 
-	public static final String HIT_MARKER_ATTR_RESULT = "result";
+	public static final String HIT_MARKER_ATTR_RESULT = "result"; //$NON-NLS-1$
 
-	public static final String HIT_MARKER_ATTR_OWNER = "owner";
+	public static final String HIT_MARKER_ATTR_OWNER = "owner"; //$NON-NLS-1$
 
-	public static final String HIT_MARKER_ATTR_QUERY = "query";
+	public static final String HIT_MARKER_ATTR_QUERY = "query"; //$NON-NLS-1$
 
 	/**
 	 * XXX: remove?
 	 */
-	public static final String HIT_MARKER_ID = BugzillaUiPlugin.ID_PLUGIN + ".searchHit";
+	public static final String HIT_MARKER_ID = BugzillaUiPlugin.ID_PLUGIN + ".searchHit"; //$NON-NLS-1$
 
 	private static BugzillaUiPlugin plugin;
 
@@ -108,7 +108,7 @@
 	 */
 	private static IPath getProductConfigurationCachePath() {
 		IPath stateLocation = Platform.getStateLocation(BugzillaCorePlugin.getDefault().getBundle());
-		IPath configFile = stateLocation.append("repositoryConfigurations");
+		IPath configFile = stateLocation.append("repositoryConfigurations"); //$NON-NLS-1$
 		return configFile;
 	}
 
@@ -218,7 +218,7 @@
 			}
 			int j = 0;
 			while (true) {
-				int spaceIndex = origText.indexOf(" ", WRAP_LENGTH - 5);
+				int spaceIndex = origText.indexOf(" ", WRAP_LENGTH - 5); //$NON-NLS-1$
 				if (spaceIndex == origText.length() || spaceIndex == -1) {
 					textArray[j] = origText;
 					break;
@@ -228,13 +228,13 @@
 				j++;
 			}
 
-			String newText = "";
+			String newText = ""; //$NON-NLS-1$
 
 			for (String element : textArray) {
 				if (element == null) {
 					break;
 				}
-				newText += element + "\n";
+				newText += element + "\n"; //$NON-NLS-1$
 			}
 			return newText;
 		}
Index: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaImages.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaImages.java,v
retrieving revision 1.18
diff -u -r1.18 BugzillaImages.java
--- org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaImages.java	12 Sep 2008 04:15:33 -0000	1.18
+++ org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaImages.java	1 Nov 2008 11:42:21 -0000
@@ -26,35 +26,35 @@
 
 	private static ImageRegistry imageRegistry;
 
-	private static final URL baseURL = BugzillaUiPlugin.getDefault().getBundle().getEntry("/icons/");
+	private static final URL baseURL = BugzillaUiPlugin.getDefault().getBundle().getEntry("/icons/"); //$NON-NLS-1$
 
-	public static final String T_ELCL = "elcl16";
+	public static final String T_ELCL = "elcl16"; //$NON-NLS-1$
 
-	public static final String T_TOOL = "etool16";
+	public static final String T_TOOL = "etool16"; //$NON-NLS-1$
 
-	public static final String T_VIEW = "eview16";
+	public static final String T_VIEW = "eview16"; //$NON-NLS-1$
 
-	public static final ImageDescriptor OVERLAY_BUGZILLA = create(T_VIEW, "overlay-bugzilla.gif");
+	public static final ImageDescriptor OVERLAY_BUGZILLA = create(T_VIEW, "overlay-bugzilla.gif"); //$NON-NLS-1$
 
-	public static final ImageDescriptor BUG = create(T_ELCL, "bug.gif");
+	public static final ImageDescriptor BUG = create(T_ELCL, "bug.gif"); //$NON-NLS-1$
 
-	public static final ImageDescriptor BUG_COMMENT = create(T_ELCL, "bug-comment.gif");
+	public static final ImageDescriptor BUG_COMMENT = create(T_ELCL, "bug-comment.gif"); //$NON-NLS-1$
 
-	public static final ImageDescriptor REMOVE_ALL = create("", "remove-all.gif");
+	public static final ImageDescriptor REMOVE_ALL = create("", "remove-all.gif"); //$NON-NLS-1$ //$NON-NLS-2$
 
-	public static final ImageDescriptor REMOVE = create("", "remove.gif");
+	public static final ImageDescriptor REMOVE = create("", "remove.gif"); //$NON-NLS-1$ //$NON-NLS-2$
 
-	public static final ImageDescriptor SELECT_ALL = create("", "selectAll.gif");
+	public static final ImageDescriptor SELECT_ALL = create("", "selectAll.gif"); //$NON-NLS-1$ //$NON-NLS-2$
 
-	public static final ImageDescriptor OPEN = create("", "openresult.gif");
+	public static final ImageDescriptor OPEN = create("", "openresult.gif"); //$NON-NLS-1$ //$NON-NLS-2$
 
-	public static final ImageDescriptor OVERLAY_CRITICAL = create(T_VIEW, "overlay-critical.gif");
+	public static final ImageDescriptor OVERLAY_CRITICAL = create(T_VIEW, "overlay-critical.gif"); //$NON-NLS-1$
 
-	public static final ImageDescriptor OVERLAY_MAJOR = create(T_VIEW, "overlay-major.gif");
+	public static final ImageDescriptor OVERLAY_MAJOR = create(T_VIEW, "overlay-major.gif"); //$NON-NLS-1$
 
-	public static final ImageDescriptor OVERLAY_ENHANCEMENT = create(T_VIEW, "overlay-enhancement.gif");
+	public static final ImageDescriptor OVERLAY_ENHANCEMENT = create(T_VIEW, "overlay-enhancement.gif"); //$NON-NLS-1$
 
-	public static final ImageDescriptor OVERLAY_MINOR = create(T_VIEW, "overlay-minor.gif");
+	public static final ImageDescriptor OVERLAY_MINOR = create(T_VIEW, "overlay-minor.gif"); //$NON-NLS-1$
 
 	private static ImageDescriptor create(String prefix, String name) {
 		try {
@@ -70,7 +70,7 @@
 		}
 
 		StringBuffer buffer = new StringBuffer(prefix);
-		if (prefix != "") {
+		if (prefix != "") { //$NON-NLS-1$
 			buffer.append('/');
 		}
 		buffer.append(name);
@@ -90,10 +90,10 @@
 	 */
 	public static Image getImage(ImageDescriptor imageDescriptor) {
 		ImageRegistry imageRegistry = getImageRegistry();
-		Image image = imageRegistry.get("" + imageDescriptor.hashCode());
+		Image image = imageRegistry.get("" + imageDescriptor.hashCode()); //$NON-NLS-1$
 		if (image == null) {
 			image = imageDescriptor.createImage();
-			imageRegistry.put("" + imageDescriptor.hashCode(), image);
+			imageRegistry.put("" + imageDescriptor.hashCode(), image); //$NON-NLS-1$
 		}
 		return image;
 	}
Index: org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF,v
retrieving revision 1.357
diff -u -r1.357 MANIFEST.MF
--- org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF	26 Sep 2008 18:21:22 -0000	1.357
+++ org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF	1 Nov 2008 11:42:21 -0000
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Mylyn Bugzilla Connector UI
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.bugzilla.ui; singleton:=true
 Bundle-Version: 3.1.0.qualifier
 Bundle-Activator: org.eclipse.mylyn.internal.bugzilla.ui.BugzillaUiPlugin
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
@@ -27,3 +27,4 @@
  org.eclipse.mylyn.internal.bugzilla.ui.wizard;x-internal:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
+Bundle-Localization: plugin
Index: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/KeywordsDialog.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/KeywordsDialog.java,v
retrieving revision 1.5
diff -u -r1.5 KeywordsDialog.java
--- org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/KeywordsDialog.java	12 Sep 2008 04:15:33 -0000	1.5
+++ org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/KeywordsDialog.java	1 Nov 2008 11:42:22 -0000
@@ -45,7 +45,7 @@
 	public KeywordsDialog(Shell shell, String selectedKeywords, java.util.List<String> validKeywords) {
 		super(shell);
 		setShellStyle(getShellStyle() | SWT.RESIZE);
-		StringTokenizer st = new StringTokenizer(selectedKeywords, ",", false);
+		StringTokenizer st = new StringTokenizer(selectedKeywords, ",", false); //$NON-NLS-1$
 		this.selectedKeywords = new ArrayList<String>();
 		while (st.hasMoreTokens()) {
 			String s = st.nextToken().trim();
@@ -57,7 +57,7 @@
 
 	@Override
 	protected Control createDialogArea(Composite parent) {
-		getShell().setText("Select Keywords");
+		getShell().setText(Messages.KeywordsDialog_Select_Keywords);
 
 		Composite composite = new Composite(parent, SWT.NONE);
 		composite.setLayout(new GridLayout());
@@ -125,6 +125,8 @@
 
 		parent.pack();
 
+		applyDialogFont(composite);
+
 		return composite;
 	}
 
@@ -149,16 +151,16 @@
 
 		for (String sel : selectedKeywords) {
 			keywords.append(sel);
-			keywords.append(",");
+			keywords.append(","); //$NON-NLS-1$
 		}
 
 		String keywordsString = keywords.toString();
 
-		if (keywordsString.endsWith(",")) {
+		if (keywordsString.endsWith(",")) { //$NON-NLS-1$
 			keywordsString = keywordsString.substring(0, keywordsString.length() - 1);
 		}
 
 		return keywordsString;
 	}
 
-}
\ No newline at end of file
+}
Index: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaPlanningEditorPart.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaPlanningEditorPart.java,v
retrieving revision 1.8
diff -u -r1.8 BugzillaPlanningEditorPart.java
--- org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaPlanningEditorPart.java	12 Sep 2008 04:15:33 -0000	1.8
+++ org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaPlanningEditorPart.java	1 Nov 2008 11:42:21 -0000
@@ -43,7 +43,7 @@
 			BugzillaAttribute.DEADLINE);
 
 	public BugzillaPlanningEditorPart() {
-		setPartName("Team Planning");
+		setPartName(Messages.BugzillaPlanningEditorPart_Team_Planning);
 	}
 
 	@Override
@@ -78,7 +78,7 @@
 		attributeEditor.createControl(timeComposite, toolkit);
 		getTaskEditorPage().getAttributeEditorToolkit().adapt(attributeEditor);
 
-		Label label = toolkit.createLabel(timeComposite, "Current Estimate:");
+		Label label = toolkit.createLabel(timeComposite, Messages.BugzillaPlanningEditorPart_Current_Estimate);
 		label.setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
 		float total = 0;
 		try {
@@ -99,7 +99,7 @@
 			// ignore NumberFormatException
 		}
 
-		Text currentEstimate = toolkit.createText(timeComposite, "" + total, SWT.FLAT | SWT.READ_ONLY);
+		Text currentEstimate = toolkit.createText(timeComposite, "" + total, SWT.FLAT | SWT.READ_ONLY); //$NON-NLS-1$
 		currentEstimate.setFont(TEXT_FONT);
 		toolkit.adapt(currentEstimate, false, false);
 		currentEstimate.setData(FormToolkit.KEY_DRAW_BORDER, Boolean.FALSE);
@@ -121,7 +121,7 @@
 
 		}
 		if (addTimeAttribute != null) {
-			addTimeAttribute.setValue("0");
+			addTimeAttribute.setValue("0"); //$NON-NLS-1$
 			attributeEditor = createAttributeEditor(addTimeAttribute);
 			attributeEditor.createLabelControl(timeComposite, toolkit);
 			attributeEditor.createControl(timeComposite, toolkit);
Index: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditorPage.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditorPage.java,v
retrieving revision 1.16
diff -u -r1.16 BugzillaTaskEditorPage.java
--- org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditorPage.java	17 Oct 2008 03:22:21 -0000	1.16
+++ org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditorPage.java	1 Nov 2008 11:42:21 -0000
@@ -34,7 +34,7 @@
  */
 public class BugzillaTaskEditorPage extends AbstractTaskEditorPage {
 
-	public static final String ID_PART_BUGZILLA_PLANNING = "org.eclipse.mylyn.bugzilla.ui.editors.part.planning";
+	public static final String ID_PART_BUGZILLA_PLANNING = "org.eclipse.mylyn.bugzilla.ui.editors.part.planning"; //$NON-NLS-1$
 
 	public BugzillaTaskEditorPage(TaskEditor editor) {
 		super(editor, BugzillaCorePlugin.CONNECTOR_KIND);
@@ -122,7 +122,7 @@
 
 		TaskAttribute summaryAttribute = getModel().getTaskData().getRoot().getMappedAttribute(TaskAttribute.SUMMARY);
 		if (summaryAttribute != null && summaryAttribute.getValue().length() == 0) {
-			getTaskEditor().setMessage("Please enter a short summary before submitting", IMessageProvider.ERROR);
+			getTaskEditor().setMessage(Messages.BugzillaTaskEditorPage_Please_enter_a_short_summary_before_submitting, IMessageProvider.ERROR);
 			AbstractTaskEditorPart part = getPart(ID_PART_SUMMARY);
 			if (part != null) {
 				part.setFocus();
@@ -133,7 +133,7 @@
 		TaskAttribute componentAttribute = getModel().getTaskData().getRoot().getMappedAttribute(
 				BugzillaAttribute.COMPONENT.getKey());
 		if (componentAttribute != null && componentAttribute.getValue().length() == 0) {
-			getTaskEditor().setMessage("Please select a component before submitting", IMessageProvider.ERROR);
+			getTaskEditor().setMessage(Messages.BugzillaTaskEditorPage_Please_select_a_component_before_submitting, IMessageProvider.ERROR);
 			AbstractTaskEditorPart part = getPart(ID_PART_ATTRIBUTES);
 			if (part != null) {
 				part.setFocus();
@@ -144,7 +144,7 @@
 		TaskAttribute descriptionAttribute = getModel().getTaskData().getRoot().getMappedAttribute(
 				TaskAttribute.DESCRIPTION);
 		if (descriptionAttribute != null && descriptionAttribute.getValue().length() == 0) {
-			getTaskEditor().setMessage("Please enter a description before submitting", IMessageProvider.ERROR);
+			getTaskEditor().setMessage(Messages.BugzillaTaskEditorPage_Please_enter_a_description_before_submitting, IMessageProvider.ERROR);
 			AbstractTaskEditorPart descriptionPart = getPart(ID_PART_DESCRIPTION);
 			if (descriptionPart != null) {
 				descriptionPart.setFocus();
Index: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaPeoplePart.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaPeoplePart.java,v
retrieving revision 1.8
diff -u -r1.8 BugzillaPeoplePart.java
--- org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaPeoplePart.java	12 Sep 2008 04:15:33 -0000	1.8
+++ org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaPeoplePart.java	1 Nov 2008 11:42:21 -0000
@@ -33,7 +33,7 @@
 	private static final int COLUMN_MARGIN = 5;
 
 	public BugzillaPeoplePart() {
-		setPartName("People");
+		setPartName(Messages.BugzillaPeoplePart_People);
 	}
 
 	private void addAttribute(Composite composite, FormToolkit toolkit, TaskAttribute attribute) {
@@ -75,8 +75,8 @@
 		TaskAttribute cc = getTaskData().getRoot().getMappedAttribute(BugzillaAttribute.CC.getKey());
 		if (cc != null) {
 			addAttribute(peopleComposite, toolkit, cc);
-			toolkit.createLabel(peopleComposite, "");
-			Label label = toolkit.createLabel(peopleComposite, "(Select to remove)");
+			toolkit.createLabel(peopleComposite, ""); //$NON-NLS-1$
+			Label label = toolkit.createLabel(peopleComposite, Messages.BugzillaPeoplePart__Select_to_remove_);
 			GridDataFactory.fillDefaults().indent(0, 5).align(SWT.CENTER, SWT.CENTER).applyTo(label);
 		}
 
@@ -202,4 +202,4 @@
 //		}
 
 //	}
-}
\ No newline at end of file
+}
Index: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditorPageFactory.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditorPageFactory.java,v
retrieving revision 1.5
diff -u -r1.5 BugzillaTaskEditorPageFactory.java
--- org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditorPageFactory.java	12 Sep 2008 04:15:33 -0000	1.5
+++ org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditorPageFactory.java	1 Nov 2008 11:42:21 -0000
@@ -61,7 +61,7 @@
 
 	@Override
 	public String getPageText() {
-		return "Bugzilla";
+		return "Bugzilla"; //$NON-NLS-1$
 	}
 
 }
Index: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaKeywordAttributeEditor.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaKeywordAttributeEditor.java,v
retrieving revision 1.4
diff -u -r1.4 BugzillaKeywordAttributeEditor.java
--- org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaKeywordAttributeEditor.java	12 Sep 2008 04:15:33 -0000	1.4
+++ org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaKeywordAttributeEditor.java	1 Nov 2008 11:42:21 -0000
@@ -60,7 +60,7 @@
 		keywordsText.setLayoutData(keywordsData);
 		keywordsText.setEditable(false);
 
-		Button changeKeywordsButton = toolkit.createButton(keywordComposite, "Edit...", SWT.FLAT);
+		Button changeKeywordsButton = toolkit.createButton(keywordComposite, Messages.BugzillaKeywordAttributeEditor_Edit_, SWT.FLAT);
 		GridData keyWordsButtonData = new GridData();
 		changeKeywordsButton.setLayoutData(keyWordsButtonData);
 		changeKeywordsButton.addSelectionListener(new SelectionListener() {
Index: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaVotesEditor.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaVotesEditor.java,v
retrieving revision 1.3
diff -u -r1.3 BugzillaVotesEditor.java
--- org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaVotesEditor.java	12 Sep 2008 04:15:33 -0000	1.3
+++ org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaVotesEditor.java	1 Nov 2008 11:42:21 -0000
@@ -54,7 +54,7 @@
 		((GridData) getLabelControl().getLayoutData()).exclude = true;
 		showVotes = toolkit.createHyperlink(parent, getTaskAttribute().getValue(), SWT.NONE);
 		showVotes.setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
-		showVotes.setToolTipText("Show votes");
+		showVotes.setToolTipText(Messages.BugzillaVotesEditor_Show_votes);
 		showVotes.addHyperlinkListener(new HyperlinkAdapter() {
 			@Override
 			public void linkActivated(HyperlinkEvent e) {
@@ -69,7 +69,7 @@
 	public void createLabelControl(Composite composite, FormToolkit toolkit) {
 		voteControl = toolkit.createHyperlink(composite, getLabel(), SWT.NONE);
 		voteControl.setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
-		voteControl.setToolTipText("Vote");
+		voteControl.setToolTipText(Messages.BugzillaVotesEditor_Vote);
 		voteControl.addHyperlinkListener(new HyperlinkAdapter() {
 			@Override
 			public void linkActivated(HyperlinkEvent e) {
@@ -88,7 +88,7 @@
 
 		voteControl.setLayoutData(gd);
 
-		hiddenLabel = toolkit.createLabel(composite, "");
+		hiddenLabel = toolkit.createLabel(composite, ""); //$NON-NLS-1$
 		GridData data = new GridData();
 		data.exclude = true;
 		hiddenLabel.setLayoutData(data);
Index: org.eclipse.mylyn.bugzilla.ui/build.properties
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui/build.properties,v
retrieving revision 1.13
diff -u -r1.13 build.properties
--- org.eclipse.mylyn.bugzilla.ui/build.properties	17 Sep 2008 15:43:17 -0000	1.13
+++ org.eclipse.mylyn.bugzilla.ui/build.properties	1 Nov 2008 11:42:20 -0000
@@ -10,7 +10,8 @@
                plugin.xml,\
                icons/,\
                about.html,\
-               .
+               .,\
+               plugin.properties
 src.includes = META-INF/,\
                about.html
 jre.compilation.profile = J2SE-1.5
Index: org.eclipse.mylyn.bugzilla.ui/plugin.xml
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui/plugin.xml,v
retrieving revision 1.100
diff -u -r1.100 plugin.xml
--- org.eclipse.mylyn.bugzilla.ui/plugin.xml	30 May 2008 01:40:23 -0000	1.100
+++ org.eclipse.mylyn.bugzilla.ui/plugin.xml	1 Nov 2008 11:42:21 -0000
@@ -4,18 +4,18 @@
       
    <extension
          id="org.eclipse.mylyn.bugzilla.repository" 
-         name="Bugzilla Repository"
+         name="%bugzilla.repository.name"
          point="org.eclipse.mylyn.tasks.ui.repositories">
 
       <connectorCore
             class="org.eclipse.mylyn.internal.bugzilla.core.BugzillaRepositoryConnector"
             id="org.eclipse.mylyn.bugzilla.tasklist.repositories"
-            name="Bugzilla Repository Connector"/> 
+            name="%BugzillaRepositoryConnector.name"/> 
             
       <connectorUi
             brandingIcon="icons/eview16/bugzilla-logo.gif"
             class="org.eclipse.mylyn.internal.bugzilla.ui.tasklist.BugzillaConnectorUi"
-            name="Bugzilla Repository Ui"
+            name="%tasklist.BugzillaConnectorUi.name"
             overlayIcon="icons/eview16/overlay-bugzilla.gif"/>
               
 	  <taskListMigrator 
Index: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java,v
retrieving revision 1.114
diff -u -r1.114 BugzillaSearchPage.java
--- org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java	31 Oct 2008 06:13:12 -0000	1.114
+++ org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java	1 Nov 2008 11:42:23 -0000
@@ -25,6 +25,7 @@
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.DialogSettings;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.IDialogSettings;
@@ -88,13 +89,13 @@
 
 	private static final int LABEL_WIDTH = 58;
 
-	private static final String LABEL_VIEW_REPOSITORIES = "Task Repositories";
+	private static final String LABEL_VIEW_REPOSITORIES = Messages.BugzillaSearchPage_Task_Repositories;
 
-	private static final String MESSAGE_NO_REPOSITORY = "No repository available, please add one using the Task Repositories view.";
+	private static final String MESSAGE_NO_REPOSITORY = Messages.BugzillaSearchPage_No_repository_available;
 
-	private static final String NUM_DAYS_POSITIVE = "Number of days must be a positive integer. ";
+	private static final String NUM_DAYS_POSITIVE = Messages.BugzillaSearchPage_Number_of_days_must_be_a_positive_integer;
 
-	private static final String TITLE_BUGZILLA_QUERY = "Bugzilla Query";
+	private static final String TITLE_BUGZILLA_QUERY = Messages.BugzillaSearchPage_Bugzilla_Query;
 
 	private static final int HEIGHT_ATTRIBUTE_COMBO = 70;
 
@@ -114,23 +115,23 @@
 
 	private IDialogSettings fDialogSettings;
 
-	private static final String[] patternOperationText = { "all words", "any word", "regexp", "notregexp" };
+	private static final String[] patternOperationText = { "all words", "any word", "regexp", "notregexp" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 
-	private static final String[] patternOperationValues = { "allwordssubstr", "anywordssubstr", "regexp", "notregexp" };
+	private static final String[] patternOperationValues = { "allwordssubstr", "anywordssubstr", "regexp", "notregexp" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 
-	private static final String[] emailOperationText = { "substring", "exact", "regexp", "notregexp" };
+	private static final String[] emailOperationText = { "substring", "exact", "regexp", "notregexp" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 
-	private static final String[] emailOperationValues = { "substring", "exact", "regexp", "notregexp" };
+	private static final String[] emailOperationValues = { "substring", "exact", "regexp", "notregexp" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 
-	private static final String[] keywordOperationText = { "all", "any", "none" };
+	private static final String[] keywordOperationText = { "all", "any", "none" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
-	private static final String[] keywordOperationValues = { "allwords", "anywords", "nowords" };
+	private static final String[] keywordOperationValues = { "allwords", "anywords", "nowords" }; //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
 
-	private static final String[] emailRoleValues = { "emailassigned_to1", "emailreporter1", "emailcc1",
-			"emaillongdesc1" };
+	private static final String[] emailRoleValues = { "emailassigned_to1", "emailreporter1", "emailcc1", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			"emaillongdesc1" }; //$NON-NLS-1$
 
-	private static final String[] emailRoleValues2 = { "emailassigned_to2", "emailreporter2", "emailcc2",
-			"emaillongdesc2" };
+	private static final String[] emailRoleValues2 = { "emailassigned_to2", "emailreporter2", "emailcc2", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			"emaillongdesc2" }; //$NON-NLS-1$
 
 	// dialog store id constants
 	private final static String DIALOG_BOUNDS_KEY = "ResizableDialogBounds"; //$NON-NLS-1$
@@ -217,49 +218,49 @@
 	// Dialog store taskId constants
 	protected final static String PAGE_NAME = "BugzillaSearchPage"; //$NON-NLS-1$
 
-	private static final String STORE_PRODUCT_ID = PAGE_NAME + ".PRODUCT";
+	private static final String STORE_PRODUCT_ID = PAGE_NAME + ".PRODUCT"; //$NON-NLS-1$
 
-	private static final String STORE_COMPONENT_ID = PAGE_NAME + ".COMPONENT";
+	private static final String STORE_COMPONENT_ID = PAGE_NAME + ".COMPONENT"; //$NON-NLS-1$
 
-	private static final String STORE_VERSION_ID = PAGE_NAME + ".VERSION";
+	private static final String STORE_VERSION_ID = PAGE_NAME + ".VERSION"; //$NON-NLS-1$
 
-	private static final String STORE_MSTONE_ID = PAGE_NAME + ".MILESTONE";
+	private static final String STORE_MSTONE_ID = PAGE_NAME + ".MILESTONE"; //$NON-NLS-1$
 
-	private static final String STORE_STATUS_ID = PAGE_NAME + ".STATUS";
+	private static final String STORE_STATUS_ID = PAGE_NAME + ".STATUS"; //$NON-NLS-1$
 
-	private static final String STORE_RESOLUTION_ID = PAGE_NAME + ".RESOLUTION";
+	private static final String STORE_RESOLUTION_ID = PAGE_NAME + ".RESOLUTION"; //$NON-NLS-1$
 
-	private static final String STORE_SEVERITY_ID = PAGE_NAME + ".SEVERITY";
+	private static final String STORE_SEVERITY_ID = PAGE_NAME + ".SEVERITY"; //$NON-NLS-1$
 
-	private static final String STORE_PRIORITY_ID = PAGE_NAME + ".PRIORITY";
+	private static final String STORE_PRIORITY_ID = PAGE_NAME + ".PRIORITY"; //$NON-NLS-1$
 
-	private static final String STORE_HARDWARE_ID = PAGE_NAME + ".HARDWARE";
+	private static final String STORE_HARDWARE_ID = PAGE_NAME + ".HARDWARE"; //$NON-NLS-1$
 
-	private static final String STORE_OS_ID = PAGE_NAME + ".OS";
+	private static final String STORE_OS_ID = PAGE_NAME + ".OS"; //$NON-NLS-1$
 
-	private static final String STORE_SUMMARYMATCH_ID = PAGE_NAME + ".SUMMARYMATCH";
+	private static final String STORE_SUMMARYMATCH_ID = PAGE_NAME + ".SUMMARYMATCH"; //$NON-NLS-1$
 
-	private static final String STORE_COMMENTMATCH_ID = PAGE_NAME + ".COMMENTMATCH";
+	private static final String STORE_COMMENTMATCH_ID = PAGE_NAME + ".COMMENTMATCH"; //$NON-NLS-1$
 
-	private static final String STORE_EMAILMATCH_ID = PAGE_NAME + ".EMAILMATCH";
+	private static final String STORE_EMAILMATCH_ID = PAGE_NAME + ".EMAILMATCH"; //$NON-NLS-1$
 
-	private static final String STORE_EMAIL2MATCH_ID = PAGE_NAME + ".EMAIL2MATCH";
+	private static final String STORE_EMAIL2MATCH_ID = PAGE_NAME + ".EMAIL2MATCH"; //$NON-NLS-1$
 
-	private static final String STORE_EMAILBUTTON_ID = PAGE_NAME + ".EMAILATTR";
+	private static final String STORE_EMAILBUTTON_ID = PAGE_NAME + ".EMAILATTR"; //$NON-NLS-1$
 
-	private static final String STORE_EMAIL2BUTTON_ID = PAGE_NAME + ".EMAIL2ATTR";
+	private static final String STORE_EMAIL2BUTTON_ID = PAGE_NAME + ".EMAIL2ATTR"; //$NON-NLS-1$
 
-	private static final String STORE_SUMMARYTEXT_ID = PAGE_NAME + ".SUMMARYTEXT";
+	private static final String STORE_SUMMARYTEXT_ID = PAGE_NAME + ".SUMMARYTEXT"; //$NON-NLS-1$
 
-	private static final String STORE_COMMENTTEXT_ID = PAGE_NAME + ".COMMENTTEXT";
+	private static final String STORE_COMMENTTEXT_ID = PAGE_NAME + ".COMMENTTEXT"; //$NON-NLS-1$
 
-	private static final String STORE_EMAILADDRESS_ID = PAGE_NAME + ".EMAILADDRESS";
+	private static final String STORE_EMAILADDRESS_ID = PAGE_NAME + ".EMAILADDRESS"; //$NON-NLS-1$
 
-	private static final String STORE_EMAIL2ADDRESS_ID = PAGE_NAME + ".EMAIL2ADDRESS";
+	private static final String STORE_EMAIL2ADDRESS_ID = PAGE_NAME + ".EMAIL2ADDRESS"; //$NON-NLS-1$
 
-	private static final String STORE_KEYWORDS_ID = PAGE_NAME + ".KEYWORDS";
+	private static final String STORE_KEYWORDS_ID = PAGE_NAME + ".KEYWORDS"; //$NON-NLS-1$
 
-	private static final String STORE_KEYWORDSMATCH_ID = PAGE_NAME + ".KEYWORDSMATCH";
+	private static final String STORE_KEYWORDSMATCH_ID = PAGE_NAME + ".KEYWORDSMATCH"; //$NON-NLS-1$
 
 	// private static final String STORE_REPO_ID = PAGE_NAME + ".REPO";
 
@@ -327,8 +328,7 @@
 	public BugzillaSearchPage(TaskRepository repository, IRepositoryQuery origQuery) {
 		super(TITLE_BUGZILLA_QUERY, repository, origQuery);
 		originalQuery = origQuery;
-		setDescription("Select the Bugzilla query parameters.  Use the Update Attributes button to retrieve "
-				+ "updated values from the repository.");
+		setDescription(Messages.BugzillaSearchPage_Select_the_Bugzilla_query_parameters);
 		// setTitle(TITLE);
 		// setDescription(DESCRIPTION);
 		// setPageComplete(false);
@@ -390,6 +390,7 @@
 		//   // ignore
 		// }
 		// }
+		Dialog.applyDialogFont(control);
 		setControl(control);
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(control, BugzillaUiPlugin.SEARCH_PAGE_CONTEXT);
 		restoreBounds();
@@ -413,7 +414,7 @@
 
 		if (!inSearchContainer()) {
 			final Label queryTitleLabel = new Label(composite, SWT.NONE);
-			queryTitleLabel.setText("&Query Title:");
+			queryTitleLabel.setText(Messages.BugzillaSearchPage_Query_Title);
 
 			queryTitle = new Text(composite, SWT.BORDER);
 			queryTitle.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 3, 1));
@@ -426,8 +427,8 @@
 
 		// Info text
 		Label labelSummary = new Label(composite, SWT.LEFT);
-		labelSummary.setText("Summar&y:");
-		labelSummary.setLayoutData(new GridData(LABEL_WIDTH, SWT.DEFAULT));
+		labelSummary.setText(Messages.BugzillaSearchPage_Summary);
+//		labelSummary.setLayoutData(new GridData(LABEL_WIDTH, SWT.DEFAULT));
 		//labelSummary.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 		// Pattern combo
@@ -448,7 +449,7 @@
 
 		// Info text
 		Label labelComment = new Label(composite, SWT.LEFT);
-		labelComment.setText("&Comment:");
+		labelComment.setText(Messages.BugzillaSearchPage_Comment);
 		//labelComment.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 		// Comment pattern combo
@@ -468,7 +469,7 @@
 		commentOperation.select(0);
 
 		Label labelEmail = new Label(composite, SWT.LEFT);
-		labelEmail.setText("&Email:");
+		labelEmail.setText(Messages.BugzillaSearchPage_Email);
 		//labelEmail.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 		// pattern combo
@@ -498,16 +499,16 @@
 		emailComposite.setLayout(emailLayout);
 
 		Button button0 = new Button(emailComposite, SWT.CHECK);
-		button0.setText("owner");
+		button0.setText(Messages.BugzillaSearchPage_owner);
 
 		Button button1 = new Button(emailComposite, SWT.CHECK);
-		button1.setText("reporter");
+		button1.setText(Messages.BugzillaSearchPage_reporter);
 
 		Button button2 = new Button(emailComposite, SWT.CHECK);
-		button2.setText("cc");
+		button2.setText(Messages.BugzillaSearchPage_cc);
 
 		Button button3 = new Button(emailComposite, SWT.CHECK);
-		button3.setText("commenter");
+		button3.setText(Messages.BugzillaSearchPage_commenter);
 
 		emailButtons = new Button[] { button0, button1, button2, button3 };
 
@@ -520,7 +521,7 @@
 		// Email2
 
 		Label labelEmail2 = new Label(composite, SWT.LEFT);
-		labelEmail2.setText("Email &2:");
+		labelEmail2.setText(Messages.BugzillaSearchPage_Email_2);
 		//labelEmail.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 		// pattern combo
@@ -550,16 +551,16 @@
 		emailComposite2.setLayout(emailLayout2);
 
 		Button e2button0 = new Button(emailComposite2, SWT.CHECK);
-		e2button0.setText("owner");
+		e2button0.setText(Messages.BugzillaSearchPage_owner);
 
 		Button e2button1 = new Button(emailComposite2, SWT.CHECK);
-		e2button1.setText("reporter");
+		e2button1.setText(Messages.BugzillaSearchPage_reporter);
 
 		Button e2button2 = new Button(emailComposite2, SWT.CHECK);
-		e2button2.setText("cc");
+		e2button2.setText(Messages.BugzillaSearchPage_cc);
 
 		Button e2button3 = new Button(emailComposite2, SWT.CHECK);
-		e2button3.setText("commenter");
+		e2button3.setText(Messages.BugzillaSearchPage_commenter);
 
 		emailButtons2 = new Button[] { e2button0, e2button1, e2button2, e2button3 };
 
@@ -572,8 +573,8 @@
 		/////
 
 		Label labelKeywords = new Label(composite, SWT.NONE);
-		labelKeywords.setText("&Keywords:");
-		labelKeywords.setLayoutData(new GridData(LABEL_WIDTH, SWT.DEFAULT));
+		labelKeywords.setText(Messages.BugzillaSearchPage_Keywords);
+//		labelKeywords.setLayoutData(new GridData(LABEL_WIDTH, SWT.DEFAULT));
 		//labelKeywords.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 		Composite keywordsComposite = new Composite(composite, SWT.NONE);
@@ -614,7 +615,7 @@
 			}
 		});
 		keywordsSelectButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
-		keywordsSelectButton.setText("Select...");
+		keywordsSelectButton.setText(Messages.BugzillaSearchPage_Select_);
 		SashForm sashForm = new SashForm(control, SWT.VERTICAL);
 		sashForm.setLayout(sashFormLayout);
 		final GridData gd_sashForm = new GridData(SWT.FILL, SWT.FILL, true, true);
@@ -637,7 +638,8 @@
 		productComposite.setLayout(productLayout);
 
 		Label productLabel = new Label(productComposite, SWT.LEFT);
-		productLabel.setText("&Product:");
+		productLabel.setText(Messages.BugzillaSearchPage_Product);
+		productLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 		GridData productLayoutData = new GridData(SWT.FILL, SWT.FILL, true, true);
 		productLayoutData.heightHint = HEIGHT_ATTRIBUTE_COMBO;
@@ -668,7 +670,8 @@
 		componentComposite.setLayout(componentLayout);
 
 		Label componentLabel = new Label(componentComposite, SWT.LEFT);
-		componentLabel.setText("Compo&nent:");
+		componentLabel.setText(Messages.BugzillaSearchPage_Component);
+		componentLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 		component = new List(componentComposite, SWT.MULTI | SWT.V_SCROLL | SWT.BORDER);
 		GridData componentLayoutData = new GridData(SWT.FILL, SWT.FILL, true, true);
@@ -684,7 +687,8 @@
 		versionComposite.setLayout(versionLayout);
 
 		Label versionLabel = new Label(versionComposite, SWT.LEFT);
-		versionLabel.setText("Vers&ion:");
+		versionLabel.setText(Messages.BugzillaSearchPage_Version);
+		versionLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 		version = new List(versionComposite, SWT.MULTI | SWT.V_SCROLL | SWT.BORDER);
 		GridData versionLayoutData = new GridData(SWT.FILL, SWT.FILL, true, true);
@@ -700,7 +704,8 @@
 		milestoneComposite.setLayout(milestoneLayout);
 
 		Label milestoneLabel = new Label(milestoneComposite, SWT.LEFT);
-		milestoneLabel.setText("&Milestone:");
+		milestoneLabel.setText(Messages.BugzillaSearchPage_Milestone);
+		milestoneLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 		target = new List(milestoneComposite, SWT.MULTI | SWT.V_SCROLL | SWT.BORDER);
 		GridData targetLayoutData = new GridData(SWT.FILL, SWT.FILL, true, true);
@@ -726,7 +731,8 @@
 		statusComposite.setLayout(statusLayout);
 
 		Label statusLabel = new Label(statusComposite, SWT.LEFT);
-		statusLabel.setText("Stat&us:");
+		statusLabel.setText(Messages.BugzillaSearchPage_Status);
+		statusLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 		status = new List(statusComposite, SWT.MULTI | SWT.V_SCROLL | SWT.BORDER);
 		final GridData gd_status = new GridData(SWT.FILL, SWT.FILL, true, true);
@@ -743,7 +749,8 @@
 		resolutionComposite.setLayout(resolutionLayout);
 
 		Label resolutionLabel = new Label(resolutionComposite, SWT.LEFT);
-		resolutionLabel.setText("&Resolution:");
+		resolutionLabel.setText(Messages.BugzillaSearchPage_Resolution);
+		resolutionLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 		resolution = new List(resolutionComposite, SWT.MULTI | SWT.V_SCROLL | SWT.BORDER);
 		final GridData gd_resolution = new GridData(SWT.FILL, SWT.FILL, true, true);
@@ -760,7 +767,8 @@
 		priorityComposite.setLayout(priorityLayout);
 
 		Label priorityLabel = new Label(priorityComposite, SWT.LEFT);
-		priorityLabel.setText("Priori&ty:");
+		priorityLabel.setText(Messages.BugzillaSearchPage_PROORITY);
+		priorityLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 		priority = new List(priorityComposite, SWT.MULTI | SWT.V_SCROLL | SWT.BORDER);
 		final GridData gd_priority = new GridData(SWT.FILL, SWT.FILL, true, true);
@@ -777,7 +785,8 @@
 		severityComposite.setLayout(severityLayout);
 
 		Label severityLabel = new Label(severityComposite, SWT.LEFT);
-		severityLabel.setText("Se&verity:");
+		severityLabel.setText(Messages.BugzillaSearchPage_Severity);
+		severityLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 		severity = new List(severityComposite, SWT.MULTI | SWT.V_SCROLL | SWT.BORDER);
 		final GridData gd_severity = new GridData(SWT.FILL, SWT.FILL, true, true);
@@ -794,7 +803,8 @@
 		hardwareComposite.setLayout(hardwareLayout);
 
 		Label hardwareLabel = new Label(hardwareComposite, SWT.LEFT);
-		hardwareLabel.setText("Hard&ware:");
+		hardwareLabel.setText(Messages.BugzillaSearchPage_Hardware);
+		hardwareLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 		hardware = new List(hardwareComposite, SWT.MULTI | SWT.V_SCROLL | SWT.BORDER);
 		final GridData gd_hardware = new GridData(SWT.FILL, SWT.FILL, true, true);
@@ -811,7 +821,8 @@
 		osComposite.setLayout(osLayout);
 
 		Label osLabel = new Label(osComposite, SWT.LEFT);
-		osLabel.setText("&Operating System:");
+		osLabel.setText(Messages.BugzillaSearchPage_Operating_System);
+		osLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 		os = new List(osComposite, SWT.MULTI | SWT.V_SCROLL | SWT.BORDER);
 		final GridData gd_os = new GridData(SWT.FILL, SWT.FILL, true, true);
@@ -833,7 +844,7 @@
 
 		Label changedInTheLabel = new Label(composite, SWT.LEFT);
 		changedInTheLabel.setLayoutData(new GridData());
-		changedInTheLabel.setText("Ch&anged in:");
+		changedInTheLabel.setText(Messages.BugzillaSearchPage_Changed_in);
 
 		Composite updateComposite = new Composite(composite, SWT.NONE);
 		updateComposite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
@@ -849,10 +860,10 @@
 		daysText.addListener(SWT.Modify, this);
 
 		Label label = new Label(updateComposite, SWT.LEFT);
-		label.setText(" days.");
+		label.setText(Messages.BugzillaSearchPage_days);
 
 		Button updateButton = new Button(updateComposite, SWT.PUSH);
-		updateButton.setText("Up&date Attributes from Repository");
+		updateButton.setText(Messages.BugzillaSearchPage_Update_Attributes_from_Repository);
 		updateButton.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, true, false));
 		updateButton.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -1059,9 +1070,9 @@
 							PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
 								public void run() {
 									MessageDialog.openError(Display.getDefault().getActiveShell(),
-											"Bugzilla Search Page",
-											"Unable to get configuration. Ensure proper repository configuration in "
-													+ LABEL_VIEW_REPOSITORIES + ".\n\n");
+											Messages.BugzillaSearchPage_Bugzilla_Search_Page,
+											Messages.BugzillaSearchPage_Unable_to_get_configuration
+													+ LABEL_VIEW_REPOSITORIES + ".\n\n"); //$NON-NLS-1$
 								}
 							});
 						}
@@ -1083,7 +1094,7 @@
 			 */
 			if (getTaskRepository() != null) {
 				IDialogSettings settings = getDialogSettings();
-				String repoId = "." + getTaskRepository().getRepositoryUrl();
+				String repoId = "." + getTaskRepository().getRepositoryUrl(); //$NON-NLS-1$
 				if (getWizard() == null && restoreQueryOptions && settings.getArray(STORE_PRODUCT_ID + repoId) != null
 						&& product != null) {
 					product.setSelection(nonNullArray(settings, STORE_PRODUCT_ID + repoId));
@@ -1128,12 +1139,12 @@
 			if (days.length() > 0) {
 				try {
 					if (Integer.parseInt(days) < 0) {
-						message = NUM_DAYS_POSITIVE + days + " is invalid.";
+						message = NUM_DAYS_POSITIVE + days + Messages.BugzillaSearchPage_is_invalid;
 						setErrorMessage(message);
 						return false;
 					}
 				} catch (NumberFormatException ex) {
-					message = NUM_DAYS_POSITIVE + days + " is invalid.";
+					message = NUM_DAYS_POSITIVE + days + Messages.BugzillaSearchPage_is_invalid;
 					setErrorMessage(message);
 					return false;
 				}
@@ -1149,7 +1160,7 @@
 	private BugzillaSearchData getPatternData(Combo widget, Combo operation,
 			ArrayList<BugzillaSearchData> previousSearchQueryData) {
 		String pattern = widget.getText();
-		if (pattern == null || pattern.trim().equals("")) {
+		if (pattern == null || pattern.trim().equals("")) { //$NON-NLS-1$
 			return null;
 		}
 		BugzillaSearchData match = null;
@@ -1194,7 +1205,7 @@
 
 		// HACK make sure that the searches come back sorted by priority. This
 		// should be a search option though
-		url.append("&order=Importance");
+		url.append("&order=Importance"); //$NON-NLS-1$
 		// url.append(BugzillaRepositoryUtil.contentTypeRDF);
 		return url.toString();
 	}
@@ -1210,7 +1221,7 @@
 		if (sb.charAt(sb.length() - 1) != '/') {
 			sb.append('/');
 		}
-		sb.append("buglist.cgi?");
+		sb.append("buglist.cgi?"); //$NON-NLS-1$
 		return sb;
 	}
 
@@ -1225,65 +1236,65 @@
 	protected StringBuilder getQueryParameters() {
 		StringBuilder sb = new StringBuilder();
 
-		sb.append("short_desc_type=");
+		sb.append("short_desc_type="); //$NON-NLS-1$
 		sb.append(patternOperationValues[summaryOperation.getSelectionIndex()]);
-		appendToBuffer(sb, "&short_desc=", summaryPattern.getText());
+		appendToBuffer(sb, "&short_desc=", summaryPattern.getText()); //$NON-NLS-1$
 
 		int[] selected = product.getSelectionIndices();
 		for (int element : selected) {
-			appendToBuffer(sb, "&product=", product.getItem(element));
+			appendToBuffer(sb, "&product=", product.getItem(element)); //$NON-NLS-1$
 		}
 
 		selected = component.getSelectionIndices();
 		for (int element : selected) {
-			appendToBuffer(sb, "&component=", component.getItem(element));
+			appendToBuffer(sb, "&component=", component.getItem(element)); //$NON-NLS-1$
 		}
 
 		selected = version.getSelectionIndices();
 		for (int element : selected) {
-			appendToBuffer(sb, "&version=", version.getItem(element));
+			appendToBuffer(sb, "&version=", version.getItem(element)); //$NON-NLS-1$
 		}
 
 		selected = target.getSelectionIndices();
 		for (int element : selected) {
-			appendToBuffer(sb, "&target_milestone=", target.getItem(element));
+			appendToBuffer(sb, "&target_milestone=", target.getItem(element)); //$NON-NLS-1$
 		}
 
-		sb.append("&long_desc_type=");
+		sb.append("&long_desc_type="); //$NON-NLS-1$
 		sb.append(patternOperationValues[commentOperation.getSelectionIndex()]);
-		appendToBuffer(sb, "&long_desc=", commentPattern.getText());
+		appendToBuffer(sb, "&long_desc=", commentPattern.getText()); //$NON-NLS-1$
 
 		selected = status.getSelectionIndices();
 		for (int element : selected) {
-			appendToBuffer(sb, "&bug_status=", status.getItem(element));
+			appendToBuffer(sb, "&bug_status=", status.getItem(element)); //$NON-NLS-1$
 		}
 
 		selected = resolution.getSelectionIndices();
 		for (int element : selected) {
-			appendToBuffer(sb, "&resolution=", resolution.getItem(element));
+			appendToBuffer(sb, "&resolution=", resolution.getItem(element)); //$NON-NLS-1$
 		}
 
 		selected = severity.getSelectionIndices();
 		for (int element : selected) {
-			appendToBuffer(sb, "&bug_severity=", severity.getItem(element));
+			appendToBuffer(sb, "&bug_severity=", severity.getItem(element)); //$NON-NLS-1$
 		}
 
 		selected = priority.getSelectionIndices();
 		for (int element : selected) {
-			appendToBuffer(sb, "&priority=", priority.getItem(element));
+			appendToBuffer(sb, "&priority=", priority.getItem(element)); //$NON-NLS-1$
 		}
 
 		selected = hardware.getSelectionIndices();
 		for (int element : selected) {
-			appendToBuffer(sb, "&ref_platform=", hardware.getItem(element));
+			appendToBuffer(sb, "&ref_platform=", hardware.getItem(element)); //$NON-NLS-1$
 		}
 
 		selected = os.getSelectionIndices();
 		for (int element : selected) {
-			appendToBuffer(sb, "&op_sys=", os.getItem(element));
+			appendToBuffer(sb, "&op_sys=", os.getItem(element)); //$NON-NLS-1$
 		}
 
-		if (emailPattern.getText() != null && !emailPattern.getText().trim().equals("")) {
+		if (emailPattern.getText() != null && !emailPattern.getText().trim().equals("")) { //$NON-NLS-1$
 			boolean selectionMade = false;
 			for (Button button : emailButtons) {
 				if (button.getSelection()) {
@@ -1294,18 +1305,18 @@
 			if (selectionMade) {
 				for (int i = 0; i < emailButtons.length; i++) {
 					if (emailButtons[i].getSelection()) {
-						sb.append("&");
+						sb.append("&"); //$NON-NLS-1$
 						sb.append(emailRoleValues[i]);
-						sb.append("=1");
+						sb.append("=1"); //$NON-NLS-1$
 					}
 				}
-				sb.append("&emailtype1=");
+				sb.append("&emailtype1="); //$NON-NLS-1$
 				sb.append(emailOperationValues[emailOperation.getSelectionIndex()]);
-				appendToBuffer(sb, "&email1=", emailPattern.getText());
+				appendToBuffer(sb, "&email1=", emailPattern.getText()); //$NON-NLS-1$
 			}
 		}
 
-		if (emailPattern2.getText() != null && !emailPattern2.getText().trim().equals("")) {
+		if (emailPattern2.getText() != null && !emailPattern2.getText().trim().equals("")) { //$NON-NLS-1$
 			boolean selectionMade = false;
 			for (Button button : emailButtons2) {
 				if (button.getSelection()) {
@@ -1316,30 +1327,30 @@
 			if (selectionMade) {
 				for (int i = 0; i < emailButtons2.length; i++) {
 					if (emailButtons2[i].getSelection()) {
-						sb.append("&");
+						sb.append("&"); //$NON-NLS-1$
 						sb.append(emailRoleValues2[i]);
-						sb.append("=1");
+						sb.append("=1"); //$NON-NLS-1$
 					}
 				}
-				sb.append("&emailtype2=");
+				sb.append("&emailtype2="); //$NON-NLS-1$
 				sb.append(emailOperationValues[emailOperation2.getSelectionIndex()]);
-				appendToBuffer(sb, "&email2=", emailPattern2.getText());
+				appendToBuffer(sb, "&email2=", emailPattern2.getText()); //$NON-NLS-1$
 			}
 		}
 
-		if (daysText.getText() != null && !daysText.getText().equals("")) {
+		if (daysText.getText() != null && !daysText.getText().equals("")) { //$NON-NLS-1$
 			try {
 				Integer.parseInt(daysText.getText());
-				appendToBuffer(sb, "&changedin=", daysText.getText());
+				appendToBuffer(sb, "&changedin=", daysText.getText()); //$NON-NLS-1$
 			} catch (NumberFormatException ignored) {
 				// this means that the days is not a number, so don't worry
 			}
 		}
 
-		if (keywords.getText() != null && !keywords.getText().trim().equals("")) {
-			sb.append("&keywords_type=");
+		if (keywords.getText() != null && !keywords.getText().trim().equals("")) { //$NON-NLS-1$
+			sb.append("&keywords_type="); //$NON-NLS-1$
 			sb.append(keywordOperationValues[keywordsOperation.getSelectionIndex()]);
-			appendToBuffer(sb, "&keywords=", keywords.getText().replace(',', ' '));
+			appendToBuffer(sb, "&keywords=", keywords.getText().replace(',', ' ')); //$NON-NLS-1$
 		}
 
 		return sb;
@@ -1354,6 +1365,7 @@
 		}
 	}
 
+	@Override
 	public IDialogSettings getDialogSettings() {
 		IDialogSettings settings = BugzillaUiPlugin.getDefault().getDialogSettings();
 		fDialogSettings = settings.getSection(PAGE_NAME);
@@ -1422,6 +1434,7 @@
 		}
 	}
 
+	@Override
 	public boolean canFlipToNextPage() {
 		// if (getErrorMessage() != null)
 		// return false;
@@ -1443,23 +1456,23 @@
 		// String serverName = startingUrl.substring(0,
 		// startingUrl.indexOf("?"));
 
-		startingUrl = startingUrl.substring(startingUrl.indexOf("?") + 1);
-		String[] options = startingUrl.split("&");
+		startingUrl = startingUrl.substring(startingUrl.indexOf("?") + 1); //$NON-NLS-1$
+		String[] options = startingUrl.split("&"); //$NON-NLS-1$
 		for (String option : options) {
-			String key = option.substring(0, option.indexOf("="));
-			String value = URLDecoder.decode(option.substring(option.indexOf("=") + 1),
+			String key = option.substring(0, option.indexOf("=")); //$NON-NLS-1$
+			String value = URLDecoder.decode(option.substring(option.indexOf("=") + 1), //$NON-NLS-1$
 					getTaskRepository().getCharacterEncoding());
 			if (key == null) {
 				continue;
 			}
 
-			if (key.equals("short_desc")) {
+			if (key.equals("short_desc")) { //$NON-NLS-1$
 				summaryPattern.setText(value);
-			} else if (key.equals("short_desc_type")) {
-				if (value.equals("allwordssubstr")) {
-					value = "all words";
-				} else if (value.equals("anywordssubstr")) {
-					value = "any word";
+			} else if (key.equals("short_desc_type")) { //$NON-NLS-1$
+				if (value.equals("allwordssubstr")) { //$NON-NLS-1$
+					value = "all words"; //$NON-NLS-1$
+				} else if (value.equals("anywordssubstr")) { //$NON-NLS-1$
+					value = "any word"; //$NON-NLS-1$
 				}
 				int index = 0;
 				for (String item : summaryOperation.getItems()) {
@@ -1471,7 +1484,7 @@
 				if (index < summaryOperation.getItemCount()) {
 					summaryOperation.select(index);
 				}
-			} else if (key.equals("product")) {
+			} else if (key.equals("product")) { //$NON-NLS-1$
 				String[] sel = product.getSelection();
 				java.util.List<String> selList = Arrays.asList(sel);
 				selList = new ArrayList<String>(selList);
@@ -1479,39 +1492,39 @@
 				sel = new String[selList.size()];
 				product.setSelection(selList.toArray(sel));
 				updateAttributesFromConfiguration(selList.toArray(sel));
-			} else if (key.equals("component")) {
+			} else if (key.equals("component")) { //$NON-NLS-1$
 				String[] sel = component.getSelection();
 				java.util.List<String> selList = Arrays.asList(sel);
 				selList = new ArrayList<String>(selList);
 				selList.add(value);
 				sel = new String[selList.size()];
 				component.setSelection(selList.toArray(sel));
-			} else if (key.equals("version")) {
+			} else if (key.equals("version")) { //$NON-NLS-1$
 				String[] sel = version.getSelection();
 				java.util.List<String> selList = Arrays.asList(sel);
 				selList = new ArrayList<String>(selList);
 				selList.add(value);
 				sel = new String[selList.size()];
 				version.setSelection(selList.toArray(sel));
-			} else if (key.equals("target_milestone")) { // XXX
+			} else if (key.equals("target_milestone")) { // XXX //$NON-NLS-1$
 				String[] sel = target.getSelection();
 				java.util.List<String> selList = Arrays.asList(sel);
 				selList = new ArrayList<String>(selList);
 				selList.add(value);
 				sel = new String[selList.size()];
 				target.setSelection(selList.toArray(sel));
-			} else if (key.equals("version")) {
+			} else if (key.equals("version")) { //$NON-NLS-1$
 				String[] sel = version.getSelection();
 				java.util.List<String> selList = Arrays.asList(sel);
 				selList = new ArrayList<String>(selList);
 				selList.add(value);
 				sel = new String[selList.size()];
 				version.setSelection(selList.toArray(sel));
-			} else if (key.equals("long_desc_type")) {
-				if (value.equals("allwordssubstr")) {
-					value = "all words";
-				} else if (value.equals("anywordssubstr")) {
-					value = "any word";
+			} else if (key.equals("long_desc_type")) { //$NON-NLS-1$
+				if (value.equals("allwordssubstr")) { //$NON-NLS-1$
+					value = "all words"; //$NON-NLS-1$
+				} else if (value.equals("anywordssubstr")) { //$NON-NLS-1$
+					value = "any word"; //$NON-NLS-1$
 				}
 				int index = 0;
 				for (String item : commentOperation.getItems()) {
@@ -1523,87 +1536,87 @@
 				if (index < commentOperation.getItemCount()) {
 					commentOperation.select(index);
 				}
-			} else if (key.equals("long_desc")) {
+			} else if (key.equals("long_desc")) { //$NON-NLS-1$
 				commentPattern.setText(value);
-			} else if (key.equals("bug_status")) {
+			} else if (key.equals("bug_status")) { //$NON-NLS-1$
 				String[] sel = status.getSelection();
 				java.util.List<String> selList = Arrays.asList(sel);
 				selList = new ArrayList<String>(selList);
 				selList.add(value);
 				sel = new String[selList.size()];
 				status.setSelection(selList.toArray(sel));
-			} else if (key.equals("resolution")) {
+			} else if (key.equals("resolution")) { //$NON-NLS-1$
 				String[] sel = resolution.getSelection();
 				java.util.List<String> selList = Arrays.asList(sel);
 				selList = new ArrayList<String>(selList);
 				selList.add(value);
 				sel = new String[selList.size()];
 				resolution.setSelection(selList.toArray(sel));
-			} else if (key.equals("bug_severity")) {
+			} else if (key.equals("bug_severity")) { //$NON-NLS-1$
 				String[] sel = severity.getSelection();
 				java.util.List<String> selList = Arrays.asList(sel);
 				selList = new ArrayList<String>(selList);
 				selList.add(value);
 				sel = new String[selList.size()];
 				severity.setSelection(selList.toArray(sel));
-			} else if (key.equals("priority")) {
+			} else if (key.equals("priority")) { //$NON-NLS-1$
 				String[] sel = priority.getSelection();
 				java.util.List<String> selList = Arrays.asList(sel);
 				selList = new ArrayList<String>(selList);
 				selList.add(value);
 				sel = new String[selList.size()];
 				priority.setSelection(selList.toArray(sel));
-			} else if (key.equals("ref_platform")) {
+			} else if (key.equals("ref_platform")) { //$NON-NLS-1$
 				String[] sel = hardware.getSelection();
 				java.util.List<String> selList = Arrays.asList(sel);
 				selList = new ArrayList<String>(selList);
 				selList.add(value);
 				sel = new String[selList.size()];
 				hardware.setSelection(selList.toArray(sel));
-			} else if (key.equals("op_sys")) {
+			} else if (key.equals("op_sys")) { //$NON-NLS-1$
 				String[] sel = os.getSelection();
 				java.util.List<String> selList = Arrays.asList(sel);
 				selList = new ArrayList<String>(selList);
 				selList.add(value);
 				sel = new String[selList.size()];
 				os.setSelection(selList.toArray(sel));
-			} else if (key.equals("emailassigned_to1")) { // HACK: email
+			} else if (key.equals("emailassigned_to1")) { // HACK: email //$NON-NLS-1$
 				// buttons
 				// assumed to be
 				// in same
 				// position
-				if (value.equals("1")) {
+				if (value.equals("1")) { //$NON-NLS-1$
 					emailButtons[0].setSelection(true);
 				} else {
 					emailButtons[0].setSelection(false);
 				}
-			} else if (key.equals("emailreporter1")) { // HACK: email
+			} else if (key.equals("emailreporter1")) { // HACK: email //$NON-NLS-1$
 				// buttons assumed
 				// to be in same
 				// position
-				if (value.equals("1")) {
+				if (value.equals("1")) { //$NON-NLS-1$
 					emailButtons[1].setSelection(true);
 				} else {
 					emailButtons[1].setSelection(false);
 				}
-			} else if (key.equals("emailcc1")) { // HACK: email buttons
+			} else if (key.equals("emailcc1")) { // HACK: email buttons //$NON-NLS-1$
 				// assumed to be in same
 				// position
-				if (value.equals("1")) {
+				if (value.equals("1")) { //$NON-NLS-1$
 					emailButtons[2].setSelection(true);
 				} else {
 					emailButtons[2].setSelection(false);
 				}
-			} else if (key.equals("emaillongdesc1")) { // HACK: email
+			} else if (key.equals("emaillongdesc1")) { // HACK: email //$NON-NLS-1$
 				// buttons assumed
 				// to be in same
 				// position
-				if (value.equals("1")) {
+				if (value.equals("1")) { //$NON-NLS-1$
 					emailButtons[3].setSelection(true);
 				} else {
 					emailButtons[3].setSelection(false);
 				}
-			} else if (key.equals("emailtype1")) {
+			} else if (key.equals("emailtype1")) { //$NON-NLS-1$
 				int index = 0;
 				for (String item : emailOperation.getItems()) {
 					if (item.compareTo(value) == 0) {
@@ -1614,45 +1627,45 @@
 				if (index < emailOperation.getItemCount()) {
 					emailOperation.select(index);
 				}
-			} else if (key.equals("email1")) {
+			} else if (key.equals("email1")) { //$NON-NLS-1$
 				emailPattern.setText(value);
-			} else if (key.equals("emailassigned_to2")) { // HACK: email
+			} else if (key.equals("emailassigned_to2")) { // HACK: email //$NON-NLS-1$
 				// buttons
 				// assumed to be
 				// in same
 				// position
-				if (value.equals("1")) {
+				if (value.equals("1")) { //$NON-NLS-1$
 					emailButtons2[0].setSelection(true);
 				} else {
 					emailButtons2[0].setSelection(false);
 				}
-			} else if (key.equals("emailreporter2")) { // HACK: email
+			} else if (key.equals("emailreporter2")) { // HACK: email //$NON-NLS-1$
 				// buttons assumed
 				// to be in same
 				// position
-				if (value.equals("1")) {
+				if (value.equals("1")) { //$NON-NLS-1$
 					emailButtons2[1].setSelection(true);
 				} else {
 					emailButtons2[1].setSelection(false);
 				}
-			} else if (key.equals("emailcc2")) { // HACK: email buttons
+			} else if (key.equals("emailcc2")) { // HACK: email buttons //$NON-NLS-1$
 				// assumed to be in same
 				// position
-				if (value.equals("1")) {
+				if (value.equals("1")) { //$NON-NLS-1$
 					emailButtons2[2].setSelection(true);
 				} else {
 					emailButtons2[2].setSelection(false);
 				}
-			} else if (key.equals("emaillongdesc2")) { // HACK: email
+			} else if (key.equals("emaillongdesc2")) { // HACK: email //$NON-NLS-1$
 				// buttons assumed
 				// to be in same
 				// position
-				if (value.equals("1")) {
+				if (value.equals("1")) { //$NON-NLS-1$
 					emailButtons2[3].setSelection(true);
 				} else {
 					emailButtons2[3].setSelection(false);
 				}
-			} else if (key.equals("emailtype2")) {
+			} else if (key.equals("emailtype2")) { //$NON-NLS-1$
 				int index = 0;
 				for (String item : emailOperation2.getItems()) {
 					if (item.compareTo(value) == 0) {
@@ -1663,13 +1676,13 @@
 				if (index < emailOperation2.getItemCount()) {
 					emailOperation2.select(index);
 				}
-			} else if (key.equals("email2")) {
+			} else if (key.equals("email2")) { //$NON-NLS-1$
 				emailPattern2.setText(value);
-			} else if (key.equals("changedin")) {
+			} else if (key.equals("changedin")) { //$NON-NLS-1$
 				daysText.setText(value);
-			} else if (key.equals("keywords")) {
+			} else if (key.equals("keywords")) { //$NON-NLS-1$
 				keywords.setText(value.replace(' ', ','));
-			} else if (key.equals("keywords_type")) {
+			} else if (key.equals("keywords_type")) { //$NON-NLS-1$
 				int index = 0;
 				for (String item : keywordOperationValues) {
 					if (item.equals(value)) {
@@ -1693,7 +1706,7 @@
 	private void restoreWidgetValues() {
 		try {
 			IDialogSettings settings = getDialogSettings();
-			String repoId = "." + getTaskRepository().getRepositoryUrl();
+			String repoId = "." + getTaskRepository().getRepositoryUrl(); //$NON-NLS-1$
 			if (!restoreQueryOptions || settings.getArray(STORE_PRODUCT_ID + repoId) == null || product == null) {
 				return;
 			}
@@ -1736,8 +1749,9 @@
 		}
 	}
 
+	@Override
 	public void saveState() {
-		String repoId = "." + getTaskRepository().getRepositoryUrl();
+		String repoId = "." + getTaskRepository().getRepositoryUrl(); //$NON-NLS-1$
 		IDialogSettings settings = getDialogSettings();
 		settings.put(STORE_PRODUCT_ID + repoId, product.getSelection());
 		settings.put(STORE_COMPONENT_ID + repoId, component.getSelection());
@@ -1837,10 +1851,10 @@
 		ComboContentAdapter textContentAdapter = new ComboContentAdapter();
 
 		ContentAssistCommandAdapter adapter = new ContentAssistCommandAdapter(text, textContentAdapter,
-				proposalProvider, "org.eclipse.ui.edit.text.contentAssist.proposals", new char[0]);
+				proposalProvider, "org.eclipse.ui.edit.text.contentAssist.proposals", new char[0]); //$NON-NLS-1$
 
 		IBindingService bindingService = (IBindingService) PlatformUI.getWorkbench().getService(IBindingService.class);
-		controlDecoration.setDescriptionText(NLS.bind("Content Assist Available ({0})",
+		controlDecoration.setDescriptionText(NLS.bind(Messages.BugzillaSearchPage_Content_Assist_Available__X_,
 				bindingService.getBestActiveBindingFormattedFor(adapter.getCommandId())));
 
 		return adapter;
@@ -1876,7 +1890,8 @@
 						monitor = new NullProgressMonitor();
 					}
 					try {
-						monitor.beginTask("Updating search options...", IProgressMonitor.UNKNOWN);
+						monitor.beginTask(Messages.BugzillaSearchPage_Updating_search_options_,
+								IProgressMonitor.UNKNOWN);
 						repositoryConfiguration = BugzillaCorePlugin.getRepositoryConfiguration(getTaskRepository(),
 								force, monitor);
 					} catch (final Exception e) {
@@ -1918,8 +1933,9 @@
 							shell.setEnabled(false);
 						}
 						// TODO: eliminate use of internal api
-						WebBrowserDialog dialog = new WebBrowserDialog(shell, "Error updating search options", null,
-								cause.getStatus().getMessage(), NONE, new String[] { IDialogConstants.OK_LABEL }, 0,
+						WebBrowserDialog dialog = new WebBrowserDialog(shell,
+								Messages.BugzillaSearchPage_Error_updating_search_options, null, cause.getStatus()
+										.getMessage(), NONE, new String[] { IDialogConstants.OK_LABEL }, 0,
 								((RepositoryStatus) cause.getStatus()).getHtmlMessage());
 						dialog.setBlockOnOpen(true);
 						dialog.open();
@@ -1938,8 +1954,8 @@
 					return;
 				}
 
-				MessageDialog.openError(shell, "Error updating search options", "Error was: "
-						+ ex.getCause().getMessage());
+				MessageDialog.openError(shell, Messages.BugzillaSearchPage_Error_updating_search_options,
+						Messages.BugzillaSearchPage_Error_was_ + ex.getCause().getMessage());
 				return;
 
 			} catch (InterruptedException ex) {
@@ -1952,7 +1968,7 @@
 
 	@Override
 	public String getQueryTitle() {
-		return (queryTitle != null) ? queryTitle.getText() : "";
+		return (queryTitle != null) ? queryTitle.getText() : ""; //$NON-NLS-1$
 	}
 
 	private void setSelection(List listControl, String[] selection) {
@@ -1978,5 +1994,4 @@
 		query.setSummary(getQueryTitle());
 		saveBounds(this.getShell().getBounds());
 	}
-
 }
Index: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/BugzillaProductPage.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/BugzillaProductPage.java,v
retrieving revision 1.97
diff -u -r1.97 BugzillaProductPage.java
--- org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/BugzillaProductPage.java	12 Sep 2008 04:15:33 -0000	1.97
+++ org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/BugzillaProductPage.java	1 Nov 2008 11:42:24 -0000
@@ -28,6 +28,7 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.layout.GridDataFactory;
@@ -81,12 +82,12 @@
  */
 public class BugzillaProductPage extends WizardPage {
 
-	private static final String NEW_BUGZILLA_TASK_ERROR_TITLE = "New Bugzilla Task Error";
+	private static final String NEW_BUGZILLA_TASK_ERROR_TITLE = Messages.BugzillaProductPage_New_Bugzilla_Task_Error;
 
-	private static final String DESCRIPTION = "Pick a product to open the new bug editor.\n"
-			+ "Press the Update button if the product is not in the list.";
+	private static final String DESCRIPTION = Messages.BugzillaProductPage_PICK_PRODUCT_TO_OPEN_NEW_BUG_EDITOR
+			+ Messages.BugzillaProductPage_PRESS_UPDATE_BUTTON;
 
-	private static final String LABEL_UPDATE = "Update Products from Repository";
+	private static final String LABEL_UPDATE = Messages.BugzillaProductPage_Update_Products_from_Repository;
 
 	/** The list of products to submit a bug report for */
 	private List<String> products = null;
@@ -110,12 +111,12 @@
 	 * @param selection
 	 */
 	public BugzillaProductPage(TaskRepository repository) {
-		super("Page1");
+		super(Messages.BugzillaProductPage_PAGE_1);
 		setTitle(IBugzillaConstants.TITLE_NEW_BUG);
 		setDescription(DESCRIPTION);
 		this.repository = repository;
-		setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.mylyn.bugzilla.ui",
-				"icons/wizban/bug-wizard.gif"));
+		setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.mylyn.bugzilla.ui", //$NON-NLS-1$
+				"icons/wizban/bug-wizard.gif")); //$NON-NLS-1$
 
 	}
 
@@ -176,9 +177,10 @@
 
 			public void selectionChanged(SelectionChangedEvent event) {
 				// Initialize a variable with the no error status
-				Status status = new Status(IStatus.OK, BugzillaUiPlugin.ID_PLUGIN, 0, "", null);
+				Status status = new Status(IStatus.OK, BugzillaUiPlugin.ID_PLUGIN, 0, "", null); //$NON-NLS-1$
 				if (productViewer.getSelection().isEmpty()) {
-					status = new Status(IStatus.ERROR, BugzillaUiPlugin.ID_PLUGIN, 0, "You must select a product", null);
+					status = new Status(IStatus.ERROR, BugzillaUiPlugin.ID_PLUGIN, 0,
+							Messages.BugzillaProductPage_YOU_MUST_SELECT_PRODUCT, null);
 				}
 
 				// Show the most serious error
@@ -192,7 +194,7 @@
 		// HACK: waiting on delayed refresh of filtered tree
 		final String[] selectedProducts = getSelectedProducts();
 		if (selectedProducts.length > 0) {
-			new UIJob("") {
+			new UIJob("") { //$NON-NLS-1$
 				@Override
 				public IStatus runInUIThread(IProgressMonitor monitor) {
 					if (BugzillaProductPage.this.getControl() != null
@@ -221,6 +223,7 @@
 			}
 		});
 
+		Dialog.applyDialogFont(composite);
 		// set the composite as the control for this page
 		setControl(composite);
 
@@ -242,7 +245,7 @@
 			PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
 				public void run() {
 					MessageDialog.openError(Display.getDefault().getActiveShell(), NEW_BUGZILLA_TASK_ERROR_TITLE,
-							"Unable to get products. Ensure proper repository configuration in task Repositories.");
+							Messages.BugzillaProductPage_Unable_to_get_products);
 				}
 			});
 		}
@@ -270,14 +273,14 @@
 
 			if (query != null && query.getConnectorKind().equals(BugzillaCorePlugin.CONNECTOR_KIND)) {
 				String queryUrl = query.getUrl();
-				queryUrl = queryUrl.substring(queryUrl.indexOf("?") + 1);
-				String[] options = queryUrl.split("&");
+				queryUrl = queryUrl.substring(queryUrl.indexOf("?") + 1); //$NON-NLS-1$
+				String[] options = queryUrl.split("&"); //$NON-NLS-1$
 
 				for (String option : options) {
-					int index = option.indexOf("=");
+					int index = option.indexOf("="); //$NON-NLS-1$
 					if (index != -1) {
 						String key = option.substring(0, index);
-						if ("product".equals(key)) {
+						if ("product".equals(key)) { //$NON-NLS-1$
 							try {
 								products.add(URLDecoder.decode(option.substring(index + 1),
 										repository.getCharacterEncoding()));
@@ -386,21 +389,22 @@
 		try {
 			getContainer().run(true, true, new IRunnableWithProgress() {
 				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-					monitor.beginTask("Updating repository report options...", IProgressMonitor.UNKNOWN);
+					monitor.beginTask(Messages.BugzillaProductPage_Updating_repository_report_options_,
+							IProgressMonitor.UNKNOWN);
 					try {
 						connector.updateRepositoryConfiguration(repository, monitor);
 					} catch (CoreException e) {
 						// TODO: remove exceptions from communication of connectivity errors to the user
 						if (e.getStatus().getException() instanceof GeneralSecurityException) {
 							StatusHandler.fail(new Status(IStatus.WARNING, BugzillaUiPlugin.ID_PLUGIN,
-									"Bugzilla could not log you in to get the information you requested since login name or password is incorrect.\n"
-											+ "Please ensure your task repository is properly configured.", e));
+									"Bugzilla could not log you in to get the information you requested since login name or password is incorrect.\n" //$NON-NLS-1$
+											+ "Please ensure your task repository is properly configured.", e)); //$NON-NLS-1$
 						} else if (e.getStatus().getException() instanceof IOException) {
 							StatusHandler.fail(new Status(IStatus.WARNING, BugzillaUiPlugin.ID_PLUGIN,
-									"Connection Error, please ensure your task repository is properly configured.", e));
+									"Connection Error, please ensure your task repository is properly configured.", e)); //$NON-NLS-1$
 						} else {
 							StatusHandler.fail(new Status(IStatus.WARNING, BugzillaUiPlugin.ID_PLUGIN,
-									"Error updating repository attributes for " + repository.getRepositoryUrl(), e));
+									"Error updating repository attributes for " + repository.getRepositoryUrl(), e)); //$NON-NLS-1$
 						}
 						return;
 					}
@@ -412,8 +416,9 @@
 					} catch (final CoreException e) {
 						PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
 							public void run() {
-								MessageDialog.openError(Display.getDefault().getActiveShell(), "Bugzilla Search Page",
-										"Unable to get configuration. Ensure proper repository configuration in Task Repositories");
+								MessageDialog.openError(Display.getDefault().getActiveShell(),
+										Messages.BugzillaProductPage_Bugzilla_Search_Page,
+										Messages.BugzillaProductPage_Unable_to_get_configuration);
 							}
 						});
 					}
@@ -427,8 +432,8 @@
 			});
 
 		} catch (InvocationTargetException ex) {
-			MessageDialog.openError(null, "Error updating product list", "Error reported:\n"
-					+ ex.getCause().getMessage());
+			MessageDialog.openError(null, Messages.BugzillaProductPage_Error_updating_product_list,
+					Messages.BugzillaProductPage_Error_reported + ex.getCause().getMessage());
 		} catch (InterruptedException ex) {
 			// canceled
 		}
Index: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/Messages.java
===================================================================
RCS file: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/Messages.java
diff -N org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/Messages.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/Messages.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,99 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008 Tasktop Technologies and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Tasktop Technologies - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.mylyn.internal.bugzilla.ui.search;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.bugzilla.ui.search.messages"; //$NON-NLS-1$
+
+	static {
+		// load message values from bundle file
+		reloadMessages();
+	}
+
+	public static void reloadMessages() {
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	public static String BugzillaSearchPage_Bugzilla_Query;
+
+	public static String BugzillaSearchPage_Bugzilla_Search_Page;
+
+	public static String BugzillaSearchPage_cc;
+
+	public static String BugzillaSearchPage_Changed_in;
+
+	public static String BugzillaSearchPage_Comment;
+
+	public static String BugzillaSearchPage_commenter;
+
+	public static String BugzillaSearchPage_Component;
+
+	public static String BugzillaSearchPage_Content_Assist_Available__X_;
+
+	public static String BugzillaSearchPage_days;
+
+	public static String BugzillaSearchPage_Email;
+
+	public static String BugzillaSearchPage_Email_2;
+
+	public static String BugzillaSearchPage_Error_updating_search_options;
+
+	public static String BugzillaSearchPage_Error_was_;
+
+	public static String BugzillaSearchPage_Hardware;
+
+	public static String BugzillaSearchPage_is_invalid;
+
+	public static String BugzillaSearchPage_Keywords;
+
+	public static String BugzillaSearchPage_Milestone;
+
+	public static String BugzillaSearchPage_No_repository_available;
+
+	public static String BugzillaSearchPage_Number_of_days_must_be_a_positive_integer;
+
+	public static String BugzillaSearchPage_Operating_System;
+
+	public static String BugzillaSearchPage_owner;
+
+	public static String BugzillaSearchPage_Product;
+
+	public static String BugzillaSearchPage_PROORITY;
+
+	public static String BugzillaSearchPage_Query_Title;
+
+	public static String BugzillaSearchPage_reporter;
+
+	public static String BugzillaSearchPage_Resolution;
+
+	public static String BugzillaSearchPage_Select_;
+
+	public static String BugzillaSearchPage_Select_the_Bugzilla_query_parameters;
+
+	public static String BugzillaSearchPage_Severity;
+
+	public static String BugzillaSearchPage_Status;
+
+	public static String BugzillaSearchPage_Summary;
+
+	public static String BugzillaSearchPage_Task_Repositories;
+
+	public static String BugzillaSearchPage_Unable_to_get_configuration;
+
+	public static String BugzillaSearchPage_Update_Attributes_from_Repository;
+
+	public static String BugzillaSearchPage_Updating_search_options_;
+
+	public static String BugzillaSearchPage_Version;
+}
Index: org.eclipse.mylyn.bugzilla.ui/plugin.properties
===================================================================
RCS file: org.eclipse.mylyn.bugzilla.ui/plugin.properties
diff -N org.eclipse.mylyn.bugzilla.ui/plugin.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ org.eclipse.mylyn.bugzilla.ui/plugin.properties	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,7 @@
+#Properties file for org.eclipse.mylyn.bugzilla.ui
+Bundle-Vendor = Eclipse.org
+Bundle-Name = Mylyn Bugzilla Connector UI
+
+bugzilla.repository.name=Bugzilla Repository
+BugzillaRepositoryConnector.name=Bugzilla Repository Connector 
+tasklist.BugzillaConnectorUi.name=Bugzilla Repository Ui
Index: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/Messages.java
===================================================================
RCS file: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/Messages.java
diff -N org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/Messages.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/Messages.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,85 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008 Tasktop Technologies and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Tasktop Technologies - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.mylyn.internal.bugzilla.ui.tasklist;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.bugzilla.ui.tasklist.messages"; //$NON-NLS-1$
+
+	static {
+		// load message values from bundle file
+		reloadMessages();
+	}
+
+	public static void reloadMessages() {
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	public static String BugzillaConnectorUi__In_reply_to_comment_X_;
+
+	public static String BugzillaConnectorUi__In_reply_to_X_comment_X_;
+
+	public static String BugzillaConnectorUi__In_reply_to_comment_0_;
+
+	public static String BugzillaCustomQueryDialog_Bugzilla_Query_Category_Name;
+
+	public static String BugzillaCustomQueryDialog_Max_Hits_Returned__1_means_all_;
+
+	public static String BugzillaCustomQueryDialog_Query_URL;
+
+	public static String BugzillaCustomQueryWizardPage_Create_query_from_URL;
+
+	public static String BugzillaCustomQueryWizardPage_Enter_the_title_and_URL_for_the_query;
+
+	public static String BugzillaCustomQueryWizardPage_Please_specify_Query_URL;
+
+	public static String BugzillaCustomQueryWizardPage_Query_Title;
+
+	public static String BugzillaCustomQueryWizardPage_Query_URL;
+
+	public static String BugzillaQueryTypeWizardPage_Choose_query_type;
+
+	public static String BugzillaQueryTypeWizardPage_Create_query_from_existing_URL;
+
+	public static String BugzillaQueryTypeWizardPage_Create_query_using_form;
+
+	public static String BugzillaQueryTypeWizardPage_Select_from_the_available_query_types;
+
+	public static String BugzillaRepositorySettingsPage_All;
+
+	public static String BugzillaRepositorySettingsPage_Automatic__Use_Validate_Settings_;
+
+	public static String BugzillaRepositorySettingsPage_AUTOTETECT_PLATFORM_AND_OS;
+
+	public static String BugzillaRepositorySettingsPage_Available_once_repository_has_been_created;
+
+	public static String BugzillaRepositorySettingsPage_Bugzilla_Repository_Settings;
+
+	public static String BugzillaRepositorySettingsPage_EXAMPLE_HTTP_WWW_ECLIPSE_ORG_BUGS;
+
+	public static String BugzillaRepositorySettingsPage_Language_;
+
+	public static String BugzillaRepositorySettingsPage_Local_users_enabled;
+
+	public static String BugzillaRepositorySettingsPage_Override_auto_detection_of_Platform_and_OS_for_new_bug_reports;
+
+	public static String BugzillaRepositorySettingsPage_Repository_version_;
+
+	public static String BugzillaRepositorySettingsPage_Retrieving_repository_configuration;
+
+	public static String BugzillaRepositorySettingsPage_Server_URL_is_invalid;
+
+	public static String BugzillaRepositorySettingsPage_Validate_Settings_or_select_repository_version_under_Additional_Settings_section;
+
+	public static String BugzillaRepositorySettingsPage_Validating_server_settings;
+}
Index: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/messages.properties
===================================================================
RCS file: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/messages.properties
diff -N org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/messages.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/messages.properties	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,12 @@
+BugzillaProductPage_Bugzilla_Search_Page=Bugzilla Search Page
+BugzillaProductPage_Error_reported=Error reported:\n
+BugzillaProductPage_Error_updating_product_list=Error updating product list
+BugzillaProductPage_New_Bugzilla_Task_Error=New Bugzilla Task Error
+BugzillaProductPage_PAGE_1=Page1
+BugzillaProductPage_PICK_PRODUCT_TO_OPEN_NEW_BUG_EDITOR=Pick a product to open the new bug editor.\n
+BugzillaProductPage_PRESS_UPDATE_BUTTON=Press the Update button if the product is not in the list.
+BugzillaProductPage_Unable_to_get_configuration=Unable to get configuration. Ensure proper repository configuration in Task Repositories
+BugzillaProductPage_Unable_to_get_products=Unable to get products. Ensure proper repository configuration in task Repositories.
+BugzillaProductPage_Update_Products_from_Repository=Update Products from Repository
+BugzillaProductPage_Updating_repository_report_options_=Updating repository report options...
+BugzillaProductPage_YOU_MUST_SELECT_PRODUCT=You must select a product
Index: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/messages.properties
===================================================================
RCS file: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/messages.properties
diff -N org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/messages.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/messages.properties	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,17 @@
+BugzillaKeywordAttributeEditor_Edit_=Edit...
+
+BugzillaPeoplePart_People=People
+BugzillaPeoplePart__Select_to_remove_=(Select to remove)
+
+BugzillaPlanningEditorPart_Current_Estimate=Current Estimate:
+BugzillaPlanningEditorPart_Team_Planning=Team Planning
+
+BugzillaTaskEditorPage_Please_enter_a_description_before_submitting=Please enter a description before submitting
+BugzillaTaskEditorPage_Please_enter_a_short_summary_before_submitting=Please enter a short summary before submitting
+BugzillaTaskEditorPage_Please_select_a_component_before_submitting=Please select a component before submitting
+BugzillaTaskEditorPage_Task_Submit_Error=Task Submit Error
+
+BugzillaVotesEditor_Show_votes=Show votes
+BugzillaVotesEditor_Vote=Vote
+
+KeywordsDialog_Select_Keywords=Select Keywords
Index: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/Messages.java
===================================================================
RCS file: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/Messages.java
diff -N org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/Messages.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/Messages.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008 Tasktop Technologies and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Tasktop Technologies - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.mylyn.internal.bugzilla.ui.editor;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.bugzilla.ui.editor.messages"; //$NON-NLS-1$
+
+	static {
+		// load message values from bundle file
+		reloadMessages();
+	}
+
+	public static void reloadMessages() {
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	public static String BugzillaKeywordAttributeEditor_Edit_;
+
+	public static String BugzillaPeoplePart_People;
+
+	public static String BugzillaPeoplePart__Select_to_remove_;
+
+	public static String BugzillaPlanningEditorPart_Current_Estimate;
+
+	public static String BugzillaPlanningEditorPart_Team_Planning;
+
+	public static String BugzillaTaskEditorPage_Please_enter_a_description_before_submitting;
+
+	public static String BugzillaTaskEditorPage_Please_enter_a_short_summary_before_submitting;
+
+	public static String BugzillaTaskEditorPage_Please_select_a_component_before_submitting;
+
+	public static String BugzillaTaskEditorPage_Task_Submit_Error;
+
+	public static String BugzillaVotesEditor_Show_votes;
+
+	public static String BugzillaVotesEditor_Vote;
+
+	public static String KeywordsDialog_Select_Keywords;
+}
Index: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/Messages.java
===================================================================
RCS file: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/Messages.java
diff -N org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/Messages.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/Messages.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008 Tasktop Technologies and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Tasktop Technologies - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.mylyn.internal.bugzilla.ui.wizard;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.bugzilla.ui.wizard.messages"; //$NON-NLS-1$
+
+	static {
+		// load message values from bundle file
+		reloadMessages();
+	}
+
+	public static void reloadMessages() {
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	public static String BugzillaProductPage_Bugzilla_Search_Page;
+	public static String BugzillaProductPage_Error_reported;
+	public static String BugzillaProductPage_Error_updating_product_list;
+	public static String BugzillaProductPage_New_Bugzilla_Task_Error;
+	public static String BugzillaProductPage_PAGE_1;
+	public static String BugzillaProductPage_PICK_PRODUCT_TO_OPEN_NEW_BUG_EDITOR;
+	public static String BugzillaProductPage_PRESS_UPDATE_BUTTON;
+	public static String BugzillaProductPage_Unable_to_get_configuration;
+	public static String BugzillaProductPage_Unable_to_get_products;
+	public static String BugzillaProductPage_Update_Products_from_Repository;
+	public static String BugzillaProductPage_Updating_repository_report_options_;
+	public static String BugzillaProductPage_YOU_MUST_SELECT_PRODUCT;
+}
Index: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/messages.properties
===================================================================
RCS file: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/messages.properties
diff -N org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/messages.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/messages.properties	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,32 @@
+BugzillaConnectorUi__In_reply_to_comment_X_=(In reply to comment \#{0})
+BugzillaConnectorUi__In_reply_to_X_comment_X_=(In reply to {0} comment \#{1})
+BugzillaConnectorUi__In_reply_to_comment_0_=(In reply to comment \#0)
+BugzillaCustomQueryDialog_Bugzilla_Query_Category_Name=Bugzilla Query Category Name
+BugzillaCustomQueryDialog_Max_Hits_Returned__1_means_all_=Max Hits Returned (-1 means all)
+BugzillaCustomQueryDialog_Query_URL=Query URL
+
+BugzillaCustomQueryWizardPage_Create_query_from_URL=Create query from URL
+BugzillaCustomQueryWizardPage_Enter_the_title_and_URL_for_the_query=Enter the title and URL for the query
+BugzillaCustomQueryWizardPage_Please_specify_Query_URL=Please specify Query URL
+BugzillaCustomQueryWizardPage_Query_Title=&Query Title:
+BugzillaCustomQueryWizardPage_Query_URL=Query &URL
+
+BugzillaQueryTypeWizardPage_Choose_query_type=Choose query type
+BugzillaQueryTypeWizardPage_Create_query_from_existing_URL=&Create query from existing URL
+BugzillaQueryTypeWizardPage_Create_query_using_form=Cre&ate query using form
+BugzillaQueryTypeWizardPage_Select_from_the_available_query_types=Select from the available query types.
+
+BugzillaRepositorySettingsPage_All=All
+BugzillaRepositorySettingsPage_Automatic__Use_Validate_Settings_=Automatic (Use Validate Settings)
+BugzillaRepositorySettingsPage_AUTOTETECT_PLATFORM_AND_OS=Autodetect platform and os
+BugzillaRepositorySettingsPage_Available_once_repository_has_been_created=Available once repository has been created.
+BugzillaRepositorySettingsPage_Bugzilla_Repository_Settings=Bugzilla Repository Settings
+BugzillaRepositorySettingsPage_EXAMPLE_HTTP_WWW_ECLIPSE_ORG_BUGS=Example: https://bugs.eclipse.org/bugs (do not include index.cgi)
+BugzillaRepositorySettingsPage_Language_=Language: 
+BugzillaRepositorySettingsPage_Local_users_enabled=Local users enabled:
+BugzillaRepositorySettingsPage_Override_auto_detection_of_Platform_and_OS_for_new_bug_reports=Override auto detection of Platform and OS for new bug reports.
+BugzillaRepositorySettingsPage_Repository_version_=Repository version: 
+BugzillaRepositorySettingsPage_Retrieving_repository_configuration=Retrieving repository configuration
+BugzillaRepositorySettingsPage_Server_URL_is_invalid=Server URL is invalid.
+BugzillaRepositorySettingsPage_Validate_Settings_or_select_repository_version_under_Additional_Settings_section=Validate Settings or select repository version under Additional Settings section.
+BugzillaRepositorySettingsPage_Validating_server_settings=Validating server settings
Index: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/messages.properties
===================================================================
RCS file: org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/messages.properties
diff -N org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/messages.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/messages.properties	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,36 @@
+BugzillaSearchPage_Bugzilla_Query=Bugzilla Query
+BugzillaSearchPage_Bugzilla_Search_Page=Bugzilla Search Page
+BugzillaSearchPage_cc=cc
+BugzillaSearchPage_Changed_in=Ch&anged in:
+BugzillaSearchPage_Comment=&Comment:
+BugzillaSearchPage_commenter=commenter
+BugzillaSearchPage_Component=Compo&nent:
+BugzillaSearchPage_Content_Assist_Available__X_=Content Assist Available ({0})
+BugzillaSearchPage_days=\ days.
+BugzillaSearchPage_Email=&Email:
+BugzillaSearchPage_Email_2=Email &2:
+BugzillaSearchPage_Error_updating_search_options=Error updating search options
+BugzillaSearchPage_Error_was_=Error was: 
+BugzillaSearchPage_Hardware=Hard&ware:
+BugzillaSearchPage_is_invalid=\ is invalid.
+BugzillaSearchPage_Keywords=&Keywords:
+BugzillaSearchPage_Milestone=&Milestone:
+BugzillaSearchPage_No_repository_available=No repository available, please add one using the Task Repositories view.
+BugzillaSearchPage_Number_of_days_must_be_a_positive_integer=Number of days must be a positive integer. 
+BugzillaSearchPage_Operating_System=&Operating System:
+BugzillaSearchPage_owner=owner
+BugzillaSearchPage_Product=&Product:
+BugzillaSearchPage_PROORITY=Priori&ty:
+BugzillaSearchPage_Query_Title=&Query Title:
+BugzillaSearchPage_reporter=reporter
+BugzillaSearchPage_Resolution=&Resolution:
+BugzillaSearchPage_Select_=Select...
+BugzillaSearchPage_Select_the_Bugzilla_query_parameters=Select the Bugzilla query parameters.  Use the Update Attributes button to retrieve updated values from the repository.
+BugzillaSearchPage_Severity=Se&verity:
+BugzillaSearchPage_Status=Stat&us:
+BugzillaSearchPage_Summary=Summar&y:
+BugzillaSearchPage_Task_Repositories=Task Repositories
+BugzillaSearchPage_Unable_to_get_configuration=Unable to get configuration. Ensure proper repository configuration in 
+BugzillaSearchPage_Update_Attributes_from_Repository=Up&date Attributes from Repository
+BugzillaSearchPage_Updating_search_options_=Updating search options...
+BugzillaSearchPage_Version=Vers&ion: