diff --git a/platform/tasks-platform-impl/resources/messages/TaskBundle.properties b/platform/tasks-platform-impl/resources/messages/TaskBundle.properties
index 22475ff5dda6..9bff52dc7836 100644
--- a/platform/tasks-platform-impl/resources/messages/TaskBundle.properties
+++ b/platform/tasks-platform-impl/resources/messages/TaskBundle.properties
@@ -57,14 +57,27 @@ settings.suspend.delay=Suspend delay:
settings.seconds=seconds
checkbox.include.issues.not.assigned.to.me=Include issues not assigned to me
checkbox.include.cards.not.assigned.to.me=Include cards not assigned to me
-action.Anonymous.text.rollback=Rollback
action.Anonymous.text.configure.tree.dots=Configure...
-action.BranchContextTracker.Anonymous.text.what.is.a.workspace=What is a workspace?
+action.Anonymous.text.rollback=Rollback
action.BranchContextTracker.Anonymous.description=A workspace is a set of opened files, the current run configuration, and breakpoints.
+action.BranchContextTracker.Anonymous.text.what.is.a.workspace=What is a workspace?
+action.DumbAware.TasksToolWindowPanel.description.remove.selected.task=Remove selected task
+action.DumbAware.TasksToolWindowPanel.text.remove.task=Remove Task
action.LoadContextAction.Anonymous.text.load=Load
action.LoadContextAction.Anonymous.text.remove=Remove
-action.DumbAware.TasksToolWindowPanel.text.remove.task=Remove Task
-action.DumbAware.TasksToolWindowPanel.description.remove.selected.task=Remove selected task
+action.context.clear.text=_Clear Context
+action.context.load.text=_Load Context...
+action.context.save.text=_Save Context...
+action.deadlock.with.certificate.dialog.text=_Deadlock IDE with certificate dialog
+action.show.certificate.text=_Show certificate dialog
+action.tasks.analyze.stacktrace.text=Analyze _Stack Trace From Task...
+action.tasks.close.text=_Close Active Task...
+action.tasks.configure.servers.text=Configure Servers...
+action.tasks.create.changelist.text=Create Change_list...
+action.tasks.edit.text=Edit Task...
+action.tasks.open.in.browser.text=Open in _Browser
+action.tasks.show.task.description.text=Show Description
+action.tasks.switch.text=_Switch Task...
checkbox.restore.workspace.on.branch.switching=Restore workspace on &branch switching
checkbox.show.notification.with.ability.to.restore.previous.workspace=Show ¬ification with ability to restore previous workspace
workspace.associated.with.branch.has.been.restored=Workspace associated with branch ''{0}'' has been restored
@@ -78,4 +91,10 @@ dialog.title.error=Error
progress.text.connecting.to=Connecting to {0}...
task.save.context.action.name=Save Context
task.save.context.action.message=Enter comment (optional):
-task.clear.context.action.name=Clear context
\ No newline at end of file
+task.clear.context.action.name=Clear context
+
+configure.servers.action.menu.text=Configure Servers...
+group.tasks.and.contexts.text=_Tasks & Contexts
+group.tasks.internal.text=_Tasks
+group.tasks.toolbar.group.text=Tasks Toolbar
+open.task.action.menu.text=Open Task...
diff --git a/plugins/tasks/tasks-core/resources/META-INF/plugin.xml b/plugins/tasks/tasks-core/resources/META-INF/plugin.xml
index 7eca8c90fb47..ac85a9951223 100644
--- a/plugins/tasks/tasks-core/resources/META-INF/plugin.xml
+++ b/plugins/tasks/tasks-core/resources/META-INF/plugin.xml
@@ -19,52 +19,50 @@
XPathView
-
+
-
+
-
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
@@ -77,7 +75,7 @@
-
+
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/ConfigureServersAction.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/ConfigureServersAction.java
index ec65619bcf41..d3bbf7bfd068 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/ConfigureServersAction.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/ConfigureServersAction.java
@@ -3,6 +3,7 @@ package com.intellij.tasks.actions;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.options.ShowSettingsUtil;
+import com.intellij.tasks.TaskBundle;
import com.intellij.tasks.config.TaskRepositoriesConfigurable;
import org.jetbrains.annotations.NotNull;
@@ -10,7 +11,7 @@ import org.jetbrains.annotations.NotNull;
public class ConfigureServersAction extends BaseTaskAction {
public ConfigureServersAction() {
- super("Configure Servers...", null, AllIcons.General.Settings);
+ super(TaskBundle.message("configure.servers.action.menu.text"), null, AllIcons.General.Settings);
}
@Override
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/GotoTaskAction.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/GotoTaskAction.java
index f6d58d49801a..f5a511905c21 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/GotoTaskAction.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/GotoTaskAction.java
@@ -15,6 +15,7 @@ import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.Ref;
import com.intellij.tasks.LocalTask;
import com.intellij.tasks.Task;
+import com.intellij.tasks.TaskBundle;
import com.intellij.tasks.TaskManager;
import com.intellij.tasks.doc.TaskPsiElement;
import com.intellij.tasks.impl.TaskManagerImpl;
@@ -37,7 +38,7 @@ public class GotoTaskAction extends GotoActionBase implements DumbAware {
public static final int PAGE_SIZE = 20;
public GotoTaskAction() {
- getTemplatePresentation().setText("Open Task...");
+ getTemplatePresentation().setText(TaskBundle.messagePointer("open.task.action.menu.text"));
getTemplatePresentation().setIcon(IconUtil.getAddIcon());
}
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/ShowCertificateInfoAction.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/ShowCertificateInfoAction.java
index 715d16ec9d7b..23723817e404 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/ShowCertificateInfoAction.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/ShowCertificateInfoAction.java
@@ -14,6 +14,7 @@ import java.util.List;
/**
* @author Mikhail Golubev
*/
+@SuppressWarnings("HardCodedStringLiteral")
public class ShowCertificateInfoAction extends AnAction {
private static final Logger LOG = Logger.getInstance(ShowCertificateInfoAction.class);