Merge remote branch 'origin/master'

2026-09-27 10:03:11 +07:00 · 2011-11-22 12:52:44 +04:00
parent c6e218a9a2 3f6abef3aa
commit c347bbce41
4 changed files with 2 additions and 2 deletions
@@ -72,7 +72,7 @@ public class ConvertProjectDialog extends DialogWrapper {
    }
    else {
      message.append(IdeBundle.message("conversion.dialog.text.1", context.getProjectFile().getName(),
-                                       ApplicationNamesInfo.getInstance().getProductName()));
+                                       ApplicationNamesInfo.getInstance().getFullProductName()));
    }
    message.append(IdeBundle.message("conversion.dialog.text.2", myBackupDir.getAbsolutePath()));
    message.append("</html>");
@@ -155,7 +155,7 @@ public class ConvertProjectDialog extends DialogWrapper {
    List<File> files = getReadOnlyFiles();
    if (!files.isEmpty()) {
      final String message = IdeBundle.message("message.text.unlock.read.only.files",
-                                               ApplicationNamesInfo.getInstance().getProductName(),
+                                               ApplicationNamesInfo.getInstance().getFullProductName(),
                                               getFilesString(files));
      final String[] options = {CommonBundle.getContinueButtonText(), CommonBundle.getCancelButtonText()};
      if (Messages.showOkCancelDialog(myMainPanel, message, IdeBundle.message("dialog.title.convert.project"), options[0], options[1], null) != 0) {