diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/LabelTextReplacingUtil.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/LabelTextReplacingUtil.java
index 991aafe8ca96..eeaed02b3393 100644
--- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/LabelTextReplacingUtil.java
+++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/LabelTextReplacingUtil.java
@@ -41,12 +41,23 @@ public class LabelTextReplacingUtil {
if (child instanceof JLabel) {
final JLabel label = (JLabel)child;
String oldText = label.getText();
- if (oldText == null) continue;
- String newText = StringUtil.replace(oldText, "$PRODUCT$", ApplicationNamesInfo.getInstance().getProductName());
- newText = StringUtil.replace(newText, "$FULLNAME$", ApplicationNamesInfo.getInstance().getFullProductName());
- label.setText(newText);
+ if (oldText != null) {
+ label.setText(doReplace(oldText));
+ }
+ }
+ else if (child instanceof AbstractButton) {
+ AbstractButton button = (AbstractButton)child;
+ String oldText = button.getText();
+ if (oldText != null) {
+ button.setText(doReplace(oldText));
+ }
}
}
}
+ private static String doReplace(String oldText) {
+ String newText = StringUtil.replace(oldText, "$PRODUCT$", ApplicationNamesInfo.getInstance().getProductName());
+ newText = StringUtil.replace(newText, "$FULLNAME$", ApplicationNamesInfo.getInstance().getFullProductName());
+ return newText;
+ }
}
diff --git a/platform/platform-resources-en/src/messages/IdeBundle.properties b/platform/platform-resources-en/src/messages/IdeBundle.properties
index 7792ebe4cec5..2a4890b1e29a 100644
--- a/platform/platform-resources-en/src/messages/IdeBundle.properties
+++ b/platform/platform-resources-en/src/messages/IdeBundle.properties
@@ -887,11 +887,11 @@ updates.press.more.info.label=
Press More Info... to open a web
updates.check.manually.label=
To check for new updates manually, use the Help | Check for Updates command.
updates.settings.title=Updates
updates.last.check.never=Never
-updates.settings.caption.1=$PRODUCT$ can automatically check for new and updated versions of itself, using your internet connection (when active).
+updates.settings.caption.1=$FULLNAME$ can automatically check for new and updated versions of itself, using your internet connection (when active).
updates.settings.check.now.button=&Check Now
updates.settings.checkbox=Check for updates in channel
updates.settings.build.number= Build number:
-updates.settings.current.version=Current $PRODUCT$ version:
+updates.settings.current.version=Current $FULLNAME$ version\:
updates.settings.last.check=Last checked for updates:
hierarchy.method.next.occurence.name=Go to next method
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.form b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.form
index 7865dd6a85a8..48408f7a7cec 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.form
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.form
@@ -3,7 +3,7 @@
-
+
@@ -13,7 +13,7 @@
-
+
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.java
index 24af3f0c9b33..da4dc0a5d642 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.java
@@ -15,6 +15,7 @@
*/
package org.jetbrains.idea.maven.project;
+import com.intellij.openapi.updateSettings.impl.LabelTextReplacingUtil;
import com.intellij.ui.ListCellRendererWrapper;
import com.intellij.ide.util.projectWizard.WizardContext;
import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
@@ -80,6 +81,8 @@ public class MavenImportingSettingsForm {
}
}
});
+
+ LabelTextReplacingUtil.replaceText(myPanel);
}
private void createUIComponents() {