diff --git a/platform/core-api/src/com/intellij/ide/IdeBundle.java b/platform/core-api/src/com/intellij/ide/IdeBundle.java
index d604862e8a64..92d43beb579a 100644
--- a/platform/core-api/src/com/intellij/ide/IdeBundle.java
+++ b/platform/core-api/src/com/intellij/ide/IdeBundle.java
@@ -17,6 +17,7 @@
package com.intellij.ide;
import com.intellij.CommonBundle;
+import com.intellij.openapi.util.SystemInfo;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.PropertyKey;
@@ -39,6 +40,22 @@ public class IdeBundle {
return CommonBundle.message(getBundle(), key, params);
}
+ public static String settingsTitle() {
+ return SystemInfo.isMac ? message("title.settings.mac") : message("title.settings");
+ }
+
+ public static String settingsAction() {
+ return SystemInfo.isMac ? message("action.settings.mac") : message("action.settings");
+ }
+
+ public static String settingsActionDescription() {
+ return SystemInfo.isMac ? message("action.settings.description.mac") : message("action.settings.description");
+ }
+
+ public static String settingsActionPath() {
+ return SystemInfo.isMac ? message("action.settings.path.mac") : message("action.settings.path");
+ }
+
private static ResourceBundle getBundle() {
ResourceBundle bundle = null;
if (ourBundle != null) bundle = ourBundle.get();
diff --git a/platform/lang-impl/src/com/intellij/application/options/InitialConfigurationDialog.form b/platform/lang-impl/src/com/intellij/application/options/InitialConfigurationDialog.form
index d1350397f7fd..72ce18ca8a96 100644
--- a/platform/lang-impl/src/com/intellij/application/options/InitialConfigurationDialog.form
+++ b/platform/lang-impl/src/com/intellij/application/options/InitialConfigurationDialog.form
@@ -131,13 +131,13 @@
-
+
-
+
diff --git a/platform/lang-impl/src/com/intellij/application/options/InitialConfigurationDialog.java b/platform/lang-impl/src/com/intellij/application/options/InitialConfigurationDialog.java
index 896f3d6b75ab..21742ade3ed1 100644
--- a/platform/lang-impl/src/com/intellij/application/options/InitialConfigurationDialog.java
+++ b/platform/lang-impl/src/com/intellij/application/options/InitialConfigurationDialog.java
@@ -20,6 +20,7 @@ import com.intellij.application.options.colors.NewColorAndFontPanel;
import com.intellij.application.options.colors.SimpleEditorPreview;
import com.intellij.icons.AllIcons;
import com.intellij.ide.DataManager;
+import com.intellij.ide.IdeBundle;
import com.intellij.ide.actions.CreateDesktopEntryAction;
import com.intellij.ide.actions.CreateLauncherScriptAction;
import com.intellij.ide.todo.TodoConfiguration;
@@ -76,6 +77,7 @@ public class InitialConfigurationDialog extends DialogWrapper {
private JCheckBox myGlobalEntryCheckBox;
private JPanel myCreateEntryPanel;
private ComboBox myAppearanceComboBox;
+ private JLabel myPreferencesLabel;
private String myColorSettingsPage;
private SimpleEditorPreview myPreviewEditor;
private ColorAndFontOptions myPreviewOptions;
@@ -177,6 +179,8 @@ public class InitialConfigurationDialog extends DialogWrapper {
myGlobalEntryCheckBox.setSelected(!PathManager.getHomePath().startsWith("/home"));
}
+ myPreferencesLabel.setText("You can use "+ IdeBundle.settingsActionPath() + " to configure any of these settings later.");
+
Disposer.register(myDisposable, new Disposable() {
@Override
public void dispose() {
diff --git a/platform/platform-api/src/com/intellij/ide/BrowserUtil.java b/platform/platform-api/src/com/intellij/ide/BrowserUtil.java
index b058fd0f8a59..8d16b045ea7e 100644
--- a/platform/platform-api/src/com/intellij/ide/BrowserUtil.java
+++ b/platform/platform-api/src/com/intellij/ide/BrowserUtil.java
@@ -51,8 +51,10 @@ import java.lang.reflect.InvocationTargetException;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.zip.ZipEntry;
@@ -178,7 +180,8 @@ public class BrowserUtil {
String browserPath = getGeneralSettingsInstance().getBrowserPath();
if (StringUtil.isEmptyOrSpaces(browserPath)) {
- showErrorMessage(IdeBundle.message("error.please.specify.path.to.web.browser"), IdeBundle.message("title.browser.not.found"));
+ showErrorMessage(IdeBundle.message("error.please.specify.path.to.web.browser", IdeBundle.settingsActionPath()),
+ IdeBundle.message("title.browser.not.found"));
return;
}
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsAction.java
index 30459584327b..53ed30f2249e 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsAction.java
@@ -15,6 +15,8 @@
*/
package com.intellij.ide.actions;
+import com.intellij.icons.AllIcons;
+import com.intellij.ide.IdeBundle;
import com.intellij.openapi.actionSystem.ActionPlaces;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
@@ -31,12 +33,19 @@ import com.intellij.openapi.util.SystemInfo;
import javax.swing.*;
public class ShowSettingsAction extends AnAction implements DumbAware {
+ public ShowSettingsAction() {
+ super(IdeBundle.settingsAction(), IdeBundle.settingsActionDescription(), AllIcons.General.Settings);
+ }
+
@Override
public void update(AnActionEvent e) {
if (SystemInfo.isMac && e.getPlace().equals(ActionPlaces.MAIN_MENU)) {
// It's called from Preferences in App menu.
e.getPresentation().setVisible(false);
}
+ if (e.getPlace().equals(ActionPlaces.WELCOME_SCREEN)) {
+ e.getPresentation().setText(IdeBundle.settingsTitle());
+ }
}
public void actionPerformed(AnActionEvent e) {
diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditorDialog.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditorDialog.java
index f814ab2edd1a..64dbe628309a 100644
--- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditorDialog.java
+++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditorDialog.java
@@ -16,6 +16,7 @@
package com.intellij.openapi.options.newEditor;
import com.intellij.CommonBundle;
+import com.intellij.ide.IdeBundle;
import com.intellij.ide.ui.search.SearchUtil;
import com.intellij.ide.util.PropertiesComponent;
import com.intellij.openapi.actionSystem.DataProvider;
@@ -67,7 +68,7 @@ public class OptionsEditorDialog extends DialogWrapper implements DataProvider{
myGroups = groups;
myPreselected = preselected;
- setTitle("Settings");
+ setTitle(IdeBundle.settingsTitle());
init();
}
diff --git a/platform/platform-resources-en/src/messages/ActionsBundle.properties b/platform/platform-resources-en/src/messages/ActionsBundle.properties
index f00453bde6fc..91e1c3b170c2 100644
--- a/platform/platform-resources-en/src/messages/ActionsBundle.properties
+++ b/platform/platform-resources-en/src/messages/ActionsBundle.properties
@@ -247,8 +247,6 @@ group.reopen.mac.text=Open _Recent
group.$LRU.description=List of recently opened projects
action.CloseProject.text=Close Pro_ject
action.CloseProject.description=Close current project
-action.ShowSettings.text=Se_ttings...
-action.ShowSettings.description=Configure application settings
action.ShowProjectStructureSettings.text=Project Structure...
action.ShowProjectStructureSettings.description=Configure project structure
action.TemplateProjectProperties.text=Def_ault Settings...
@@ -1162,8 +1160,6 @@ action.WelcomeScreen.CreateNewProject.description=Start the \"New Project\" Wiza
action.WelcomeScreen.ImportProject.text=Import Project
action.WelcomeScreen.ImportProject.description=Create {0} project structure for directory with existing sources or convert existing project model.
action.WelcomeScreen.JetBrainsTV.IDEA.text=JetBrains TV
-action.WelcomeScreen.Settings.text=Settings
-action.WelcomeScreen.Settings.description=Edit Settings
action.WelcomeScreen.Plugins.text=Plugins
action.WelcomeScreen.Plugins.description=Manage installed plugins and download new ones from repository
action.WelcomeScreen.Configure.Import.text=Import Settings
diff --git a/platform/platform-resources-en/src/messages/IdeBundle.properties b/platform/platform-resources-en/src/messages/IdeBundle.properties
index 27ae01421fe9..e0c4999c79f8 100644
--- a/platform/platform-resources-en/src/messages/IdeBundle.properties
+++ b/platform/platform-resources-en/src/messages/IdeBundle.properties
@@ -1,7 +1,16 @@
+title.settings=Settings
+title.settings.mac=Preferences
+action.settings=Se_ttings...
+action.settings.mac=Preferences...
+action.settings.description=Edit application settings
+action.settings.description.mac=Edit application preferences
+action.settings.path=File | Settings
+action.settings.path.mac=Preferences
+
title.cannot.start.browser=Cannot start browser
error.malformed.url=Malformed url: {0}
error.cannot.start.browser=Cannot start browser: {0}
-error.please.specify.path.to.web.browser=Please specify a path to web browser in File | Settings | Web Browsers
+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
title.browser.path.not.found=Browser Path Not Found
action.sort.alphabetically=Sort Alphabetically
diff --git a/platform/platform-resources/src/idea/PlatformActions.xml b/platform/platform-resources/src/idea/PlatformActions.xml
index 57ce347c1314..564effde7c92 100644
--- a/platform/platform-resources/src/idea/PlatformActions.xml
+++ b/platform/platform-resources/src/idea/PlatformActions.xml
@@ -153,7 +153,7 @@
-
+