ASSIGNED - bug 339007: externalize strings for 3.5

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

8 files changed, 17 insertions, 8 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PlanningPerspectiveFactory.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PlanningPerspectiveFactory.java
index da159af5f..c7887cba6 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PlanningPerspectiveFactory.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PlanningPerspectiveFactory.java
@@ -64,7 +64,7 @@ public class PlanningPerspectiveFactory implements IPerspectiveFactory {
 		try {
 			Class<?> clazz = Class.forName("org.eclipse.ui.internal.PageLayout"); //$NON-NLS-1$
 			if (clazz != null && clazz.isInstance(layout)) {
-				Method method = clazz.getDeclaredMethod("getActionSets", null);
+				Method method = clazz.getDeclaredMethod("getActionSets", null); //$NON-NLS-1$
 				ArrayList<?> actionSets = (ArrayList<?>) method.invoke(layout);
 				actionSets.remove("org.eclipse.ui.edit.text.actionSet.annotationNavigation"); //$NON-NLS-1$
 				actionSets.remove("org.eclipse.ui.edit.text.actionSet.convertLineDelimitersTo"); //$NON-NLS-1$
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/Messages.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/Messages.java
index d986fb4b4..a8c7f2405 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/Messages.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/Messages.java
@@ -231,10 +231,16 @@ public class Messages extends NLS {
 
 	public static String RenameAction_Rename;
 
+	public static String ShowAllQueriesAction_Show_All_Queries;
+
+	public static String ShowAllQueriesAction_Show_All_Queries_Including_Hidden_Queries;
+
 	public static String ShowInSearchViewAction_Open_in_Search_Label;
 
 	public static String ShowInTaskListAction_Show_In_Task_List;
 
+	public static String ShowNonMatchingSubtasksAction_Show_Non_Matching_Subtasks;
+
 	public static String SynchronizeAutomaticallyAction_Synchronize_Automatically;
 
 	public static String SynchronizeEditorAction_Synchronize;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ShowAllQueriesAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ShowAllQueriesAction.java
index 0ab2bb6c7..150e5ea03 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ShowAllQueriesAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ShowAllQueriesAction.java
@@ -21,8 +21,8 @@ import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
 public class ShowAllQueriesAction extends Action {
 
 	public ShowAllQueriesAction() {
-		setText("Show All Queries");
-		setToolTipText("Show All Queries Including Hidden Queries");
+		setText(Messages.ShowAllQueriesAction_Show_All_Queries);
+		setToolTipText(Messages.ShowAllQueriesAction_Show_All_Queries_Including_Hidden_Queries);
 		setChecked(!TasksUiPlugin.getDefault()
 				.getPreferenceStore()
 				.getBoolean(ITasksUiPreferenceConstants.FILTER_HIDDEN));
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ShowNonMatchingSubtasksAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ShowNonMatchingSubtasksAction.java
index a0e25b58d..31a6d28a9 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ShowNonMatchingSubtasksAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ShowNonMatchingSubtasksAction.java
@@ -21,8 +21,8 @@ import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
 public class ShowNonMatchingSubtasksAction extends Action {
 
 	public ShowNonMatchingSubtasksAction() {
-		setText("Show Non Matching Subtasks");
-		setToolTipText("Show Non Matching Subtasks");
+		setText(Messages.ShowNonMatchingSubtasksAction_Show_Non_Matching_Subtasks);
+		setToolTipText(Messages.ShowNonMatchingSubtasksAction_Show_Non_Matching_Subtasks);
 		setChecked(!TasksUiPlugin.getDefault()
 				.getPreferenceStore()
 				.getBoolean(ITasksUiPreferenceConstants.FILTER_NON_MATCHING));
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/messages.properties b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/messages.properties
index bba9f6f51..1a274026e 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/messages.properties
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/messages.properties
@@ -145,8 +145,11 @@ RemoveFromCategoryAction_Remove_From_Category=Remove From Category
 
 RenameAction_Rename=Rename
 
+ShowAllQueriesAction_Show_All_Queries=Show All Queries
+ShowAllQueriesAction_Show_All_Queries_Including_Hidden_Queries=Show All Queries Including Hidden Queries
 ShowInSearchViewAction_Open_in_Search_Label=Open in Search
 ShowInTaskListAction_Show_In_Task_List=&Show In Task List
+ShowNonMatchingSubtasksAction_Show_Non_Matching_Subtasks=Show Non Matching Subtasks
 
 SynchronizeAutomaticallyAction_Synchronize_Automatically=Synchronize Automatically
 
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 04f403737..da06554ba 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
@@ -364,7 +364,7 @@ public class EditorUtil {
 			layoutAdvisor = layoutAdvisor.getParent();
 		} while (!(layoutAdvisor instanceof CTabFolder || layoutAdvisor.getClass()
 				.getName()
-				.equals("org.eclipse.e4.ui.widgets.CTabFolder")));
+				.equals("org.eclipse.e4.ui.widgets.CTabFolder"))); //$NON-NLS-1$
 		return layoutAdvisor.getParent();
 	}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/WebBrowserDialog.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/WebBrowserDialog.java
index 4daeebf1f..b7bcdb504 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/WebBrowserDialog.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/WebBrowserDialog.java
@@ -76,7 +76,7 @@ public class WebBrowserDialog extends MessageDialog {
 					file.delete();
 				}
 				StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN,
-						"Unexpected error while displaying error", e));
+						"Unexpected error while displaying error", e)); //$NON-NLS-1$
 				return Window.CANCEL;
 			}
 			WorkbenchUtil.openUrl(file.toURI().toString(), IWorkbenchBrowserSupport.AS_EXTERNAL);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java
index 43c4028d9..9981e6ec5 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java
@@ -1233,7 +1233,7 @@ public abstract class AbstractTaskEditorPage extends TaskFormPage implements ISe
 					} else {
 						message = Messages.AbstractTaskEditorPage_Submit_failed;
 					}
-					message = message.replaceAll("\n", " ");
+					message = message.replaceAll("\n", " "); //$NON-NLS-1$ //$NON-NLS-2$
 					getTaskEditor().setMessage(message, IMessageProvider.ERROR, new HyperlinkAdapter() {
 						@Override
 						public void linkActivated(HyperlinkEvent e) {