diff --git a/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.form b/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.form index 09ddcc8e4285..fc6ca43d8312 100644 --- a/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.form +++ b/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.form @@ -8,7 +8,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.java b/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.java index 28ff88985d5d..2ec67154b7c5 100644 --- a/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.java +++ b/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.java @@ -21,7 +21,11 @@ import com.intellij.ide.IdeBundle; import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.Presentation; -import com.intellij.openapi.options.*; +import com.intellij.openapi.application.ApplicationNamesInfo; +import com.intellij.openapi.options.ConfigurationException; +import com.intellij.openapi.options.NonDefaultProjectConfigurable; +import com.intellij.openapi.options.OptionalConfigurable; +import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.IconLoader; @@ -51,10 +55,12 @@ public class FileEncodingConfigurable implements SearchableConfigurable, NonDefa private JPanel myPropertiesFilesEncodingCombo; private Charset mySelectedCharsetForPropertiesFiles; private JComboBox myIdeEncodingsCombo; + private JLabel myTitleLabel; private ChooseFileEncodingAction myAction; public FileEncodingConfigurable(Project project) { myProject = project; + myTitleLabel.setText(myTitleLabel.getText().replace("$productName", ApplicationNamesInfo.getInstance().getFullProductName())); } @Nls diff --git a/platform/platform-resources-en/src/messages/IdeBundle.properties b/platform/platform-resources-en/src/messages/IdeBundle.properties index cbd0908d87e9..84071a7b4a88 100644 --- a/platform/platform-resources-en/src/messages/IdeBundle.properties +++ b/platform/platform-resources-en/src/messages/IdeBundle.properties @@ -1042,7 +1042,7 @@ finished.with.exit.code.text.message=Process finished with exit code {0} # Encodings file.encodings.configurable=File Encodings encodings.dialog.caption=\ - To change encoding IntelliJ IDEA uses for a file, directory, or an entire project,
\ + To change encoding $productName uses for a file, directory, or an entire project,
\ click an item and then select encoding from the Default Encoding list.
\ Notes:
\ Built-in file encoding (e.g. JSP, HTML or XML) overrides encoding you specify here.
\