diff --git a/platform/platform-resources-en/src/messages/IdeBundle.properties b/platform/platform-resources-en/src/messages/IdeBundle.properties index 46efb01bfb8b..39fd5a3d3238 100644 --- a/platform/platform-resources-en/src/messages/IdeBundle.properties +++ b/platform/platform-resources-en/src/messages/IdeBundle.properties @@ -3,6 +3,12 @@ error.cannot.start.browser=Cannot start browser: {0} error.please.specify.path.to.web.browser=Please specify a path to web browser in {0} | Web Browsers title.browser.not.found=Browser Not Found +browsers.explorer=Internet Explorer +browsers.safari=Safari +browsers.opera=Opera +browsers.firefox=Firefox +browsers.chrome=Chrome + action.sort.alphabetically=Sort Alphabetically button.finish=&Finish button.ok=&OK diff --git a/platform/platform-resources-en/src/messages/XmlBundle.properties b/platform/platform-resources-en/src/messages/XmlBundle.properties index 5f38fff182cf..82c72e9b0662 100644 --- a/platform/platform-resources-en/src/messages/XmlBundle.properties +++ b/platform/platform-resources-en/src/messages/XmlBundle.properties @@ -148,11 +148,6 @@ cannot.resolve.anchor.in.file=Cannot resolve anchor #{0} in file {1} # web browsers browsers.configuration.name=Web Browsers -browsers.explorer=Internet Explorer -browsers.safari=Safari -browsers.opera=Opera -browsers.firefox=Firefox -browsers.chrome=Chrome browser.description=Open file in {0} browser.error=Browser Error diff --git a/xml/impl/src/com/intellij/ide/browsers/BrowserFamily.java b/xml/impl/src/com/intellij/ide/browsers/BrowserFamily.java index 63169b7c827f..7a3a1dde9986 100644 --- a/xml/impl/src/com/intellij/ide/browsers/BrowserFamily.java +++ b/xml/impl/src/com/intellij/ide/browsers/BrowserFamily.java @@ -1,32 +1,32 @@ package com.intellij.ide.browsers; import com.intellij.icons.AllIcons; +import com.intellij.ide.IdeBundle; import com.intellij.ide.browsers.chrome.ChromeSettings; import com.intellij.ide.browsers.firefox.FirefoxSettings; import com.intellij.openapi.util.Iconable; import com.intellij.openapi.util.SystemInfo; -import com.intellij.xml.XmlBundle; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; public enum BrowserFamily implements Iconable { - CHROME(XmlBundle.message("browsers.chrome"), "chrome", "google-chrome", "Google Chrome", AllIcons.Xml.Browsers.Chrome16) { + CHROME(IdeBundle.message("browsers.chrome"), "chrome", "google-chrome", "Google Chrome", AllIcons.Xml.Browsers.Chrome16) { @Override public BrowserSpecificSettings createBrowserSpecificSettings() { return new ChromeSettings(); } }, - EXPLORER(XmlBundle.message("browsers.explorer"), "iexplore", null, null, AllIcons.Xml.Browsers.Explorer16), - FIREFOX(XmlBundle.message("browsers.firefox"), "firefox", "firefox", "Firefox", AllIcons.Xml.Browsers.Firefox16) { + EXPLORER(IdeBundle.message("browsers.explorer"), "iexplore", null, null, AllIcons.Xml.Browsers.Explorer16), + FIREFOX(IdeBundle.message("browsers.firefox"), "firefox", "firefox", "Firefox", AllIcons.Xml.Browsers.Firefox16) { @Override public BrowserSpecificSettings createBrowserSpecificSettings() { return new FirefoxSettings(); } }, - OPERA(XmlBundle.message("browsers.opera"), "opera", "opera", "Opera", AllIcons.Xml.Browsers.Opera16), - SAFARI(XmlBundle.message("browsers.safari"), "safari", null, "Safari", AllIcons.Xml.Browsers.Safari16); + OPERA(IdeBundle.message("browsers.opera"), "opera", "opera", "Opera", AllIcons.Xml.Browsers.Opera16), + SAFARI(IdeBundle.message("browsers.safari"), "safari", null, "Safari", AllIcons.Xml.Browsers.Safari16); private final String myName; private final String myWindowsPath;