diff --git a/plugins/cvs2/META-INF/plugin.xml b/plugins/cvs2/META-INF/plugin.xml
index 57eda673cfb2..d2c09666362d 100644
--- a/plugins/cvs2/META-INF/plugin.xml
+++ b/plugins/cvs2/META-INF/plugin.xml
@@ -92,6 +92,7 @@
       <reference id="CheckinFiles"/>
       <action id="Cvs.Rollback" class="com.intellij.cvsSupport2.actions.CvsRollbackChangesAction" text="Ro_llback Changes" icon="/actions/rollback.png" description="Rollback local changes"/>
       <reference id="UpdateFiles"/>
+      <reference id="CheckStatusForFiles"/>
       <action id="Cvs.Checkout" class="com.intellij.cvsSupport2.actions.CheckoutFileAction" text="Chec_k Out" description="Check out file or directory (and overwrite local version)"/>
       <action id="Cvs.MergeAction" class="com.intellij.cvsSupport2.actions.MergeAction" text="_Merge" description="Merge file visually"/>
 
diff --git a/source/com/intellij/openapi/vcs/update/AbstractCommonUpdateAction.java b/source/com/intellij/openapi/vcs/update/AbstractCommonUpdateAction.java
index a87e7febae55..d34d0dd951ee 100644
--- a/source/com/intellij/openapi/vcs/update/AbstractCommonUpdateAction.java
+++ b/source/com/intellij/openapi/vcs/update/AbstractCommonUpdateAction.java
@@ -46,7 +46,6 @@ import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.actions.AbstractVcsAction;
 import com.intellij.openapi.vcs.actions.VcsContext;
 import com.intellij.openapi.vcs.ex.ProjectLevelVcsManagerEx;
-import com.intellij.util.ui.OptionsDialog;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFileManager;
 import com.intellij.openapi.wm.ToolWindowId;
@@ -71,7 +70,7 @@ public class AbstractCommonUpdateAction extends AbstractVcsAction {
   }
 
   protected final String getCompleteActionName(VcsContext dataContext) {
-    return myActionInfo.getActionName() + " " + myScopeInfo.getScopeName(dataContext);
+    return myActionInfo.getActionName(myScopeInfo.getScopeName(dataContext));
   }
 
 
@@ -294,7 +293,7 @@ public class AbstractCommonUpdateAction extends AbstractVcsAction {
         presentation.setEnabled(false);
         return;
       }
-      if (roots != null && roots.length > 0) {
+      if (roots.length > 0) {
         for (int i = 0; i < roots.length; i++) {
           FilePath file = roots[i];
           AbstractVcs vcs = VcsUtil.getVcsFor(project, file);
diff --git a/source/com/intellij/openapi/vcs/update/ActionInfo.java b/source/com/intellij/openapi/vcs/update/ActionInfo.java
index b8c6aed3b6b3..ac2785786973 100644
--- a/source/com/intellij/openapi/vcs/update/ActionInfo.java
+++ b/source/com/intellij/openapi/vcs/update/ActionInfo.java
@@ -17,6 +17,10 @@ public interface ActionInfo {
       return vcs.getUpdateEnvironment();
     }
 
+    public String getActionName() {
+      return "Update";
+    }
+
     public UpdateOrStatusOptionsDialog createOptionsDialog(final Project project,
                                                            LinkedHashMap<Configurable, UpdateEnvironment> envToConfMap) {
       return new UpdateOrStatusOptionsDialog(project, envToConfMap) {
@@ -36,8 +40,8 @@ public interface ActionInfo {
       };
     }
 
-    public String getActionName() {
-      return "Update";
+    public String getActionName(String scopeName) {
+      return "Update " + scopeName;
     }
 
     public String getGroupName(FileGroup fileGroup) {
@@ -47,7 +51,7 @@ public interface ActionInfo {
 
   ActionInfo STATUS = new ActionInfo() {
     public boolean showOptions(Project project) {
-      return VcsConfiguration.getInstance(project).SHOW_STATUS_OPTIONS;
+      return false;
     }
 
     public UpdateEnvironment getEnvironment(AbstractVcs vcs) {
@@ -74,7 +78,11 @@ public interface ActionInfo {
     }
 
     public String getActionName() {
-      return "Check Status for";
+      return "Check Status";
+    }
+
+    public String getActionName(String scopeName) {
+      return "Check " + scopeName + " Status";
     }
 
     public String getGroupName(FileGroup fileGroup) {
@@ -88,6 +96,8 @@ public interface ActionInfo {
 
   UpdateOrStatusOptionsDialog createOptionsDialog(Project project, LinkedHashMap<Configurable, UpdateEnvironment> envToConfMap);
 
+  String getActionName(String scopeName);
+
   String getActionName();
 
   String getGroupName(FileGroup fileGroup);