NEW - bug 253125: externalize strings for org.eclipse.mylyn.tasks.*

https://bugs.eclipse.org/bugs/show_bug.cgi?id=253125

36 files changed, 674 insertions, 216 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AbstractReplyToCommentAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AbstractReplyToCommentAction.java
index 1ec82906e..e8a411094 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AbstractReplyToCommentAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AbstractReplyToCommentAction.java
@@ -24,8 +24,6 @@ import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPage;
  */
 public abstract class AbstractReplyToCommentAction extends Action {
 
-	private static final String LABEL_REPLY = "Reply";
-
 	private final AbstractTaskEditorPage editor;
 
 	private final ITaskComment taskComment;
@@ -34,7 +32,7 @@ public abstract class AbstractReplyToCommentAction extends Action {
 		this.editor = editor;
 		this.taskComment = taskComment;
 		setImageDescriptor(TasksUiImages.COMMENT_REPLY);
-		setToolTipText(LABEL_REPLY);
+		setToolTipText(Messages.AbstractReplyToCommentAction_Reply);
 	}
 
 	protected abstract String getReplyText();
@@ -49,7 +47,7 @@ public abstract class AbstractReplyToCommentAction extends Action {
 		String reference = connectorUi.getReplyText(editor.getTaskRepository(), editor.getTask(), taskComment, false);
 		StringBuilder sb = new StringBuilder();
 		sb.append(reference);
-		sb.append("\n");
+		sb.append("\n"); //$NON-NLS-1$
 		if (text != null) {
 			CommentQuoter quoter = new CommentQuoter();
 			sb.append(quoter.quote(text));
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AttachmentSizeFormatter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AttachmentSizeFormatter.java
index ed7bbc24d..b06ebcac2 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AttachmentSizeFormatter.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AttachmentSizeFormatter.java
@@ -42,7 +42,7 @@ public class AttachmentSizeFormatter {
 	/**
 	 * Default value returned by this formatter when the size is unparseable, contain errors, etc.
 	 */
-	public static final String UNKNOWN_SIZE = "-";
+	public static final String UNKNOWN_SIZE = "-"; //$NON-NLS-1$
 
 	public final static AttachmentSizeFormatter getInstance() {
 		return new AttachmentSizeFormatter();
@@ -76,25 +76,25 @@ public class AttachmentSizeFormatter {
 		if (size < 1024) {
 			// format as byte
 			if (size == 1) {
-				return "1 byte";
+				return Messages.AttachmentSizeFormatter_1_byte;
 			}
-			DecimalFormat fmt = new DecimalFormat("0 bytes");
+			DecimalFormat fmt = new DecimalFormat(Messages.AttachmentSizeFormatter_0_bytes);
 			return fmt.format(size);
 		} else if (size >= 1024 && size <= 1048575) {
 			// format as KB
 			double formattedValue = size / 1024.0;
-			decimalFormat.applyPattern("0.00 KB");
+			decimalFormat.applyPattern(Messages.AttachmentSizeFormatter_0_KB);
 			return decimalFormat.format(formattedValue);
 		} else if (size >= 1048576 && size <= 1073741823) {
 			// format as MB
 			double formattedValue = size / 1048576.0;
-			decimalFormat.applyPattern("0.00 MB");
+			decimalFormat.applyPattern(Messages.AttachmentSizeFormatter_0_MB);
 			return decimalFormat.format(formattedValue);
 		}
 
 		// format as GB
 		double formattedValue = size / 1073741824.0;
-		decimalFormat.applyPattern("0.00 GB");
+		decimalFormat.applyPattern(Messages.AttachmentSizeFormatter_0_GB);
 		return decimalFormat.format(formattedValue);
 	}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/BooleanAttributeEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/BooleanAttributeEditor.java
index 8556efbfc..4a67ead8a 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/BooleanAttributeEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/BooleanAttributeEditor.java
@@ -46,7 +46,7 @@ public class BooleanAttributeEditor extends AbstractAttributeEditor {
 
 	@Override
 	public String getLabel() {
-		return "";
+		return ""; //$NON-NLS-1$
 	}
 
 	public boolean getValue() {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/BrowserPreviewViewer.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/BrowserPreviewViewer.java
index 01fdf9a35..ef1314fe3 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/BrowserPreviewViewer.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/BrowserPreviewViewer.java
@@ -66,7 +66,7 @@ public class BrowserPreviewViewer {
 					return;
 				}
 
-				if (event.location != null && !event.location.startsWith("about")) {
+				if (event.location != null && !event.location.startsWith("about")) { //$NON-NLS-1$
 					event.doit = false;
 					IHyperlink link = new TaskUrlHyperlink(
 							new Region(0, 0)/* a fake region just to make constructor happy */, event.location);
@@ -90,10 +90,10 @@ public class BrowserPreviewViewer {
 			private final String sourceText;
 
 			public PreviewWikiJob(String sourceText) {
-				super("Formatting Wiki Text");
+				super(Messages.BrowserPreviewViewer_Formatting_Wiki_Text);
 
 				if (sourceText == null) {
-					throw new IllegalArgumentException("source text must not be null");
+					throw new IllegalArgumentException("source text must not be null"); //$NON-NLS-1$
 				}
 
 				this.sourceText = sourceText;
@@ -111,7 +111,7 @@ public class BrowserPreviewViewer {
 			protected IStatus run(IProgressMonitor monitor) {
 				if (renderingEngine == null) {
 					jobStatus = new RepositoryStatus(taskRepository, IStatus.INFO, TasksUiPlugin.ID_PLUGIN,
-							RepositoryStatus.ERROR_INTERNAL, "The repository does not support HTML preview.");
+							RepositoryStatus.ERROR_INTERNAL, Messages.BrowserPreviewViewer_The_repository_does_not_support_HTML_preview);
 					return Status.OK_STATUS;
 				}
 
@@ -144,7 +144,7 @@ public class BrowserPreviewViewer {
 					} else {
 						browser.getDisplay().asyncExec(new Runnable() {
 							public void run() {
-								TasksUiInternal.displayStatus("Error", job.getStatus());
+								TasksUiInternal.displayStatus(Messages.BrowserPreviewViewer_Error, job.getStatus());
 								// TODO 3.1 error handling
 								//getAttributeEditorManager().setMessage(job.getStatus().getMessage(), IMessageProvider.ERROR);
 							}
@@ -162,7 +162,7 @@ public class BrowserPreviewViewer {
 	private void setText(Browser browser, String html) {
 		try {
 			ignoreLocationEvents = true;
-			browser.setText((html != null) ? html : "");
+			browser.setText((html != null) ? html : ""); //$NON-NLS-1$
 		} finally {
 			ignoreLocationEvents = false;
 		}
@@ -170,7 +170,7 @@ public class BrowserPreviewViewer {
 	}
 
 	public void update(String value) {
-		setText(browser, "Loading preview...");
+		setText(browser, Messages.BrowserPreviewViewer_Loading_preview_);
 		previewWiki(browser, value);
 	}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CategoryEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CategoryEditor.java
index 4ffe752ee..ed45aed1b 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CategoryEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CategoryEditor.java
@@ -35,7 +35,7 @@ import org.eclipse.ui.part.EditorPart;
  */
 public class CategoryEditor extends EditorPart {
 
-	public static final String ID_EDITOR = "org.eclipse.mylyn.tasks.ui.editors.category";
+	public static final String ID_EDITOR = "org.eclipse.mylyn.tasks.ui.editors.category"; //$NON-NLS-1$
 
 	private Text url;
 
@@ -92,7 +92,7 @@ public class CategoryEditor extends EditorPart {
 
 	private void createSummarySection(Composite parent, FormToolkit toolkit) {
 		Section summarySection = toolkit.createSection(parent, ExpandableComposite.TITLE_BAR);
-		summarySection.setText("Category Summary");
+		summarySection.setText(Messages.CategoryEditor_Category_Summary);
 		summarySection.setLayout(new TableWrapLayout());
 		summarySection.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
 
@@ -108,14 +108,14 @@ public class CategoryEditor extends EditorPart {
 			}
 		};
 
-		toolkit.createLabel(summaryContainer, "Description: ", SWT.NULL);
+		toolkit.createLabel(summaryContainer, Messages.CategoryEditor_Description_, SWT.NULL);
 //		lblDescription.setForeground(toolkit.getColors().getColor(FormColors.TITLE));
 		description = toolkit.createText(summaryContainer, input.getCategoryName(), SWT.FLAT);
 		description.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
 		description.setData(FormToolkit.KEY_DRAW_BORDER);
 		description.addModifyListener(modifyListener);
 
-		toolkit.createLabel(summaryContainer, "URL: ", SWT.NONE);
+		toolkit.createLabel(summaryContainer, Messages.CategoryEditor_URL_, SWT.NONE);
 //		lblUrl.setForeground(toolkit.getColors().getColor(FormColors.TITLE));
 		url = toolkit.createText(summaryContainer, input.getUrl(), SWT.FLAT);
 		url.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP));
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CategoryEditorInput.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CategoryEditorInput.java
index f540864f5..d2ef3662a 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CategoryEditorInput.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CategoryEditorInput.java
@@ -37,7 +37,7 @@ public class CategoryEditorInput implements IEditorInput {
 	}
 
 	public String getName() {
-		return "Category Editor";
+		return Messages.CategoryEditorInput_Category_Editor;
 	}
 
 	public IPersistableElement getPersistable() {
@@ -45,7 +45,7 @@ public class CategoryEditorInput implements IEditorInput {
 	}
 
 	public String getToolTipText() {
-		return "Category Editor";
+		return Messages.CategoryEditorInput_Category_Editor;
 	}
 
 	@SuppressWarnings("unchecked")
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/DateAttributeEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/DateAttributeEditor.java
index 76e9c789a..d4cfa93ac 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/DateAttributeEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/DateAttributeEditor.java
@@ -102,7 +102,7 @@ public class DateAttributeEditor extends AbstractAttributeEditor {
 
 			ImageHyperlink clearDeadlineDate = toolkit.createImageHyperlink(dateWithClearComposite, SWT.NONE);
 			clearDeadlineDate.setImage(CommonImages.getImage(CommonImages.REMOVE));
-			clearDeadlineDate.setToolTipText("Clear");
+			clearDeadlineDate.setToolTipText(Messages.DateAttributeEditor_Clear);
 			clearDeadlineDate.addHyperlinkListener(new HyperlinkAdapter() {
 				@Override
 				public void linkActivated(HyperlinkEvent e) {
@@ -137,7 +137,7 @@ public class DateAttributeEditor extends AbstractAttributeEditor {
 				return EditorUtil.formatDate(date);
 			}
 		} else {
-			return "";
+			return ""; //$NON-NLS-1$
 		}
 	}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/EditorUtil.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/EditorUtil.java
index 1bc31c497..ec03e3354 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/EditorUtil.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/EditorUtil.java
@@ -53,9 +53,9 @@ public class EditorUtil {
 //
 //	public static final String DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm";
 
-	static final String KEY_MARKER = "marker";
+	static final String KEY_MARKER = "marker"; //$NON-NLS-1$
 
-	static final String KEY_TEXT_VIEWER = "textViewer";
+	static final String KEY_TEXT_VIEWER = "textViewer"; //$NON-NLS-1$
 
 	public static final int MAXIMUM_HEIGHT = 140;
 
@@ -64,7 +64,7 @@ public class EditorUtil {
 	// XXX why is this required?
 	public static final Font TEXT_FONT = JFaceResources.getDefaultFont();
 
-	public static final String KEY_TOGGLE_TO_MAXIMIZE_ACTION = "maximizeAction";
+	public static final String KEY_TOGGLE_TO_MAXIMIZE_ACTION = "maximizeAction"; //$NON-NLS-1$
 
 	static boolean canDoGlobalAction(String actionId, TextViewer textViewer) {
 		if (actionId.equals(ActionFactory.CUT.getId())) {
@@ -348,7 +348,7 @@ public class EditorUtil {
 		if (comp.isExpanded() != expanded) {
 			Method method = null;
 			try {
-				method = ExpandableComposite.class.getDeclaredMethod("programmaticToggleState");
+				method = ExpandableComposite.class.getDeclaredMethod("programmaticToggleState"); //$NON-NLS-1$
 				method.setAccessible(true);
 				method.invoke(comp);
 			} catch (Exception e) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/Messages.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/Messages.java
new file mode 100644
index 000000000..ecc0f957e
--- /dev/null
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/Messages.java
@@ -0,0 +1,303 @@
+/*******************************************************************************
+ * 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.tasks.ui.editors;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.tasks.ui.editors.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 AbstractReplyToCommentAction_Reply;
+
+	public static String AttachmentSizeFormatter_0_bytes;
+
+	public static String AttachmentSizeFormatter_0_GB;
+
+	public static String AttachmentSizeFormatter_0_KB;
+
+	public static String AttachmentSizeFormatter_0_MB;
+
+	public static String AttachmentSizeFormatter_1_byte;
+
+	public static String AttachmentTableLabelProvider_File_;
+
+	public static String AttachmentTableLabelProvider_Patch;
+
+	public static String AttachmentTableLabelProvider_Task_Context;
+
+	public static String AttachmentTableLabelProvider_unrecognized_column;
+
+	public static String AttachmentTableLabelProvider2_File_;
+
+	public static String AttachmentTableLabelProvider2_Patch;
+
+	public static String AttachmentTableLabelProvider2_Task_Context;
+
+	public static String AttachmentTableLabelProvider2_Type_;
+
+	public static String AttachmentTableLabelProvider2_unrecognized_column;
+
+	public static String BrowserPreviewViewer_Error;
+
+	public static String BrowserPreviewViewer_Formatting_Wiki_Text;
+
+	public static String BrowserPreviewViewer_Loading_preview_;
+
+	public static String BrowserPreviewViewer_The_repository_does_not_support_HTML_preview;
+
+	public static String CategoryEditor_Category_Summary;
+
+	public static String CategoryEditor_Description_;
+
+	public static String CategoryEditor_URL_;
+
+	public static String CategoryEditorInput_Category_Editor;
+
+	public static String CommentGroupStrategy_Current;
+
+	public static String CommentGroupStrategy_Older;
+
+	public static String CommentGroupStrategy_Recent;
+
+	public static String DateAttributeEditor_Clear;
+
+	public static String PlanningPageFactory_Planning;
+
+	public static String PreviewAttributeEditor_Edit;
+
+	public static String PreviewAttributeEditor_Error;
+
+	public static String PreviewAttributeEditor_Formatting_Wiki_Text;
+
+	public static String PreviewAttributeEditor_Loading_preview_;
+
+	public static String PreviewAttributeEditor_Preview;
+
+	public static String RepositoryAttachmentEditorInput_Repository_Attachment;
+
+	public static String RepositoryTaskEditorDropListener_Note_that_only_the_first_file_dragged_will_be_attached;
+
+	public static String RepositoryTaskOutlineNode_BugReport_Object;
+
+	public static String RepositoryTaskOutlineNode_Comments;
+
+	public static String RepositoryTaskOutlineNode_Description;
+
+	public static String RepositoryTaskOutlineNode_New_Comment;
+
+	public static String RichTextAttributeEditor_Viewer_Source;
+
+	public static String TaskAttachmentDropListener_Note_that_only_the_first_file_dragged_will_be_attached;
+
+	public static String TaskEditorActionContributor_Add_to_X;
+
+	public static String TaskEditorActionContributor_Find;
+
+	public static String TaskEditorActionPart_Actions;
+
+	public static String TaskEditorActionPart_Add_to_Category;
+
+	public static String TaskEditorActionPart_Attach_Context;
+
+	public static String TaskEditorActionPart_Submit;
+
+	public static String TaskEditorActionPart_Submit_to_X;
+
+	public static String TaskEditorAttachmentPart_Attach_;
+
+	public static String TaskEditorAttachmentPart_Attach__Screenshot;
+
+	public static String TaskEditorAttachmentPart_Attachments;
+
+	public static String TaskEditorAttachmentPart_Created;
+
+	public static String TaskEditorAttachmentPart_Creator;
+
+	public static String TaskEditorAttachmentPart_Description;
+
+	public static String TaskEditorAttachmentPart_Name;
+
+	public static String TaskEditorAttachmentPart_No_attachments;
+
+	public static String TaskEditorAttachmentPart_Size;
+
+	public static String TaskEditorAttributePart_Attributes;
+
+	public static String TaskEditorAttributePart_Refresh_Attributes;
+
+	public static String TaskEditorAttributePart_Update_Failed;
+
+	public static String TaskEditorAttributePart_Updating_of_repository_configuration_failed;
+
+	public static String TaskEditorCommentPart_Collapse_All_Comments;
+
+	public static String TaskEditorCommentPart_Collapse_All_Current_Comments;
+
+	public static String TaskEditorCommentPart_Comments;
+
+	public static String TaskEditorCommentPart_Current;
+
+	public static String TaskEditorCommentPart_Expand_All_Comments;
+
+	public static String TaskEditorCommentPart_Expand_All_Current_Comments;
+
+	public static String TaskEditorCommentPart_Reply;
+
+	public static String TaskEditorDescriptionPart_Description;
+
+	public static String TaskEditorDescriptionPart_Detector;
+
+	public static String TaskEditorDescriptionPart_Duplicate_Detection_Failed;
+
+	public static String TaskEditorDescriptionPart_Duplicate_Detection;
+
+	public static String TaskEditorDescriptionPart_The_duplicate_detector_did_not_return_a_valid_query;
+
+	public static String TaskEditorDescriptionPart_Search;
+
+	public static String TaskEditorNewCommentPart_New_Comment;
+
+	public static String TaskEditorOutlineNode_Comments;
+
+	public static String TaskEditorOutlineNode_Description;
+
+	public static String TaskEditorOutlineNode_New_Comment;
+
+	public static String TaskEditorOutlineNode_Task_;
+
+	public static String TaskEditorPeoplePart_People;
+
+	public static String TaskEditorPlanningPart_0_SECOUNDS;
+
+	public static String TaskEditorPlanningPart_Active;
+
+	public static String TaskEditorPlanningPart_Clear;
+
+	public static String TaskEditorPlanningPart_Confirm_Activity_Time_Deletion;
+
+	public static String TaskEditorPlanningPart_Do_you_wish_to_reset_your_activity_time_on_this_task_;
+
+	public static String TaskEditorPlanningPart_Due;
+
+	public static String TaskEditorPlanningPart_Estimated;
+
+	public static String TaskEditorPlanningPart_Personal_Planning;
+
+	public static String TaskEditorPlanningPart_Reset;
+
+	public static String TaskEditorPlanningPart_Scheduled;
+
+	public static String TaskEditorPlanningPart_Time_working_on_this_task;
+
+	public static String TaskEditorRichTextPart_Browser_Preview;
+
+	public static String TaskEditorRichTextPart_Maximize;
+
+	public static String TaskEditorRichTextPart_Preview;
+
+	public static String TaskEditorSummaryPart_Summary;
+
+	public static String TaskFormPage_Errors;
+
+	public static String TaskPlanningEditor_0_seconds;
+
+	public static String TaskPlanningEditor_Active;
+
+	public static String TaskPlanningEditor_Clear;
+
+	public static String TaskPlanningEditor_Complete;
+
+	public static String TaskPlanningEditor_Completed;
+
+	public static String TaskPlanningEditor_Confirm_Activity_Time_Deletion;
+
+	public static String TaskPlanningEditor_Created;
+
+	public static String TaskPlanningEditor_Do_you_wish_to_reset_your_activity_time_on_this_task_;
+
+	public static String TaskPlanningEditor_Due;
+
+	public static String TaskPlanningEditor_Estimated_hours;
+
+	public static String TaskPlanningEditor_Incomplete;
+
+	public static String TaskPlanningEditor__info_editor_for_task_;
+
+	public static String TaskPlanningEditor_Notes;
+
+	public static String TaskPlanningEditor_Open_with_Web_Browser;
+
+	public static String TaskPlanningEditor_Personal_Planning;
+
+	public static String TaskPlanningEditor_Planning;
+
+	public static String TaskPlanningEditor_Priority;
+
+	public static String TaskPlanningEditor_Reset;
+
+	public static String TaskPlanningEditor_Retrieve_task_description_from_URL;
+
+	public static String TaskPlanningEditor_Scheduled_for;
+
+	public static String TaskPlanningEditor_Status;
+
+	public static String TaskPlanningEditor_Time_working_on_this_task;
+
+	public static String TaskPlanningEditor_URL;
+
+	public static String AbstractTaskEditorPage_Comment_required;
+
+	public static String AbstractTaskEditorPage_Could_not_save_task;
+
+	public static String AbstractTaskEditorPage_Error_opening_task;
+
+	public static String AbstractTaskEditorPage_Failed_to_read_task_data_;
+
+	public static String AbstractTaskEditorPage_History;
+
+	public static String AbstractTaskEditorPage_Open_failed;
+
+	public static String AbstractTaskEditorPage_Open_with_Web_Browser;
+
+	public static String AbstractTaskEditorPage_Save_failed;
+
+	public static String AbstractTaskEditorPage_Submit_failed;
+
+	public static String AbstractTaskEditorPage_Submit_failed_;
+
+	public static String AbstractTaskEditorPage_Synchronize_to_retrieve_task_data;
+
+	public static String AbstractTaskEditorPage_Synchronize_to_update_editor_contents;
+
+	public static String AbstractTaskEditorPage_Task_has_incoming_changes;
+
+	public static String AbstractTaskEditorPage_Title;
+
+	public static String AbstractTaskEditorPage_Unable_to_submit_at_this_time;
+
+	public static String AttributeEditorToolkit_Content_Assist_Available__X_;
+
+	public static String TaskEditor_New_;
+
+	public static String TaskEditor_Task_;
+
+	public static String TaskEditor_Task_added_to_the_Uncategorized_container;
+}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/PersonAttributeEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/PersonAttributeEditor.java
index 22ee768ba..17b86e4aa 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/PersonAttributeEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/PersonAttributeEditor.java
@@ -30,7 +30,7 @@ public class PersonAttributeEditor extends TextAttributeEditor {
 		if (repositoryPerson != null) {
 			return (isReadOnly()) ? repositoryPerson.toString() : repositoryPerson.getPersonId();
 		}
-		return "";
+		return ""; //$NON-NLS-1$
 	}
 
 	@Override
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/PlanningPageFactory.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/PlanningPageFactory.java
index 217e83e13..ccbd228ac 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/PlanningPageFactory.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/PlanningPageFactory.java
@@ -37,7 +37,7 @@ public class PlanningPageFactory extends AbstractTaskEditorPageFactory {
 
 	@Override
 	public String getPageText() {
-		return "Planning";
+		return Messages.PlanningPageFactory_Planning;
 	}
 
 	@Override
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/PreviewAttributeEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/PreviewAttributeEditor.java
index cd95473cf..0466acd9b 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/PreviewAttributeEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/PreviewAttributeEditor.java
@@ -48,6 +48,7 @@ import org.eclipse.ui.forms.widgets.FormToolkit;
  * @author Steffen Pingel
  * @deprecated replaced by {@link BrowserPreviewViewer}
  */
+// TODO 3.1 remove class
 @Deprecated
 public class PreviewAttributeEditor extends AbstractAttributeEditor {
 
@@ -81,7 +82,7 @@ public class PreviewAttributeEditor extends AbstractAttributeEditor {
 					return;
 				}
 
-				if (event.location != null && !event.location.startsWith("about")) {
+				if (event.location != null && !event.location.startsWith("about")) { //$NON-NLS-1$
 					event.doit = false;
 					IHyperlink link = new TaskUrlHyperlink(
 							new Region(0, 0)/* a fake region just to make constructor happy */, event.location);
@@ -146,9 +147,9 @@ public class PreviewAttributeEditor extends AbstractAttributeEditor {
 		// in this object and the method parameters, and this method is reused by both the
 		// description section and new comments section.
 		new Object() {
-			private static final String LABEL_BUTTON_EDIT = "Edit";
+			private/*static*/final String LABEL_BUTTON_EDIT = Messages.PreviewAttributeEditor_Edit;
 
-			private static final String LABEL_BUTTON_PREVIEW = "Preview";
+			private/*static*/final String LABEL_BUTTON_PREVIEW = Messages.PreviewAttributeEditor_Preview;
 
 			private int buttonState = 0;
 
@@ -170,7 +171,7 @@ public class PreviewAttributeEditor extends AbstractAttributeEditor {
 
 						buttonState = ++buttonState % 2;
 						if (buttonState == 1) {
-							setText(previewBrowser, "Loading preview...");
+							setText(previewBrowser, Messages.PreviewAttributeEditor_Loading_preview_);
 							previewWiki(previewBrowser, editor.getTextWidget().getText());
 						}
 						previewButton.setText(buttonState == 0 ? LABEL_BUTTON_PREVIEW : LABEL_BUTTON_EDIT);
@@ -192,10 +193,10 @@ public class PreviewAttributeEditor extends AbstractAttributeEditor {
 			private final String sourceText;
 
 			public PreviewWikiJob(String sourceText) {
-				super("Formatting Wiki Text");
+				super(Messages.PreviewAttributeEditor_Formatting_Wiki_Text);
 
 				if (sourceText == null) {
-					throw new IllegalArgumentException("source text must not be null");
+					throw new IllegalArgumentException("source text must not be null"); //$NON-NLS-1$
 				}
 
 				this.sourceText = sourceText;
@@ -213,7 +214,7 @@ public class PreviewAttributeEditor extends AbstractAttributeEditor {
 			protected IStatus run(IProgressMonitor monitor) {
 				if (renderingEngine == null) {
 					jobStatus = new RepositoryStatus(taskRepository, IStatus.INFO, TasksUiPlugin.ID_PLUGIN,
-							RepositoryStatus.ERROR_INTERNAL, "The repository does not support HTML preview.");
+							RepositoryStatus.ERROR_INTERNAL, "The repository does not support HTML preview."); //$NON-NLS-1$
 					return Status.OK_STATUS;
 				}
 
@@ -246,7 +247,7 @@ public class PreviewAttributeEditor extends AbstractAttributeEditor {
 					} else {
 						getControl().getDisplay().asyncExec(new Runnable() {
 							public void run() {
-								TasksUiInternal.displayStatus("Error", job.getStatus());
+								TasksUiInternal.displayStatus(Messages.PreviewAttributeEditor_Error, job.getStatus());
 								// TODO EDITOR error handling
 								//getAttributeEditorManager().setMessage(job.getStatus().getMessage(), IMessageProvider.ERROR);
 							}
@@ -264,7 +265,7 @@ public class PreviewAttributeEditor extends AbstractAttributeEditor {
 	private void setText(Browser browser, String html) {
 		try {
 			ignoreLocationEvents = true;
-			browser.setText((html != null) ? html : "");
+			browser.setText((html != null) ? html : ""); //$NON-NLS-1$
 		} finally {
 			ignoreLocationEvents = false;
 		}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryCompletionProcessor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryCompletionProcessor.java
index d37553a5c..313cbec1d 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryCompletionProcessor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryCompletionProcessor.java
@@ -58,7 +58,7 @@ public class RepositoryCompletionProcessor implements IContentAssistProcessor {
 
 	private class ProposalComputer {
 
-		public static final String LABEL_SEPARATOR = " -------------------------------------------- ";
+		public static final String LABEL_SEPARATOR = " -------------------------------------------- "; //$NON-NLS-1$
 
 		private final Set<ITask> addedTasks = new HashSet<ITask>();
 
@@ -135,8 +135,8 @@ public class RepositoryCompletionProcessor implements IContentAssistProcessor {
 		}
 
 		private boolean containsPrefix(ITask task) {
-			String searchTest = getTaskPrefix(task) + " " + labelProvider.getText(task);
-			String[] tokens = searchTest.split("\\s");
+			String searchTest = getTaskPrefix(task) + " " + labelProvider.getText(task); //$NON-NLS-1$
+			String[] tokens = searchTest.split("\\s"); //$NON-NLS-1$
 			for (String token : tokens) {
 				if (token.toLowerCase().startsWith(prefix)) {
 					return true;
@@ -146,7 +146,7 @@ public class RepositoryCompletionProcessor implements IContentAssistProcessor {
 		}
 
 		private CompletionProposal createSeparator() {
-			return new CompletionProposal("", offset, 0, 0, CommonImages.getImage(CommonImages.SEPARATOR_LIST),
+			return new CompletionProposal("", offset, 0, 0, CommonImages.getImage(CommonImages.SEPARATOR_LIST), //$NON-NLS-1$
 					LABEL_SEPARATOR, null, null);
 		}
 
@@ -158,7 +158,7 @@ public class RepositoryCompletionProcessor implements IContentAssistProcessor {
 			int i = offset;
 			IDocument document = viewer.getDocument();
 			if (i > document.getLength()) {
-				return "";
+				return ""; //$NON-NLS-1$
 			}
 
 			try {
@@ -172,7 +172,7 @@ public class RepositoryCompletionProcessor implements IContentAssistProcessor {
 
 				return document.get(i, offset - i);
 			} catch (BadLocationException e) {
-				return "";
+				return ""; //$NON-NLS-1$
 			}
 		}
 
@@ -320,7 +320,7 @@ public class RepositoryCompletionProcessor implements IContentAssistProcessor {
 		AbstractRepositoryConnector connector = TasksUiPlugin.getConnector(task.getConnectorKind());
 		String prefix = connector.getTaskIdPrefix();
 		// FIXME work around for Trac "#" prefix
-		return (prefix.length() > 1) ? prefix + " " : prefix;
+		return (prefix.length() > 1) ? prefix + " " : prefix; //$NON-NLS-1$
 	}
 
 }
\ No newline at end of file
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTextViewerConfiguration.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTextViewerConfiguration.java
index f647f615f..5043ce2be 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTextViewerConfiguration.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTextViewerConfiguration.java
@@ -56,9 +56,9 @@ public class RepositoryTextViewerConfiguration extends TextSourceViewerConfigura
 		URL, TASK, TASK_RELATION, DEFAULT
 	}
 
-	private static final String ID_CONTEXT_EDITOR_TASK = "org.eclipse.mylyn.tasks.ui.TaskEditor";
+	private static final String ID_CONTEXT_EDITOR_TASK = "org.eclipse.mylyn.tasks.ui.TaskEditor"; //$NON-NLS-1$
 
-	private static final String ID_CONTEXT_EDITOR_TEXT = "org.eclipse.ui.DefaultTextEditor";
+	private static final String ID_CONTEXT_EDITOR_TEXT = "org.eclipse.ui.DefaultTextEditor"; //$NON-NLS-1$
 
 	private RepositoryTextScanner scanner;
 
@@ -191,22 +191,22 @@ public class RepositoryTextViewerConfiguration extends TextSourceViewerConfigura
 					JFacePreferences.ACTIVE_HYPERLINK_COLOR)));
 			IToken quoteToken = new Token(new TextAttribute(CommonColors.TEXT_QUOTED));
 			IRule[] rules = new IRule[16];
-			rules[0] = (new SingleLineRule("http://", " ", bugToken));
-			rules[1] = (new SingleLineRule("https://", " ", bugToken));
-			rules[2] = (new SingleLineRule("bug#", " ", bugToken));
-			rules[3] = (new SingleLineRule("bug#", "", bugToken));
-			rules[4] = (new SingleLineRule("bug #", "", bugToken));
-			rules[5] = (new SingleLineRule("http://", "\n", bugToken));
-			rules[6] = (new SingleLineRule("https://", "\n", bugToken));
-			rules[7] = (new SingleLineRule("task#", " ", bugToken));
-			rules[8] = (new MultiLineRule("task#", "\n", bugToken));
-			rules[9] = (new MultiLineRule("task# ", " ", bugToken));
-			rules[10] = (new SingleLineRule("task #", "\n", bugToken));
-			rules[11] = (new SingleLineRule("*** This bug has been ", "***", bugToken));
-			rules[12] = (new SingleLineRule("http://", "", bugToken));
-			rules[13] = (new SingleLineRule("https://", "", bugToken));
-			rules[14] = (new MultiLineRule("task #", " ", bugToken));
-			SingleLineRule quoteRule = new SingleLineRule(">", null, quoteToken, (char) 0, true);
+			rules[0] = (new SingleLineRule("http://", " ", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
+			rules[1] = (new SingleLineRule("https://", " ", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
+			rules[2] = (new SingleLineRule("bug#", " ", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
+			rules[3] = (new SingleLineRule("bug#", "", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
+			rules[4] = (new SingleLineRule("bug #", "", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
+			rules[5] = (new SingleLineRule("http://", "\n", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
+			rules[6] = (new SingleLineRule("https://", "\n", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
+			rules[7] = (new SingleLineRule("task#", " ", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
+			rules[8] = (new MultiLineRule("task#", "\n", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
+			rules[9] = (new MultiLineRule("task# ", " ", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
+			rules[10] = (new SingleLineRule("task #", "\n", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
+			rules[11] = (new SingleLineRule("*** This bug has been ", "***", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
+			rules[12] = (new SingleLineRule("http://", "", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
+			rules[13] = (new SingleLineRule("https://", "", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
+			rules[14] = (new MultiLineRule("task #", " ", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
+			SingleLineRule quoteRule = new SingleLineRule(">", null, quoteToken, (char) 0, true); //$NON-NLS-1$
 			quoteRule.setColumnConstraint(0);
 			rules[15] = quoteRule;
 			setRules(rules);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RichTextAttributeEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RichTextAttributeEditor.java
index 1fe43da63..eb925b4f5 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RichTextAttributeEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RichTextAttributeEditor.java
@@ -96,7 +96,7 @@ public class RichTextAttributeEditor extends AbstractAttributeEditor {
 	public class ViewSourceAction extends Action {
 
 		public ViewSourceAction() {
-			super("Viewer Source", SWT.TOGGLE);
+			super(Messages.RichTextAttributeEditor_Viewer_Source, SWT.TOGGLE);
 			setChecked(false);
 		}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/SingleSelectionAttributeEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/SingleSelectionAttributeEditor.java
index 447d8e366..8a6be002e 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/SingleSelectionAttributeEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/SingleSelectionAttributeEditor.java
@@ -46,9 +46,9 @@ public class SingleSelectionAttributeEditor extends AbstractAttributeEditor {
 			toolkit.adapt(text, false, false);
 			text.setData(FormToolkit.KEY_DRAW_BORDER, Boolean.FALSE);
 			String label = getValueLabel();
-			if ("".equals(label)) {
+			if ("".equals(label)) { //$NON-NLS-1$
 				// if set to the empty string the label will use 64px on GTK 
-				text.setText(" ");
+				text.setText(" "); //$NON-NLS-1$
 			} else {
 				text.setText(label);
 			}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskAttachmentDropListener.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskAttachmentDropListener.java
index 616c9d472..25c6bc7ff 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskAttachmentDropListener.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskAttachmentDropListener.java
@@ -96,11 +96,11 @@ public class TaskAttachmentDropListener implements DropTargetListener {
 				NewAttachmentWizardDialog dialog = EditorUtil.openNewAttachmentWizard(page, null,
 						new FileTaskAttachmentSource(file));
 				if (files.length > 1) {
-					dialog.setMessage("Note that only the first file dragged will be attached.",
+					dialog.setMessage(Messages.TaskAttachmentDropListener_Note_that_only_the_first_file_dragged_will_be_attached,
 							IMessageProvider.WARNING);
 				}
 			}
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskAttachmentStorage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskAttachmentStorage.java
index de293f460..ced37c7f9 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskAttachmentStorage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskAttachmentStorage.java
@@ -37,15 +37,15 @@ import org.eclipse.mylyn.tasks.ui.TasksUi;
  */
 public class TaskAttachmentStorage extends PlatformObject implements IStorage {
 
-	private static final String ATTACHMENT_DEFAULT_NAME = "attachment";
+	private static final String ATTACHMENT_DEFAULT_NAME = "attachment"; //$NON-NLS-1$
 
-	private static final String CTYPE_ZIP = "zip";
+	private static final String CTYPE_ZIP = "zip"; //$NON-NLS-1$
 
-	private static final String CTYPE_OCTET_STREAM = "octet-stream";
+	private static final String CTYPE_OCTET_STREAM = "octet-stream"; //$NON-NLS-1$
 
-	private static final String CTYPE_TEXT = "text";
+	private static final String CTYPE_TEXT = "text"; //$NON-NLS-1$
 
-	private static final String CTYPE_HTML = "html";
+	private static final String CTYPE_HTML = "html"; //$NON-NLS-1$
 
 	private final TaskRepository taskRepository;
 
@@ -67,7 +67,7 @@ public class TaskAttachmentStorage extends PlatformObject implements IStorage {
 		Assert.isNotNull(attachment);
 		TaskAttribute taskAttribute = attachment.getTaskAttribute();
 		if (taskAttribute == null) {
-			throw new CoreException(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, "Failed to find attachment: "
+			throw new CoreException(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, "Failed to find attachment: " //$NON-NLS-1$
 					+ attachment.getUrl()));
 		}
 		return new TaskAttachmentStorage(attachment.getTaskRepository(), attachment.getTask(), taskAttribute,
@@ -78,23 +78,23 @@ public class TaskAttachmentStorage extends PlatformObject implements IStorage {
 		String name = attachment.getFileName();
 		// if no filename is set, make one up with the proper extension so
 		// we can support opening in that filetype's default editor
-		if (name == null || "".equals(name)) {
+		if (name == null || "".equals(name)) { //$NON-NLS-1$
 			String ctype = attachment.getContentType();
 			if (ctype.endsWith(CTYPE_HTML)) {
-				name = ATTACHMENT_DEFAULT_NAME + ".html";
+				name = ATTACHMENT_DEFAULT_NAME + ".html"; //$NON-NLS-1$
 			} else if (ctype.startsWith(CTYPE_TEXT)) {
-				name = ATTACHMENT_DEFAULT_NAME + ".txt";
+				name = ATTACHMENT_DEFAULT_NAME + ".txt"; //$NON-NLS-1$
 			} else if (ctype.endsWith(CTYPE_OCTET_STREAM)) {
 				name = ATTACHMENT_DEFAULT_NAME;
 			} else if (ctype.endsWith(CTYPE_ZIP)) {
-				name = ATTACHMENT_DEFAULT_NAME + "." + CTYPE_ZIP;
+				name = ATTACHMENT_DEFAULT_NAME + "." + CTYPE_ZIP; //$NON-NLS-1$
 			} else {
-				name = ATTACHMENT_DEFAULT_NAME + "." + ctype.substring(ctype.indexOf("/") + 1);
+				name = ATTACHMENT_DEFAULT_NAME + "." + ctype.substring(ctype.indexOf("/") + 1); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 		}
 		// treat .patch files as text files
-		if (name.endsWith(".patch")) {
-			name += ".txt";
+		if (name.endsWith(".patch")) { //$NON-NLS-1$
+			name += ".txt"; //$NON-NLS-1$
 		}
 		return name;
 	}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionContributor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionContributor.java
index 90a6e72b2..c12f1dde4 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionContributor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionContributor.java
@@ -11,6 +11,7 @@
 
 package org.eclipse.mylyn.internal.tasks.ui.editors;
 
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -143,7 +144,7 @@ public class TaskEditorActionContributor extends MultiPageEditorActionBarContrib
 		selectAllAction.setEnabled(true);
 
 		findAction = new GlobalAction(ActionFactory.FIND.getId());
-		findAction.setText("Find");
+		findAction.setText(Messages.TaskEditorActionContributor_Find);
 		findAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.FIND_REPLACE);
 		findAction.setImageDescriptor(CommonImages.FIND);
 	}
@@ -175,7 +176,8 @@ public class TaskEditorActionContributor extends MultiPageEditorActionBarContrib
 			addClipboardActions(manager);
 		}
 		if (editor.getTaskEditorInput() == null) {
-			final MenuManager subMenuManager = new MenuManager("Add to " + TaskListView.LABEL_VIEW);
+			final MenuManager subMenuManager = new MenuManager(MessageFormat.format(
+					Messages.TaskEditorActionContributor_Add_to_X, TaskListView.LABEL_VIEW));
 			List<AbstractTaskCategory> categories = new ArrayList<AbstractTaskCategory>(TasksUiInternal.getTaskList()
 					.getCategories());
 			Collections.sort(categories);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionPart.java
index 63455ced8..f5f2eb30c 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionPart.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionPart.java
@@ -12,6 +12,7 @@
 
 package org.eclipse.mylyn.internal.tasks.ui.editors;
 
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -114,11 +115,9 @@ public class TaskEditorActionPart extends AbstractTaskEditorPart {
 
 	private static final int DEFAULT_FIELD_WIDTH = 150;
 
-	private static final String LABEL_BUTTON_SUBMIT = "Submit";
-
 	private static final int RADIO_OPTION_WIDTH = 120;
 
-	private static final String KEY_ASSOCIATED_EDITOR = "associatedEditor";
+	private static final String KEY_ASSOCIATED_EDITOR = "associatedEditor"; //$NON-NLS-1$
 
 	private List<Button> operationButtons;
 
@@ -137,11 +136,12 @@ public class TaskEditorActionPart extends AbstractTaskEditorPart {
 	private TaskAttribute selectedOperationAttribute;
 
 	public TaskEditorActionPart() {
-		setPartName("Actions");
+		setPartName(Messages.TaskEditorActionPart_Actions);
 	}
 
 	protected void addAttachContextButton(Composite buttonComposite, FormToolkit toolkit) {
-		attachContextButton = toolkit.createButton(buttonComposite, "Attach Context", SWT.CHECK);
+		attachContextButton = toolkit.createButton(buttonComposite, Messages.TaskEditorActionPart_Attach_Context,
+				SWT.CHECK);
 		attachContextButton.setImage(CommonImages.getImage(TasksUiImages.CONTEXT_ATTACH));
 	}
 
@@ -153,7 +153,7 @@ public class TaskEditorActionPart extends AbstractTaskEditorPart {
 	 * @param toolkit
 	 */
 	private void createActionButtons(Composite buttonComposite, FormToolkit toolkit) {
-		submitButton = toolkit.createButton(buttonComposite, LABEL_BUTTON_SUBMIT, SWT.NONE);
+		submitButton = toolkit.createButton(buttonComposite, Messages.TaskEditorActionPart_Submit, SWT.NONE);
 		GridData submitButtonData = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
 		submitButtonData.widthHint = 100;
 		submitButton.setImage(CommonImages.getImage(TasksUiImages.REPOSITORY_SUBMIT));
@@ -166,7 +166,7 @@ public class TaskEditorActionPart extends AbstractTaskEditorPart {
 
 		setSubmitEnabled(true);
 
-		toolkit.createLabel(buttonComposite, "    ");
+		toolkit.createLabel(buttonComposite, "    "); //$NON-NLS-1$
 
 		if (!getTaskData().isNew()) {
 			addAttachContextButton(buttonComposite, toolkit);
@@ -180,7 +180,8 @@ public class TaskEditorActionPart extends AbstractTaskEditorPart {
 	 * @param toolkit
 	 */
 	private void createCategoryChooser(Composite buttonComposite, FormToolkit toolkit) {
-		addToCategory = getManagedForm().getToolkit().createButton(buttonComposite, "Add to Category", SWT.CHECK);
+		addToCategory = getManagedForm().getToolkit().createButton(buttonComposite,
+				Messages.TaskEditorActionPart_Add_to_Category, SWT.CHECK);
 		categoryChooser = new CCombo(buttonComposite, SWT.FLAT | SWT.READ_ONLY);
 		categoryChooser.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER);
 		categoryChooser.setLayoutData(GridDataFactory.swtDefaults().hint(150, SWT.DEFAULT).create());
@@ -355,7 +356,8 @@ public class TaskEditorActionPart extends AbstractTaskEditorPart {
 		if (submitButton != null && !submitButton.isDisposed()) {
 			submitButton.setEnabled(enabled);
 			if (enabled) {
-				submitButton.setToolTipText("Submit to " + getTaskEditorPage().getTaskRepository().getRepositoryUrl());
+				submitButton.setToolTipText(MessageFormat.format(Messages.TaskEditorActionPart_Submit_to_X,
+						getTaskEditorPage().getTaskRepository().getRepositoryUrl()));
 			}
 		}
 	}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorAttachmentPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorAttachmentPart.java
index b3d8d5bd1..a85a655ee 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorAttachmentPart.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorAttachmentPart.java
@@ -63,9 +63,9 @@ import org.eclipse.ui.internal.WorkbenchImages;
  */
 public class TaskEditorAttachmentPart extends AbstractTaskEditorPart {
 
-	private static final String ID_POPUP_MENU = "org.eclipse.mylyn.tasks.ui.editor.menu.attachments";
+	private static final String ID_POPUP_MENU = "org.eclipse.mylyn.tasks.ui.editor.menu.attachments"; //$NON-NLS-1$
 
-	private final String[] attachmentsColumns = { "Name", "Description", /*"Type", */"Size", "Creator", "Created" };
+	private final String[] attachmentsColumns = { Messages.TaskEditorAttachmentPart_Name, Messages.TaskEditorAttachmentPart_Description, /*"Type", */Messages.TaskEditorAttachmentPart_Size, Messages.TaskEditorAttachmentPart_Creator, Messages.TaskEditorAttachmentPart_Created }; //$NON-NLS-1$
 
 	private final int[] attachmentsColumnWidths = { 130, 150, /*100,*/70, 100, 100 };
 
@@ -78,7 +78,7 @@ public class TaskEditorAttachmentPart extends AbstractTaskEditorPart {
 	private Composite attachmentsComposite;
 
 	public TaskEditorAttachmentPart() {
-		setPartName("Attachments");
+		setPartName(Messages.TaskEditorAttachmentPart_Attachments);
 	}
 
 	private void createAttachmentTable(FormToolkit toolkit, final Composite attachmentsComposite) {
@@ -160,7 +160,7 @@ public class TaskEditorAttachmentPart extends AbstractTaskEditorPart {
 		attachmentControlsComposite.setLayout(new GridLayout(2, false));
 		attachmentControlsComposite.setLayoutData(new GridData(GridData.BEGINNING));
 
-		Button attachFileButton = toolkit.createButton(attachmentControlsComposite, "Attach...", SWT.PUSH);
+		Button attachFileButton = toolkit.createButton(attachmentControlsComposite, Messages.TaskEditorAttachmentPart_Attach_, SWT.PUSH);
 		attachFileButton.setImage(WorkbenchImages.getImage(ISharedImages.IMG_OBJ_FILE));
 		attachFileButton.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -170,7 +170,7 @@ public class TaskEditorAttachmentPart extends AbstractTaskEditorPart {
 		});
 		getTaskEditorPage().registerDefaultDropListener(attachFileButton);
 
-		Button attachScreenshotButton = toolkit.createButton(attachmentControlsComposite, "Attach Screenshot...",
+		Button attachScreenshotButton = toolkit.createButton(attachmentControlsComposite, Messages.TaskEditorAttachmentPart_Attach__Screenshot,
 				SWT.PUSH);
 		attachScreenshotButton.setImage(CommonImages.getImage(CommonImages.IMAGE_CAPTURE));
 		attachScreenshotButton.addSelectionListener(new SelectionAdapter() {
@@ -187,7 +187,7 @@ public class TaskEditorAttachmentPart extends AbstractTaskEditorPart {
 		initialize();
 
 		final Section section = createSection(parent, toolkit, hasIncoming);
-		section.setText(getPartName() + " (" + attachments.size() + ")");
+		section.setText(getPartName() + " (" + attachments.size() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
 		if (hasIncoming) {
 			expandSection(toolkit, section);
 		} else {
@@ -214,7 +214,7 @@ public class TaskEditorAttachmentPart extends AbstractTaskEditorPart {
 		if (attachments.size() > 0) {
 			createAttachmentTable(toolkit, attachmentsComposite);
 		} else {
-			Label label = toolkit.createLabel(attachmentsComposite, "No attachments");
+			Label label = toolkit.createLabel(attachmentsComposite, Messages.TaskEditorAttachmentPart_No_attachments);
 			getTaskEditorPage().registerDefaultDropListener(label);
 		}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorAttributePart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorAttributePart.java
index eefb6ae98..8bc51cca8 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorAttributePart.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorAttributePart.java
@@ -72,7 +72,7 @@ public class TaskEditorAttributePart extends AbstractTaskEditorPart {
 	private Composite attributesComposite;
 
 	public TaskEditorAttributePart() {
-		setPartName("Attributes");
+		setPartName(Messages.TaskEditorAttributePart_Attributes);
 	}
 
 	private void createAttributeControls(Composite attributesComposite, FormToolkit toolkit, int columnCount) {
@@ -85,7 +85,7 @@ public class TaskEditorAttributePart extends AbstractTaskEditorPart {
 				currentPriority = priority;
 				if (currentColumn > 1) {
 					while (currentColumn <= columnCount) {
-						getManagedForm().getToolkit().createLabel(attributesComposite, "");
+						getManagedForm().getToolkit().createLabel(attributesComposite, ""); //$NON-NLS-1$
 						currentColumn++;
 					}
 					currentColumn = 1;
@@ -207,7 +207,7 @@ public class TaskEditorAttributePart extends AbstractTaskEditorPart {
 								getTaskEditorPage().showEditorBusy(false);
 								if (job.getStatus() != null) {
 									getTaskEditorPage().getTaskEditor().setStatus(
-											"Updating of repository configuration failed", "Update Failed",
+											Messages.TaskEditorAttributePart_Updating_of_repository_configuration_failed, Messages.TaskEditorAttributePart_Update_Failed,
 											job.getStatus());
 								} else {
 									getTaskEditorPage().refreshFormContent();
@@ -247,7 +247,7 @@ public class TaskEditorAttributePart extends AbstractTaskEditorPart {
 		};
 		repositoryConfigRefresh.setImageDescriptor(TasksUiImages.REPOSITORY_SYNCHRONIZE_SMALL);
 		repositoryConfigRefresh.selectionChanged(new StructuredSelection(getTaskEditorPage().getTaskRepository()));
-		repositoryConfigRefresh.setToolTipText("Refresh Attributes");
+		repositoryConfigRefresh.setToolTipText(Messages.TaskEditorAttributePart_Refresh_Attributes);
 		toolBar.add(repositoryConfigRefresh);
 	}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorDescriptionPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorDescriptionPart.java
index a3372c65e..22d3a735a 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorDescriptionPart.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorDescriptionPart.java
@@ -49,12 +49,8 @@ import org.eclipse.ui.forms.widgets.Section;
  */
 public class TaskEditorDescriptionPart extends TaskEditorRichTextPart {
 
-	private static final String LABEL_SEARCH_DUPS = "Search";
-
-	private static final String LABEL_SELECT_DETECTOR = "Duplicate Detection";
-
 	public TaskEditorDescriptionPart() {
-		setPartName("Description");
+		setPartName(Messages.TaskEditorDescriptionPart_Description);
 	}
 
 	private void addDuplicateDetection(Composite composite, FormToolkit toolkit) {
@@ -68,7 +64,7 @@ public class TaskEditorDescriptionPart extends TaskEditorRichTextPart {
 				style |= ExpandableComposite.EXPANDED;
 			}
 			Section duplicatesSection = toolkit.createSection(composite, style);
-			duplicatesSection.setText(LABEL_SELECT_DETECTOR);
+			duplicatesSection.setText(Messages.TaskEditorDescriptionPart_Duplicate_Detection);
 			duplicatesSection.setLayout(new GridLayout());
 			GridDataFactory.fillDefaults().indent(SWT.DEFAULT, 15).applyTo(duplicatesSection);
 			Composite relatedBugsComposite = toolkit.createComposite(duplicatesSection);
@@ -76,7 +72,7 @@ public class TaskEditorDescriptionPart extends TaskEditorRichTextPart {
 			relatedBugsComposite.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
 			duplicatesSection.setClient(relatedBugsComposite);
 			Label duplicateDetectorLabel = new Label(relatedBugsComposite, SWT.LEFT);
-			duplicateDetectorLabel.setText("Detector:");
+			duplicateDetectorLabel.setText(Messages.TaskEditorDescriptionPart_Detector);
 
 			final CCombo duplicateDetectorChooser = new CCombo(relatedBugsComposite, SWT.FLAT | SWT.READ_ONLY);
 			toolkit.adapt(duplicateDetectorChooser, false, false);
@@ -101,7 +97,7 @@ public class TaskEditorDescriptionPart extends TaskEditorRichTextPart {
 			duplicateDetectorChooser.setData(allCollectors);
 
 			if (allCollectors.size() > 0) {
-				Button searchForDuplicates = toolkit.createButton(relatedBugsComposite, LABEL_SEARCH_DUPS, SWT.NONE);
+				Button searchForDuplicates = toolkit.createButton(relatedBugsComposite, Messages.TaskEditorDescriptionPart_Search, SWT.NONE);
 				GridData searchDuplicatesButtonData = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
 				searchForDuplicates.setLayoutData(searchDuplicatesButtonData);
 				searchForDuplicates.addListener(SWT.Selection, new Listener() {
@@ -141,7 +137,7 @@ public class TaskEditorDescriptionPart extends TaskEditorRichTextPart {
 	}
 
 	protected IRepositoryQuery getDuplicateQuery(String name) throws CoreException {
-		String duplicateDetectorName = name.equals("default") ? "Stack Trace" : name;
+		String duplicateDetectorName = name.equals("default") ? "Stack Trace" : name; //$NON-NLS-1$ //$NON-NLS-2$
 		for (AbstractDuplicateDetector detector : getDuplicateSearchCollectorsList()) {
 			if (detector.getName().equals(duplicateDetectorName)) {
 				return detector.getDuplicatesQuery(getTaskEditorPage().getTaskRepository(), getTaskData());
@@ -180,11 +176,11 @@ public class TaskEditorDescriptionPart extends TaskEditorRichTextPart {
 						getTaskEditorPage().getTaskRepository(), duplicatesQuery);
 				NewSearchUI.runQueryInBackground(collector);
 			} else {
-				TasksUiInternal.displayStatus("Duplicate Detection Failed", new Status(IStatus.ERROR,
-						TasksUiPlugin.ID_PLUGIN, "The duplicate detector did not return a valid query."));
+				TasksUiInternal.displayStatus(Messages.TaskEditorDescriptionPart_Duplicate_Detection_Failed, new Status(IStatus.ERROR,
+						TasksUiPlugin.ID_PLUGIN, Messages.TaskEditorDescriptionPart_The_duplicate_detector_did_not_return_a_valid_query));
 			}
 		} catch (CoreException e) {
-			TasksUiInternal.displayStatus("Duplicate Detection Failed", e.getStatus());
+			TasksUiInternal.displayStatus(Messages.TaskEditorDescriptionPart_Duplicate_Detection_Failed, e.getStatus());
 		}
 	}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorExtensionReader.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorExtensionReader.java
index 4e74bbd09..3b109a63a 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorExtensionReader.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorExtensionReader.java
@@ -28,17 +28,17 @@ import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorExtension;
  */
 public class TaskEditorExtensionReader {
 
-	private static final String CONNECTOR_KIND = "connectorKind";
+	private static final String CONNECTOR_KIND = "connectorKind"; //$NON-NLS-1$
 
-	public static final String ATTR_ID = "id";
+	public static final String ATTR_ID = "id"; //$NON-NLS-1$
 
-	public static final String ATTR_NAME = "name";
+	public static final String ATTR_NAME = "name"; //$NON-NLS-1$
 
-	public static final String EXTENSION_TASK_EDITOR_EXTENSIONS = "org.eclipse.mylyn.tasks.ui.taskEditorExtensions";
+	public static final String EXTENSION_TASK_EDITOR_EXTENSIONS = "org.eclipse.mylyn.tasks.ui.taskEditorExtensions"; //$NON-NLS-1$
 
-	private static final String REPOSITORY_ASSOCIATION = "repositoryAssociation";
+	private static final String REPOSITORY_ASSOCIATION = "repositoryAssociation"; //$NON-NLS-1$
 
-	private static final String TASK_EDITOR_EXTENSION = "taskEditorExtension";
+	private static final String TASK_EDITOR_EXTENSION = "taskEditorExtension"; //$NON-NLS-1$
 
 	public static void initExtensions() {
 		IExtensionRegistry registry = Platform.getExtensionRegistry();
@@ -61,13 +61,13 @@ public class TaskEditorExtensionReader {
 		try {
 			String id = element.getAttribute(ATTR_ID);
 			String name = element.getAttribute(ATTR_NAME);
-			AbstractTaskEditorExtension extension = (AbstractTaskEditorExtension) element.createExecutableExtension("class");
+			AbstractTaskEditorExtension extension = (AbstractTaskEditorExtension) element.createExecutableExtension("class"); //$NON-NLS-1$
 			TaskEditorExtensions.addTaskEditorExtension(id, name, extension);
 		} catch (CoreException e) {
-			StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, "Could not load taskEditorExtension",
+			StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, "Could not load taskEditorExtension", //$NON-NLS-1$
 					e));
 		} catch (Exception e) {
-			StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, "Could not load taskEditorExtension",
+			StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, "Could not load taskEditorExtension", //$NON-NLS-1$
 					e));
 		}
 	}
@@ -79,7 +79,7 @@ public class TaskEditorExtensionReader {
 			TaskEditorExtensions.addRepositoryAssociation(repository, taskEditorExtension);
 		} catch (Exception e) {
 			StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN,
-					"Could not load repositoryAssociation", e));
+					"Could not load repositoryAssociation", e)); //$NON-NLS-1$
 		}
 	}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorExtensions.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorExtensions.java
index c44eb8f73..5446198c3 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorExtensions.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorExtensions.java
@@ -29,7 +29,7 @@ import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorExtension;
  */
 public class TaskEditorExtensions {
 
-	public static final String REPOSITORY_PROPERTY_EDITOR_EXTENSION = "editorExtension";
+	public static final String REPOSITORY_PROPERTY_EDITOR_EXTENSION = "editorExtension"; //$NON-NLS-1$
 
 	private static Map<String, RegisteredTaskEditorExtension> extensionsById = new HashMap<String, RegisteredTaskEditorExtension>();
 
@@ -47,7 +47,7 @@ public class TaskEditorExtensions {
 		RegisteredTaskEditorExtension previous = extensionsById.put(id, new RegisteredTaskEditorExtension(extension,
 				id, name));
 		if (previous != null) {
-			StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, "Duplicate taskEditorExtension id="
+			StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, "Duplicate taskEditorExtension id=" //$NON-NLS-1$
 					+ id, null));
 		}
 	}
@@ -59,7 +59,7 @@ public class TaskEditorExtensions {
 		String previous = associationByConnectorKind.put(connectorKind, extensionId);
 		if (previous != null) {
 			StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, String.format(
-					"Duplicate association for repository %s: %s replaces %s", connectorKind, extensionId, previous),
+					"Duplicate association for repository %s: %s replaces %s", connectorKind, extensionId, previous), //$NON-NLS-1$
 					null));
 		}
 	}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorInputFactory.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorInputFactory.java
index 146345c0c..ac7c4d425 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorInputFactory.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorInputFactory.java
@@ -28,9 +28,9 @@ import org.eclipse.ui.IMemento;
  */
 public class TaskEditorInputFactory implements IElementFactory {
 
-	public static final String TAG_TASK_HANDLE = "taskHandle";
+	public static final String TAG_TASK_HANDLE = "taskHandle"; //$NON-NLS-1$
 
-	public static final String ID_FACTORY = "org.eclipse.mylyn.tasks.ui.elementFactories.task.editor";
+	public static final String ID_FACTORY = "org.eclipse.mylyn.tasks.ui.elementFactories.task.editor"; //$NON-NLS-1$
 
 	public IAdaptable createElement(IMemento memento) {
 		String handle = memento.getString(TAG_TASK_HANDLE);
@@ -41,13 +41,13 @@ public class TaskEditorInputFactory implements IElementFactory {
 			if (taskRepository != null) {
 				return new TaskEditorInput(taskRepository, task);
 			} else {
-				StatusHandler.log(new Status(IStatus.WARNING, TasksUiPlugin.ID_PLUGIN, "Repository for connector kind "
-						+ task.getConnectorKind() + " with url " + task.getRepositoryUrl() + " cannont be found."));
+				StatusHandler.log(new Status(IStatus.WARNING, TasksUiPlugin.ID_PLUGIN, "Repository for connector kind " //$NON-NLS-1$
+						+ task.getConnectorKind() + " with url " + task.getRepositoryUrl() + " cannont be found.")); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 		} else {
 			StatusHandler.log(new Status(IStatus.WARNING, TasksUiPlugin.ID_PLUGIN,
-					"Failed to restore task editor: Task with handle \"" + handle
-							+ "\" could not be found in task list."));
+					"Failed to restore task editor: Task with handle \"" + handle //$NON-NLS-1$
+							+ "\" could not be found in task list.")); //$NON-NLS-1$
 		}
 		return null;
 	}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorNewCommentPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorNewCommentPart.java
index b16f8dfcb..c0927afb5 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorNewCommentPart.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorNewCommentPart.java
@@ -21,7 +21,7 @@ import org.eclipse.ui.forms.widgets.ExpandableComposite;
 public class TaskEditorNewCommentPart extends TaskEditorRichTextPart {
 
 	public TaskEditorNewCommentPart() {
-		setPartName("New Comment");
+		setPartName(Messages.TaskEditorNewCommentPart_New_Comment);
 		setSectionStyle(ExpandableComposite.TITLE_BAR | ExpandableComposite.EXPANDED);
 		setExpandVertically(true);
 	}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorOutlineNode.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorOutlineNode.java
index 2a233ac60..a3ada9523 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorOutlineNode.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorOutlineNode.java
@@ -29,11 +29,11 @@ import org.eclipse.mylyn.tasks.core.data.TaskData;
  */
 public class TaskEditorOutlineNode {
 
-	public static final String LABEL_COMMENTS = "Comments";
+	public static final String LABEL_COMMENTS = Messages.TaskEditorOutlineNode_Comments;
 
-	public static final String LABEL_DESCRIPTION = "Description";
+	public static final String LABEL_DESCRIPTION = Messages.TaskEditorOutlineNode_Description;
 
-	public static final String LABEL_NEW_COMMENT = "New Comment";
+	public static final String LABEL_NEW_COMMENT = Messages.TaskEditorOutlineNode_New_Comment;
 
 	private static TaskEditorOutlineNode createNode(TaskData taskData, String attributeId, String label) {
 		TaskAttribute taskAttribute = taskData.getRoot().getMappedAttribute(attributeId);
@@ -54,16 +54,16 @@ public class TaskEditorOutlineNode {
 				taskAttribute.getTaskData().getAttributeMapper().updateTaskComment(taskComment, taskAttribute);
 				StringBuilder sb = new StringBuilder();
 				sb.append(taskComment.getNumber());
-				sb.append(": ");
+				sb.append(": "); //$NON-NLS-1$
 				IRepositoryPerson author = taskComment.getAuthor();
 				if (author != null) {
 					sb.append(author.toString());
 				}
 				Date creationDate = taskComment.getCreationDate();
 				if (creationDate != null) {
-					sb.append(" (");
+					sb.append(" ("); //$NON-NLS-1$
 					sb.append(EditorUtil.formatDateTime(creationDate));
-					sb.append(")");
+					sb.append(")"); //$NON-NLS-1$
 				}
 				TaskEditorOutlineNode node = new TaskEditorOutlineNode(sb.toString(), taskAttribute);
 				node.setTaskComment(taskComment);
@@ -79,7 +79,7 @@ public class TaskEditorOutlineNode {
 	public static TaskEditorOutlineNode parse(TaskData taskData) {
 		TaskEditorOutlineNode rootNode = createNode(taskData, TaskAttribute.SUMMARY, null);
 		if (rootNode == null) {
-			rootNode = new TaskEditorOutlineNode("Task " + taskData.getTaskId());
+			rootNode = new TaskEditorOutlineNode(Messages.TaskEditorOutlineNode_Task_ + taskData.getTaskId());
 		}
 		addNode(rootNode, taskData, TaskAttribute.DESCRIPTION, LABEL_DESCRIPTION);
 		List<TaskAttribute> comments = taskData.getAttributeMapper().getAttributesByType(taskData,
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorPeoplePart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorPeoplePart.java
index d09d3d11e..892b9630b 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorPeoplePart.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorPeoplePart.java
@@ -29,7 +29,7 @@ public class TaskEditorPeoplePart extends AbstractTaskEditorPart {
 	private static final int COLUMN_MARGIN = 5;
 
 	public TaskEditorPeoplePart() {
-		setPartName("People");
+		setPartName(Messages.TaskEditorPeoplePart_People);
 	}
 
 	private void addAttribute(Composite composite, FormToolkit toolkit, TaskAttribute attribute) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorPlanningPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorPlanningPart.java
index c16d4faef..26d2f835b 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorPlanningPart.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorPlanningPart.java
@@ -59,12 +59,6 @@ import org.eclipse.ui.forms.widgets.Section;
  */
 public class TaskEditorPlanningPart extends AbstractTaskEditorPart {
 
-	private static final String CLEAR = "Clear";
-
-	private static final String NO_TIME_ELAPSED = "0 seconds";
-
-	private static final String RESET = "Reset";
-
 	private static final int CONTROL_WIDTH = 135;
 
 	private DatePicker dueDatePicker;
@@ -118,7 +112,7 @@ public class TaskEditorPlanningPart extends AbstractTaskEditorPart {
 	};
 
 	public TaskEditorPlanningPart() {
-		setPartName("Personal Planning");
+		setPartName(Messages.TaskEditorPlanningPart_Personal_Planning);
 	}
 
 	@Override
@@ -152,9 +146,9 @@ public class TaskEditorPlanningPart extends AbstractTaskEditorPart {
 	}
 
 	private void createActualTime(FormToolkit toolkit, Composite parent) {
-		Label label = toolkit.createLabel(parent, "Active:");
+		Label label = toolkit.createLabel(parent, Messages.TaskEditorPlanningPart_Active);
 		label.setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
-		label.setToolTipText("Time working on this task");
+		label.setToolTipText(Messages.TaskEditorPlanningPart_Time_working_on_this_task);
 
 		Composite nameValueComp = createComposite(parent, 2, toolkit);
 
@@ -168,13 +162,13 @@ public class TaskEditorPlanningPart extends AbstractTaskEditorPart {
 
 		ImageHyperlink resetActivityTimeButton = toolkit.createImageHyperlink(nameValueComp, SWT.NONE);
 		resetActivityTimeButton.setImage(CommonImages.getImage(CommonImages.FIND_CLEAR));
-		resetActivityTimeButton.setToolTipText(RESET);
+		resetActivityTimeButton.setToolTipText(Messages.TaskEditorPlanningPart_Reset);
 		resetActivityTimeButton.addHyperlinkListener(new HyperlinkAdapter() {
 
 			@Override
 			public void linkActivated(HyperlinkEvent e) {
-				if (MessageDialog.openConfirm(getControl().getShell(), "Confirm Activity Time Deletion",
-						"Do you wish to reset your activity time on this task?\n\nThis will take immediate affect and can not be undone.")) {
+				if (MessageDialog.openConfirm(getControl().getShell(), Messages.TaskEditorPlanningPart_Confirm_Activity_Time_Deletion,
+						Messages.TaskEditorPlanningPart_Do_you_wish_to_reset_your_activity_time_on_this_task_)) {
 					MonitorUi.getActivityContextManager().removeActivityTime(task.getHandleIdentifier(), 0l,
 							System.currentTimeMillis());
 				}
@@ -185,8 +179,8 @@ public class TaskEditorPlanningPart extends AbstractTaskEditorPart {
 	private void updateElapsedTime() {
 		String elapsedTimeString = DateUtil.getFormattedDurationShort(TasksUiPlugin.getTaskActivityManager()
 				.getElapsedTime(task));
-		if (elapsedTimeString.equals("")) {
-			elapsedTimeString = NO_TIME_ELAPSED;
+		if (elapsedTimeString.equals("")) { //$NON-NLS-1$
+			elapsedTimeString = Messages.TaskEditorPlanningPart_0_SECOUNDS;
 		}
 		elapsedTimeText.setText(elapsedTimeString);
 	}
@@ -229,7 +223,7 @@ public class TaskEditorPlanningPart extends AbstractTaskEditorPart {
 	}
 
 	private void createDueDatePicker(FormToolkit toolkit, Composite parent) {
-		Label label = toolkit.createLabel(parent, "Due:");
+		Label label = toolkit.createLabel(parent, Messages.TaskEditorPlanningPart_Due);
 		label.setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
 
 		Composite composite = createComposite(parent, 2, toolkit);
@@ -254,7 +248,7 @@ public class TaskEditorPlanningPart extends AbstractTaskEditorPart {
 
 		ImageHyperlink clearDueDate = toolkit.createImageHyperlink(composite, SWT.NONE);
 		clearDueDate.setImage(CommonImages.getImage(CommonImages.FIND_CLEAR));
-		clearDueDate.setToolTipText(CLEAR);
+		clearDueDate.setToolTipText(Messages.TaskEditorPlanningPart_Clear);
 		clearDueDate.addHyperlinkListener(new HyperlinkAdapter() {
 			@Override
 			public void linkActivated(HyperlinkEvent e) {
@@ -265,7 +259,7 @@ public class TaskEditorPlanningPart extends AbstractTaskEditorPart {
 	}
 
 	private void createEstimatedTime(FormToolkit toolkit, Composite parent) {
-		Label label = toolkit.createLabel(parent, "Estimated:");
+		Label label = toolkit.createLabel(parent, Messages.TaskEditorPlanningPart_Estimated);
 		label.setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
 
 		Composite composite = createComposite(parent, 2, toolkit);
@@ -288,7 +282,7 @@ public class TaskEditorPlanningPart extends AbstractTaskEditorPart {
 
 		ImageHyperlink clearEstimated = toolkit.createImageHyperlink(composite, SWT.NONE);
 		clearEstimated.setImage(CommonImages.getImage(CommonImages.FIND_CLEAR));
-		clearEstimated.setToolTipText("Clear");
+		clearEstimated.setToolTipText(Messages.TaskEditorPlanningPart_Clear);
 		clearEstimated.addHyperlinkListener(new HyperlinkAdapter() {
 			@Override
 			public void linkActivated(HyperlinkEvent e) {
@@ -300,7 +294,7 @@ public class TaskEditorPlanningPart extends AbstractTaskEditorPart {
 	}
 
 	private void createScheduledDatePicker(FormToolkit toolkit, Composite parent) {
-		Label label = toolkit.createLabel(parent, "Scheduled:");
+		Label label = toolkit.createLabel(parent, Messages.TaskEditorPlanningPart_Scheduled);
 		label.setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
 
 		Composite composite = createComposite(parent, 2, toolkit);
@@ -324,7 +318,7 @@ public class TaskEditorPlanningPart extends AbstractTaskEditorPart {
 
 		ImageHyperlink clearScheduledDate = toolkit.createImageHyperlink(composite, SWT.NONE);
 		clearScheduledDate.setImage(CommonImages.getImage(CommonImages.FIND_CLEAR));
-		clearScheduledDate.setToolTipText(CLEAR);
+		clearScheduledDate.setToolTipText(Messages.TaskEditorPlanningPart_Clear);
 		clearScheduledDate.addHyperlinkListener(new HyperlinkAdapter() {
 			@Override
 			public void linkActivated(HyperlinkEvent e) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorRichTextPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorRichTextPart.java
index d27350e64..0f4653079 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorRichTextPart.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorRichTextPart.java
@@ -64,7 +64,7 @@ public class TaskEditorRichTextPart extends AbstractTaskEditorPart {
 		StringBuilder strBuilder = new StringBuilder();
 		String oldText = editor.getViewer().getDocument().get();
 		if (strBuilder.length() != 0) {
-			strBuilder.append("\n");
+			strBuilder.append("\n"); //$NON-NLS-1$
 		}
 		strBuilder.append(oldText);
 		strBuilder.append(text);
@@ -96,10 +96,10 @@ public class TaskEditorRichTextPart extends AbstractTaskEditorPart {
 			if (attributEditor != null) {
 				clazz = attributEditor.getClass().getName();
 			} else {
-				clazz = "<null>";
+				clazz = "<null>"; //$NON-NLS-1$
 			}
 			StatusHandler.log(new Status(IStatus.WARNING, TasksUiPlugin.ID_PLUGIN,
-					"Expected an instance of RichTextAttributeEditor, got \"" + clazz + "\""));
+					"Expected an instance of RichTextAttributeEditor, got \"" + clazz + "\"")); //$NON-NLS-1$ //$NON-NLS-2$
 			return;
 		}
 
@@ -216,16 +216,16 @@ public class TaskEditorRichTextPart extends AbstractTaskEditorPart {
 
 	private class ToggleToMaximizePartAction extends Action {
 
-		private static final String COMMAND_ID = "org.eclipse.mylyn.tasks.ui.command.maximizePart";
+		private static final String COMMAND_ID = "org.eclipse.mylyn.tasks.ui.command.maximizePart"; //$NON-NLS-1$
 
-		private static final String MAXIMIZE = "Maximize";
+		private/*static*/final String MAXIMIZE = Messages.TaskEditorRichTextPart_Maximize;
 
 		private static final int SECTION_HEADER_HEIGHT = 50;
 
 		private int originalHeight = -1;
 
 		public ToggleToMaximizePartAction() {
-			super("", SWT.TOGGLE);
+			super("", SWT.TOGGLE); //$NON-NLS-1$
 			setImageDescriptor(CommonImages.PART_MAXIMIZE);
 			setToolTipText(MAXIMIZE);
 			setActionDefinitionId(COMMAND_ID);
@@ -272,7 +272,7 @@ public class TaskEditorRichTextPart extends AbstractTaskEditorPart {
 	@Override
 	protected void fillToolBar(ToolBarManager manager) {
 		if (getEditor().hasPreview()) {
-			togglePreviewAction = new Action("", SWT.TOGGLE) {
+			togglePreviewAction = new Action("", SWT.TOGGLE) { //$NON-NLS-1$
 				@Override
 				public void run() {
 					if (isChecked()) {
@@ -287,12 +287,12 @@ public class TaskEditorRichTextPart extends AbstractTaskEditorPart {
 				}
 			};
 			togglePreviewAction.setImageDescriptor(CommonImages.PREVIEW_WEB);
-			togglePreviewAction.setToolTipText("Preview");
+			togglePreviewAction.setToolTipText(Messages.TaskEditorRichTextPart_Preview);
 			togglePreviewAction.setChecked(false);
 			manager.add(togglePreviewAction);
 		}
 		if (getEditor().hasBrowser()) {
-			toggleBrowserAction = new Action("", SWT.TOGGLE) {
+			toggleBrowserAction = new Action("", SWT.TOGGLE) { //$NON-NLS-1$
 				@Override
 				public void run() {
 					if (isChecked()) {
@@ -307,7 +307,7 @@ public class TaskEditorRichTextPart extends AbstractTaskEditorPart {
 				}
 			};
 			toggleBrowserAction.setImageDescriptor(CommonImages.PREVIEW_WEB);
-			toggleBrowserAction.setToolTipText("Browser Preview");
+			toggleBrowserAction.setToolTipText(Messages.TaskEditorRichTextPart_Browser_Preview);
 			toggleBrowserAction.setChecked(false);
 			manager.add(toggleBrowserAction);
 		}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorSummaryPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorSummaryPart.java
index 03070ae18..5be2b26d2 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorSummaryPart.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorSummaryPart.java
@@ -39,7 +39,7 @@ public class TaskEditorSummaryPart extends AbstractTaskEditorPart {
 	private AbstractAttributeEditor summaryEditor;
 
 	public TaskEditorSummaryPart() {
-		setPartName("Summary");
+		setPartName(Messages.TaskEditorSummaryPart_Summary);
 	}
 
 	private void addAttribute(Composite composite, FormToolkit toolkit, TaskAttribute attribute) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskFormPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskFormPage.java
index 3192710f8..05b189b2b 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskFormPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskFormPage.java
@@ -506,7 +506,7 @@ public class TaskFormPage extends FormPage {
 
 		public String getTypeLabel(Annotation annotation) {
 			if (annotation instanceof ErrorAnnotation) {
-				return "Errors";
+				return Messages.TaskFormPage_Errors;
 			}
 
 			return null;
@@ -570,7 +570,7 @@ public class TaskFormPage extends FormPage {
 			StringBuffer total = new StringBuffer();
 			for (int x = 0; x < all.size(); x++) {
 				String str = all.get(x);
-				total.append(" " + str + (x == (all.size() - 1) ? "" : "\n"));
+				total.append(" " + str + (x == (all.size() - 1) ? "" : "\n")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 			}
 
 			return total.toString();
@@ -587,7 +587,7 @@ public class TaskFormPage extends FormPage {
 
 	public static class ErrorAnnotation extends Annotation {
 
-		public static String ERROR_TYPE = "spelling.error";
+		public static String ERROR_TYPE = "spelling.error"; //$NON-NLS-1$
 
 		// ProblemAnnotation.SPELLING_ANNOTATION_TYPE;
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java
index a1bfb67dd..392831c39 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java
@@ -97,29 +97,29 @@ import org.eclipse.ui.forms.widgets.Section;
  */
 public class TaskPlanningEditor extends TaskFormPage {
 
-	private static final String RESET = "Reset";
+	private static final String RESET = Messages.TaskPlanningEditor_Reset;
 
 	private static final int WIDTH_SUMMARY = 500;
 
 	private static final int NOTES_MINSIZE = 100;
 
-	private static final String CLEAR = "Clear";
+	private static final String CLEAR = Messages.TaskPlanningEditor_Clear;
 
-	private static final String LABEL_DUE = "Due:";
+	private static final String LABEL_DUE = Messages.TaskPlanningEditor_Due;
 
-	private static final String LABEL_SCHEDULE = "Scheduled for:";
+	private static final String LABEL_SCHEDULE = Messages.TaskPlanningEditor_Scheduled_for;
 
-	public static final String LABEL_INCOMPLETE = "Incomplete";
+	public static final String LABEL_INCOMPLETE = Messages.TaskPlanningEditor_Incomplete;
 
-	public static final String LABEL_COMPLETE = "Complete";
+	public static final String LABEL_COMPLETE = Messages.TaskPlanningEditor_Complete;
 
-	private static final String LABEL_PLAN = "Personal Planning";
+	private static final String LABEL_PLAN = Messages.TaskPlanningEditor_Personal_Planning;
 
-	private static final String NO_TIME_ELAPSED = "0 seconds";
+	private static final String NO_TIME_ELAPSED = Messages.TaskPlanningEditor_0_seconds;
 
 	// private static final String LABEL_OVERVIEW = "Task Info";
 
-	private static final String LABEL_NOTES = "Notes";
+	private static final String LABEL_NOTES = Messages.TaskPlanningEditor_Notes;
 
 	private DatePicker dueDatePicker;
 
@@ -129,7 +129,7 @@ public class TaskPlanningEditor extends TaskFormPage {
 
 	private Composite editorComposite;
 
-	protected static final String CONTEXT_MENU_ID = "#MylynPlanningEditor";
+	protected static final String CONTEXT_MENU_ID = "#MylynPlanningEditor"; //$NON-NLS-1$
 
 	private Text endDate;
 
@@ -183,7 +183,7 @@ public class TaskPlanningEditor extends TaskFormPage {
 	private ITaskActivityListener timingListener;
 
 	public TaskPlanningEditor(TaskEditor editor) {
-		super(editor, ITasksUiConstants.ID_PAGE_PLANNING, "Planning");
+		super(editor, ITasksUiConstants.ID_PAGE_PLANNING, Messages.TaskPlanningEditor_Planning);
 		this.parentEditor = editor;
 		TasksUiInternal.getTaskList().addChangeListener(TASK_LIST_LISTENER);
 	}
@@ -420,7 +420,7 @@ public class TaskPlanningEditor extends TaskFormPage {
 		GridLayout nameValueLayout = new GridLayout(2, false);
 		nameValueLayout.marginHeight = 3;
 		nameValueComp.setLayout(nameValueLayout);
-		toolkit.createLabel(nameValueComp, "Priority:").setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
+		toolkit.createLabel(nameValueComp, Messages.TaskPlanningEditor_Priority).setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
 		priorityCombo = new CCombo(nameValueComp, SWT.FLAT | SWT.READ_ONLY);
 		toolkit.adapt(priorityCombo, false, false);
 		priorityCombo.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER);
@@ -452,7 +452,7 @@ public class TaskPlanningEditor extends TaskFormPage {
 
 		nameValueComp = toolkit.createComposite(statusComposite);
 		nameValueComp.setLayout(new GridLayout(2, false));
-		toolkit.createLabel(nameValueComp, "Status:").setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
+		toolkit.createLabel(nameValueComp, Messages.TaskPlanningEditor_Status).setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
 		statusCombo = new CCombo(nameValueComp, SWT.FLAT | SWT.READ_ONLY);
 		toolkit.adapt(statusCombo, true, true);
 		statusCombo.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER);
@@ -478,14 +478,14 @@ public class TaskPlanningEditor extends TaskFormPage {
 
 		Date creationDate = task.getCreationDate();
 		String creationDateString = (creationDate != null) ? DateFormat.getDateInstance(DateFormat.LONG).format(
-				creationDate) : "";
-		addNameValueComp(statusComposite, "Created:", creationDateString, SWT.FLAT | SWT.READ_ONLY);
+				creationDate) : ""; //$NON-NLS-1$
+		addNameValueComp(statusComposite, Messages.TaskPlanningEditor_Created, creationDateString, SWT.FLAT | SWT.READ_ONLY);
 
-		String completionDateString = "";
+		String completionDateString = ""; //$NON-NLS-1$
 		if (task.isCompleted()) {
 			completionDateString = getTaskDateString(task);
 		}
-		endDate = addNameValueComp(statusComposite, "Completed:", completionDateString, SWT.FLAT | SWT.READ_ONLY);
+		endDate = addNameValueComp(statusComposite, Messages.TaskPlanningEditor_Completed, completionDateString, SWT.FLAT | SWT.READ_ONLY);
 		// URL
 		Composite urlComposite = toolkit.createComposite(parent);
 		GridLayout urlLayout = new GridLayout(4, false);
@@ -495,7 +495,7 @@ public class TaskPlanningEditor extends TaskFormPage {
 		urlComposite.setLayout(urlLayout);
 		GridDataFactory.fillDefaults().grab(true, false).applyTo(urlComposite);
 
-		Label label = toolkit.createLabel(urlComposite, "URL:");
+		Label label = toolkit.createLabel(urlComposite, Messages.TaskPlanningEditor_URL);
 		label.setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
 		issueReportURL = toolkit.createText(urlComposite, task.getUrl(), SWT.FLAT);
 		issueReportURL.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -512,7 +512,7 @@ public class TaskPlanningEditor extends TaskFormPage {
 
 		getDescLink = toolkit.createImageHyperlink(urlComposite, SWT.NONE);
 		getDescLink.setImage(CommonImages.getImage(TasksUiImages.TASK_RETRIEVE));
-		getDescLink.setToolTipText("Retrieve task description from URL");
+		getDescLink.setToolTipText(Messages.TaskPlanningEditor_Retrieve_task_description_from_URL);
 		getDescLink.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 		setButtonStatus();
 
@@ -541,7 +541,7 @@ public class TaskPlanningEditor extends TaskFormPage {
 
 		openUrlLink = toolkit.createImageHyperlink(urlComposite, SWT.NONE);
 		openUrlLink.setImage(CommonImages.getImage(CommonImages.BROWSER_SMALL));
-		openUrlLink.setToolTipText("Open with Web Browser");
+		openUrlLink.setToolTipText(Messages.TaskPlanningEditor_Open_with_Web_Browser);
 		openUrlLink.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 		openUrlLink.addHyperlinkListener(new IHyperlinkListener() {
 
@@ -583,7 +583,7 @@ public class TaskPlanningEditor extends TaskFormPage {
 	protected void setButtonStatus() {
 		String url = issueReportURL.getText();
 
-		if (url.length() > 10 && (url.startsWith("http://") || url.startsWith("https://"))) {
+		if (url.length() > 10 && (url.startsWith("http://") || url.startsWith("https://"))) { //$NON-NLS-1$ //$NON-NLS-2$
 			// String defaultPrefix =
 			// ContextCore.getPreferenceStore().getString(
 			// TaskListPreferenceConstants.DEFAULT_URL_PREFIX);
@@ -719,7 +719,7 @@ public class TaskPlanningEditor extends TaskFormPage {
 
 		// Estimated time
 		nameValueComp = makeComposite(sectionClient, 3);
-		label = toolkit.createLabel(nameValueComp, "Estimated hours:");
+		label = toolkit.createLabel(nameValueComp, Messages.TaskPlanningEditor_Estimated_hours);
 		label.setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
 
 		estimated = new Spinner(nameValueComp, SWT.FLAT);
@@ -820,8 +820,8 @@ public class TaskPlanningEditor extends TaskFormPage {
 			@Override
 			public void linkActivated(HyperlinkEvent e) {
 				if (MessageDialog.openConfirm(TaskPlanningEditor.this.getSite().getShell(),
-						"Confirm Activity Time Deletion",
-						"Do you wish to reset your activity time on this task?\n\nThis will take immediate affect and can not be undone.")) {
+						Messages.TaskPlanningEditor_Confirm_Activity_Time_Deletion,
+						Messages.TaskPlanningEditor_Do_you_wish_to_reset_your_activity_time_on_this_task_)) {
 					MonitorUi.getActivityContextManager().removeActivityTime(task.getHandleIdentifier(), 0l,
 							System.currentTimeMillis());
 				}
@@ -898,18 +898,18 @@ public class TaskPlanningEditor extends TaskFormPage {
 	private String getTaskDateString(ITask task) {
 
 		if (task == null) {
-			return "";
+			return ""; //$NON-NLS-1$
 		}
 		if (task.getCompletionDate() == null) {
-			return "";
+			return ""; //$NON-NLS-1$
 		}
 
-		String completionDateString = "";
+		String completionDateString = ""; //$NON-NLS-1$
 		try {
 			completionDateString = DateFormat.getDateInstance(DateFormat.LONG).format(task.getCompletionDate());
 		} catch (RuntimeException e) {
 			// FIXME what exception is caught here?
-			StatusHandler.fail(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, "Could not format date", e));
+			StatusHandler.fail(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, "Could not format date", e)); //$NON-NLS-1$
 			return completionDateString;
 		}
 		return completionDateString;
@@ -925,7 +925,7 @@ public class TaskPlanningEditor extends TaskFormPage {
 
 	@Override
 	public String toString() {
-		return "(info editor for task: " + task + ")";
+		return Messages.TaskPlanningEditor__info_editor_for_task_ + task + ")"; //$NON-NLS-1$
 	}
 
 	/** for testing - should cause dirty state */
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskRelationHyperlinkDetector.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskRelationHyperlinkDetector.java
index 4e05efabb..ee5ca57b8 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskRelationHyperlinkDetector.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskRelationHyperlinkDetector.java
@@ -31,7 +31,7 @@ import org.eclipse.mylyn.tasks.ui.TaskHyperlink;
  */
 public class TaskRelationHyperlinkDetector extends AbstractTaskHyperlinkDetector {
 
-	private static Pattern HYPERLINK_PATTERN = Pattern.compile("([^\\s,]+)");
+	private static Pattern HYPERLINK_PATTERN = Pattern.compile("([^\\s,]+)"); //$NON-NLS-1$
 
 	@Override
 	public IHyperlink[] detectHyperlinks(ITextViewer textViewer, IRegion region, boolean canShowMultipleHyperlinks) {
@@ -76,12 +76,12 @@ public class TaskRelationHyperlinkDetector extends AbstractTaskHyperlinkDetector
 		int i = offset;
 		IDocument document = viewer.getDocument();
 		if (i > document.getLength()) {
-			return "";
+			return ""; //$NON-NLS-1$
 		}
 
 		try {
 			if (isSeparator(document.getChar(i))) {
-				return "";
+				return ""; //$NON-NLS-1$
 			}
 			while (i > 0) {
 				char ch = document.getChar(i - 1);
@@ -92,7 +92,7 @@ public class TaskRelationHyperlinkDetector extends AbstractTaskHyperlinkDetector
 			}
 			return document.get(i, offset - i);
 		} catch (BadLocationException e) {
-			return "";
+			return ""; //$NON-NLS-1$
 		}
 	}
 
@@ -101,12 +101,12 @@ public class TaskRelationHyperlinkDetector extends AbstractTaskHyperlinkDetector
 		IDocument document = viewer.getDocument();
 		int length = document.getLength();
 		if (i > length) {
-			return "";
+			return ""; //$NON-NLS-1$
 		}
 
 		try {
 			if (isSeparator(document.getChar(i))) {
-				return "";
+				return ""; //$NON-NLS-1$
 			}
 			while (i < length - 1) {
 				char ch = document.getChar(i + 1);
@@ -118,7 +118,7 @@ public class TaskRelationHyperlinkDetector extends AbstractTaskHyperlinkDetector
 			return document.get(offset, i - offset + 1);
 		} catch (BadLocationException e) {
 		}
-		return "";
+		return ""; //$NON-NLS-1$
 	}
 
 	private boolean isSeparator(char ch) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/messages.properties b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/messages.properties
new file mode 100644
index 000000000..c10adfeda
--- /dev/null
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/messages.properties
@@ -0,0 +1,162 @@
+AbstractReplyToCommentAction_Reply=Reply
+
+AttachmentSizeFormatter_0_bytes=0 bytes
+AttachmentSizeFormatter_0_GB=0.00 GB
+AttachmentSizeFormatter_0_KB=0.00 KB
+AttachmentSizeFormatter_0_MB=0.00 MB
+AttachmentSizeFormatter_1_byte=1 byte
+
+AttachmentTableLabelProvider_File_=File: 
+AttachmentTableLabelProvider_Patch=\ Patch
+AttachmentTableLabelProvider_Task_Context=\ Task Context
+AttachmentTableLabelProvider_unrecognized_column=unrecognized column
+AttachmentTableLabelProvider2_File_=File: 
+AttachmentTableLabelProvider2_Patch=\ Patch
+AttachmentTableLabelProvider2_Task_Context=\ Task Context
+AttachmentTableLabelProvider2_Type_=Type: 
+AttachmentTableLabelProvider2_unrecognized_column=unrecognized column
+BrowserPreviewViewer_Error=Error
+BrowserPreviewViewer_Formatting_Wiki_Text=Formatting Wiki Text
+BrowserPreviewViewer_Loading_preview_=Loading preview...
+BrowserPreviewViewer_The_repository_does_not_support_HTML_preview=The repository does not support HTML preview.
+
+CategoryEditor_Category_Summary=Category Summary
+CategoryEditor_Description_=Description: 
+CategoryEditor_URL_=URL: 
+
+CategoryEditorInput_Category_Editor=Category Editor
+
+CommentGroupStrategy_Current=Current
+CommentGroupStrategy_Older=Older
+CommentGroupStrategy_Recent=Recent
+
+DateAttributeEditor_Clear=Clear
+
+PlanningPageFactory_Planning=Planning
+
+PreviewAttributeEditor_Edit=Edit
+PreviewAttributeEditor_Error=Error
+PreviewAttributeEditor_Formatting_Wiki_Text=Formatting Wiki Text
+PreviewAttributeEditor_Loading_preview_=Loading preview...
+PreviewAttributeEditor_Preview=Preview
+
+RepositoryAttachmentEditorInput_Repository_Attachment=Repository Attachment: 
+RepositoryTaskEditorDropListener_Note_that_only_the_first_file_dragged_will_be_attached=Note that only the first file dragged will be attached.
+RepositoryTaskOutlineNode_BugReport_Object=BugReport Object
+RepositoryTaskOutlineNode_Comments=Comments
+RepositoryTaskOutlineNode_Description=Description
+RepositoryTaskOutlineNode_New_Comment=New Comment
+
+RichTextAttributeEditor_Viewer_Source=Viewer Source
+
+TaskAttachmentDropListener_Note_that_only_the_first_file_dragged_will_be_attached=Note that only the first file dragged will be attached.
+TaskEditorActionContributor_Add_to_X=Add to {0}
+TaskEditorActionContributor_Find=Find
+
+TaskEditorActionPart_Actions=Actions
+TaskEditorActionPart_Add_to_Category=Add to Category
+TaskEditorActionPart_Attach_Context=Attach Context
+TaskEditorActionPart_Submit=Submit
+TaskEditorActionPart_Submit_to_X=Submit to {0}
+TaskEditorAttachmentPart_Attach_=Attach...
+TaskEditorAttachmentPart_Attach__Screenshot=Attach Screenshot...
+TaskEditorAttachmentPart_Attachments=Attachments
+TaskEditorAttachmentPart_Created=Created
+TaskEditorAttachmentPart_Creator=Creator
+TaskEditorAttachmentPart_Description=Description
+TaskEditorAttachmentPart_Name=Name
+TaskEditorAttachmentPart_No_attachments=No attachments
+TaskEditorAttachmentPart_Size=Size
+
+TaskEditorAttributePart_Attributes=Attributes
+TaskEditorAttributePart_Refresh_Attributes=Refresh Attributes
+TaskEditorAttributePart_Update_Failed=Update Failed
+TaskEditorAttributePart_Updating_of_repository_configuration_failed=Updating of repository configuration failed
+
+TaskEditorCommentPart_Collapse_All_Comments=Collapse All Comments
+TaskEditorCommentPart_Collapse_All_Current_Comments=Collapse All Current Comments
+TaskEditorCommentPart_Comments=Comments
+TaskEditorCommentPart_Current=Current
+TaskEditorCommentPart_Expand_All_Comments=Expand All Comments
+TaskEditorCommentPart_Expand_All_Current_Comments=Expand All Current Comments
+TaskEditorCommentPart_Reply=Reply
+
+TaskEditorDescriptionPart_Description=Description
+TaskEditorDescriptionPart_Detector=Detector:
+TaskEditorDescriptionPart_Duplicate_Detection_Failed=Duplicate Detection Failed
+TaskEditorDescriptionPart_Duplicate_Detection=Duplicate Detection
+TaskEditorDescriptionPart_The_duplicate_detector_did_not_return_a_valid_query=The duplicate detector did not return a valid query.
+TaskEditorDescriptionPart_Search=Search
+
+TaskEditorNewCommentPart_New_Comment=New Comment
+TaskEditorOutlineNode_Comments=Comments
+TaskEditorOutlineNode_Description=Description
+TaskEditorOutlineNode_New_Comment=New Comment
+TaskEditorOutlineNode_Task_=Task 
+
+TaskEditorPeoplePart_People=People
+
+TaskEditorPlanningPart_0_SECOUNDS=0 seconds
+TaskEditorPlanningPart_Active=Active:
+TaskEditorPlanningPart_Clear=Clear
+TaskEditorPlanningPart_Confirm_Activity_Time_Deletion=Confirm Activity Time Deletion
+TaskEditorPlanningPart_Do_you_wish_to_reset_your_activity_time_on_this_task_=Do you wish to reset your activity time on this task?\n\nThis will take immediate affect and can not be undone.
+TaskEditorPlanningPart_Due=Due:
+TaskEditorPlanningPart_Estimated=Estimated:
+TaskEditorPlanningPart_Personal_Planning=Personal Planning
+TaskEditorPlanningPart_Reset=Reset
+TaskEditorPlanningPart_Scheduled=Scheduled:
+TaskEditorPlanningPart_Time_working_on_this_task=Time working on this task
+
+TaskEditorRichTextPart_Browser_Preview=Browser Preview
+TaskEditorRichTextPart_Maximize=Maximize
+TaskEditorRichTextPart_Preview=Preview
+
+TaskEditorSummaryPart_Summary=Summary
+
+TaskFormPage_Errors=Errors
+
+TaskPlanningEditor_0_seconds=0 seconds
+TaskPlanningEditor_Active=Active:
+TaskPlanningEditor_Clear=Clear
+TaskPlanningEditor_Complete=Complete
+TaskPlanningEditor_Completed=Completed:
+TaskPlanningEditor_Confirm_Activity_Time_Deletion=Confirm Activity Time Deletion
+TaskPlanningEditor_Created=Created:
+TaskPlanningEditor_Do_you_wish_to_reset_your_activity_time_on_this_task_=Do you wish to reset your activity time on this task?\n\nThis will take immediate affect and can not be undone.
+TaskPlanningEditor_Due=Due:
+TaskPlanningEditor_Estimated_hours=Estimated hours:
+TaskPlanningEditor_Incomplete=Incomplete
+TaskPlanningEditor__info_editor_for_task_=(info editor for task: 
+TaskPlanningEditor_Notes=Notes
+TaskPlanningEditor_Open_with_Web_Browser=Open with Web Browser
+TaskPlanningEditor_Personal_Planning=Personal Planning
+TaskPlanningEditor_Planning=Planning
+TaskPlanningEditor_Priority=Priority:
+TaskPlanningEditor_Reset=Reset
+TaskPlanningEditor_Retrieve_task_description_from_URL=Retrieve task description from URL
+TaskPlanningEditor_Scheduled_for=Scheduled for:
+TaskPlanningEditor_Status=Status:
+TaskPlanningEditor_Time_working_on_this_task=Time working on this task
+TaskPlanningEditor_URL=URL:
+
+AbstractTaskEditorPage_Comment_required=Comment required
+AbstractTaskEditorPage_Could_not_save_task=Could not save task
+AbstractTaskEditorPage_Error_opening_task=Error opening task
+AbstractTaskEditorPage_Failed_to_read_task_data_=Failed to read task data: 
+AbstractTaskEditorPage_History=History
+AbstractTaskEditorPage_Open_failed=Open failed
+AbstractTaskEditorPage_Open_with_Web_Browser=Open with Web Browser
+AbstractTaskEditorPage_Save_failed=Save failed
+AbstractTaskEditorPage_Submit_failed=Submit failed
+AbstractTaskEditorPage_Submit_failed_=Submit failed: 
+AbstractTaskEditorPage_Synchronize_to_retrieve_task_data=Synchronize to retrieve task data
+AbstractTaskEditorPage_Synchronize_to_update_editor_contents=Synchronize to update editor contents
+AbstractTaskEditorPage_Task_has_incoming_changes=Task has incoming changes
+AbstractTaskEditorPage_Title=Title
+AbstractTaskEditorPage_Unable_to_submit_at_this_time=Unable to submit at this time. Check connectivity and retry.
+
+AttributeEditorToolkit_Content_Assist_Available__X_=Content Assist Available ({0})
+TaskEditor_New_=New 
+TaskEditor_Task_=Task: 
+TaskEditor_Task_added_to_the_Uncategorized_container=Task added to the Uncategorized container