WEB-10821 Weird character in Alt+F1 menu before "Open in browser..."

platform/platform-resources-en/src/messages/XmlBundle.properties

@@ -244,8 +244,6 @@ new.html.file.action=HTML File
 new.html.file.action.description=Creates new HTML file
 html5.outline.mode=HTML5 Outline
 
-read.win.registry=Retrieve settings from &Windows registry
-
 start.browser.startup.page=Startup pa&ge:
 start.browser.border.label.open.browser=Open browser
 start.browser.checkbox.start.browser=After launch

xml/impl/src/com/intellij/ide/browsers/actions/BaseOpenInBrowserAction.java

@@ -52,7 +52,7 @@ import java.awt.event.InputEvent;
 import java.util.Collection;
 
 public abstract class BaseOpenInBrowserAction extends DumbAwareAction {
-  private static final Logger LOG = Logger.getInstance(OpenFileInDefaultBrowserAction.class);
+  private static final Logger LOG = Logger.getInstance(BaseOpenInBrowserAction.class);
 
   protected BaseOpenInBrowserAction(@NotNull WebBrowser browser) {
     super(browser.getName(), null, browser.getIcon());

xml/impl/src/com/intellij/ide/browsers/actions/OpenFileInDefaultBrowserAction.java

@@ -44,11 +44,7 @@ public class OpenFileInDefaultBrowserAction extends DumbAwareAction {
     String text = getTemplatePresentation().getText();
     String description = getTemplatePresentation().getDescription();
     if (browserUrlProvider != null) {
-      final String customText = browserUrlProvider.getOpenInBrowserActionText(result.first.getFile());
-      if (customText != null) {
-        text = customText;
-      }
-      final String customDescription = browserUrlProvider.getOpenInBrowserActionDescription(result.first.getFile());
+      String customDescription = browserUrlProvider.getOpenInBrowserActionDescription(result.first.getFile());
       if (customDescription != null) {
         description = customDescription;
       }

xml/impl/src/com/intellij/ide/browsers/actions/SelectInDefaultBrowserTarget.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,11 +29,9 @@ import com.intellij.testFramework.LightVirtualFile;
 import com.intellij.xml.XmlBundle;
 import com.intellij.xml.util.HtmlUtil;
 
-class SelectInDefaultBrowserTarget extends SelectInTargetBase {
+final class SelectInDefaultBrowserTarget extends SelectInTargetBase {
   private static final Logger LOG = Logger.getInstance(SelectInDefaultBrowserTarget.class);
 
-  private String currentName = "";
-
   @Override
   public boolean canSelect(SelectInContext context) {
     Object selectorInFile = context.getSelectorInFile();
@@ -43,23 +41,16 @@ class SelectInDefaultBrowserTarget extends SelectInTargetBase {
     }
 
     WebBrowserUrlProvider urlProvider = WebBrowserServiceImpl.getProvider(request);
-    currentName = XmlBundle.message("browser.select.in.default.name");
     if (urlProvider == null) {
       VirtualFile virtualFile = request.getVirtualFile();
       return virtualFile instanceof HttpVirtualFile || (HtmlUtil.isHtmlFile(request.getFile()) && !(virtualFile instanceof LightVirtualFile));
     }
-    else {
-      String customText = urlProvider.getOpenInBrowserActionText(request.getFile());
-      if (customText != null) {
-        currentName = customText;
-      }
-    }
     return true;
   }
 
   @Override
   public String toString() {
-    return currentName;
+    return XmlBundle.message("browser.select.in.default.name");
   }
 
   @Override

xml/openapi/src/com/intellij/ide/browsers/WebBrowserUrlProvider.java

@@ -69,9 +69,10 @@ public abstract class WebBrowserUrlProvider {
     return canHandle;
   }
 
+  @SuppressWarnings("UnusedParameters")
   @Deprecated
   /**
-   * @deprecated to remove in IDEA 14
+   * @deprecated to remove in IDEA 15
    */
   public boolean canHandle(@NotNull PsiElement element, @NotNull PsiFile psiFile, @NotNull Ref<Collection<Url>> result) {
     return false;
@@ -87,7 +88,6 @@ public abstract class WebBrowserUrlProvider {
       }
     }
 
-    VirtualFile file = request.getVirtualFile();
     try {
       Collection<Url> urls = getUrls(request);
       if (!urls.isEmpty()) {
@@ -107,6 +107,7 @@ public abstract class WebBrowserUrlProvider {
     return myDeprecatedMethodOverridden ? getUrl(request.getElement(), request.getFile(), virtualFile) : null;
   }
 
+  @SuppressWarnings("UnusedParameters")
   @Deprecated
   @Nullable
   /**
@@ -121,7 +122,9 @@ public abstract class WebBrowserUrlProvider {
     return ContainerUtil.createMaybeSingletonList(getUrl(request, request.getVirtualFile()));
   }
 
+  @SuppressWarnings({"UnusedParameters", "UnusedDeclaration"})
   @Nullable
+  @Deprecated
   public String getOpenInBrowserActionText(@NotNull PsiFile file) {
     return null;
   }