MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

Properly arrange CommonBundle keys

Browse Source 
GitOrigin-RevId: ad67152d90ee76d5fad0942c882d31e43a718b3d
This commit is contained in:
Dmitry.Krasilschikov
2020-02-05 18:02:23 +02:00
committed by intellij-monorepo-bot
parent c99d5c2e23
commit b9fb76d7b9
41 changed files with 127 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
images/src/org/intellij/images/fileTypes/impl/ImageFileType.java
View File

@@ -15,7 +15,7 @@ public final class ImageFileType extends UserBinaryFileType {
@NotNull
@Override
public String getName() {
return CommonBundle.message("image");
return CommonBundle.message("file.type.image");
}
@NotNull

2
images/src/org/intellij/images/thumbnail/actions/FilterByTagActionGroup.java
View File

@@ -50,7 +50,7 @@ public final class FilterByTagActionGroup extends ActionGroup implements PopupAc
ImageTagManager tagManager = ImageTagManager.getInstance(project);
e.getPresentation().setVisible(view != null && !tagManager.getAllTags().isEmpty());
TagFilter[] filters = view != null ? view.getTagFilters() : null;
e.getPresentation().setText(filters == null ? CommonBundle.message("all")
e.getPresentation().setText(filters == null ? CommonBundle.message("action.text.all")
: StringUtil.join(filters, filter -> filter.getDisplayName(), ","));
e.getPresentation().setIcon(AllIcons.Duplicates.SendToTheRight);
}

2
images/src/org/intellij/images/thumbnail/actions/FilterByThemeComboBoxAction.java
View File

@@ -40,7 +40,7 @@ public final class FilterByThemeComboBoxAction extends ComboBoxAction {
.allMatch(filter -> project != null && filter.isApplicableToProject(project));
e.getPresentation().setVisible(view != null && hasApplicableExtension);
ThemeFilter filter = view != null ? view.getFilter() : null;
e.getPresentation().setText(filter == null ? CommonBundle.message("all") : filter.getDisplayName());
e.getPresentation().setText(filter == null ? CommonBundle.message("action.text.all") : filter.getDisplayName());
}
@NotNull

4
java/debugger/impl/src/com/intellij/debugger/actions/ViewTextAction.java
View File

@@ -94,8 +94,8 @@ public class ViewTextAction extends XFetchValueActionBase {
super(project, false);
myStringNode = stringNode;
setModal(false);
setCancelButtonText(CommonBundle.message("close"));
setOKButtonText(CommonBundle.message("set"));
setCancelButtonText(CommonBundle.message("button.without.mnemonic.close"));
setOKButtonText(CommonBundle.message("button.set"));
getOKAction().setEnabled(false);
setCrossClosesWindow(true);

2
java/debugger/impl/src/com/intellij/debugger/memory/ui/InstancesView.java
View File

@@ -70,7 +70,7 @@ class InstancesView extends InstancesViewBase {
private final MyNodeManager myNodeManager;
private final Consumer<? super String> myWarningMessageConsumer;
private final JButton myFilterButton = new JButton(CommonBundle.message("filter"));
private final JButton myFilterButton = new JButton(CommonBundle.message("button.filter"));
private final FilteringProgressView myProgress = new FilteringProgressView();
private final Object myFilteringTaskLock = new Object();

2
java/debugger/impl/src/com/intellij/debugger/memory/ui/InstancesWindow.java
View File

@@ -47,6 +47,6 @@ public class InstancesWindow extends InstancesWindowBase {
@Override
protected Action @NotNull [] createActions() {
return new Action[]{new DialogWrapperExitAction(CommonBundle.message("close"), CLOSE_EXIT_CODE)};
return new Action[]{new DialogWrapperExitAction(CommonBundle.message("action.text.close"), CLOSE_EXIT_CODE)};
}
}

2
java/debugger/impl/src/com/intellij/debugger/settings/CaptureConfigurable.java
View File

@@ -190,7 +190,7 @@ public class CaptureConfigurable implements SearchableConfigurable, NoScroll {
}
});
new DumbAwareAction(CommonBundle.message("toggle")) {
new DumbAwareAction(CommonBundle.message("action.text.toggle")) {
@Override
public void update(@NotNull AnActionEvent e) {
e.getPresentation().setEnabled(table.getSelectedRowCount() == 1 && !table.isEditing());

2
java/debugger/impl/src/com/intellij/debugger/ui/overhead/OverheadView.java
View File

@@ -88,7 +88,7 @@ public class OverheadView extends BorderLayoutPanel implements Disposable, DataP
}
, process);
new DumbAwareAction(CommonBundle.message("toggle")) {
new DumbAwareAction(CommonBundle.message("action.text.toggle")) {
@Override
public void update(@NotNull AnActionEvent e) {
e.getPresentation().setEnabled(myTable.getSelectedRowCount() == 1);

2
java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ImageObjectRenderer.java
View File

@@ -49,7 +49,7 @@ class ImageObjectRenderer extends CompoundReferenceRenderer implements FullValue
}
static JComponent createIconViewer(@Nullable Icon icon) {
if (icon == null) return new JLabel(CommonBundle.message("no.data"), SwingConstants.CENTER);
if (icon == null) return new JLabel(CommonBundle.message("label.no.data"), SwingConstants.CENTER);
final int w = icon.getIconWidth();
final int h = icon.getIconHeight();
final BufferedImage image = GraphicsEnvironment.getLocalGraphicsEnvironment()

6
java/idea-ui/src/com/intellij/ide/util/importProject/ModulesDetectionStep.java
View File

@@ -118,8 +118,10 @@ public class ModulesDetectionStep extends AbstractStepWithProgress<List<ModuleDe
final int answer = Messages.showYesNoCancelDialog(getComponent(),
IdeBundle.message("warning.text.0.do.you.want.to.overwrite.these.files",
StringUtil.join(errors.keySet(), "\n"), errors.size()),
IdeBundle.message("title.file.already.exists"), CommonBundle.message("overwrite"),
CommonBundle.message("reuse"), CommonBundle.message("cancel"), Messages.getQuestionIcon());
IdeBundle.message("title.file.already.exists"),
CommonBundle.message("button.overwrite"),
CommonBundle.message("button.reuse"),
CommonBundle.message("button.without.mnemonics.cancel"), Messages.getQuestionIcon());
if (answer == Messages.CANCEL) {
return false;
}

8
java/idea-ui/src/com/intellij/ide/util/importProject/ProjectLayoutPanel.java
View File

@@ -317,7 +317,7 @@ abstract class ProjectLayoutPanel<T> extends JPanel {
private class MergeAction extends AnAction {
private MergeAction() {
super(CommonBundle.message("merge"), "", AllIcons.Vcs.Merge); // todo
super(CommonBundle.message("action.text.merge"), "", AllIcons.Vcs.Merge); // todo
}
@Override
@@ -327,7 +327,7 @@ abstract class ProjectLayoutPanel<T> extends JPanel {
final String newName = Messages.showInputDialog(
ProjectLayoutPanel.this,
IdeBundle.message("enter.new.name.for.merge.result"),
CommonBundle.message("merge"),
CommonBundle.message("dialog.title.merge"),
Messages.getQuestionIcon(), getElementName(elements.get(0)), getValidator());
if (newName != null) {
final T merged = merge(elements);
@@ -351,7 +351,7 @@ abstract class ProjectLayoutPanel<T> extends JPanel {
private class SplitAction extends AnAction {
private SplitAction() {
super(CommonBundle.message("split"), "", AllIcons.Modules.Split); // todo
super(CommonBundle.message("action.text.split"), "", AllIcons.Modules.Split); // todo
}
@Override
@@ -388,7 +388,7 @@ abstract class ProjectLayoutPanel<T> extends JPanel {
private class RenameAction extends AnAction {
private RenameAction() {
super(CommonBundle.message("rename"), "", IconUtil.getEditIcon()); // todo
super(CommonBundle.message("action.text.rename"), "", IconUtil.getEditIcon()); // todo
}
@Override

5
java/idea-ui/src/com/intellij/jarRepository/JarRepositoryManager.java
View File

@@ -2,6 +2,7 @@
package com.intellij.jarRepository;
import com.intellij.CommonBundle;
import com.intellij.core.JavaCoreBundle;
import com.intellij.ide.IdeBundle;
import com.intellij.jarRepository.services.MavenRepositoryServicesManager;
import com.intellij.notification.Notification;
@@ -312,7 +313,7 @@ public class JarRepositoryManager {
else {
template = new RepositoryArtifactDescription(new RepositoryLibraryProperties(coord, packaging, true), null);
}
ProgressManager.getInstance().run(new Task.Backgroundable(project, CommonBundle.message("maven"), false) {
ProgressManager.getInstance().run(new Task.Backgroundable(project, JavaCoreBundle.message("task.background.title.maven"), false) {
@Override
public void run(@NotNull ProgressIndicator indicator) {
final List<Pair<RepositoryArtifactDescription, RemoteRepositoryDescription>> resultList = new ArrayList<>();
@@ -351,7 +352,7 @@ public class JarRepositoryManager {
public static void searchRepositories(Project project,
Collection<String> serviceUrls,
Processor<? super Collection<RemoteRepositoryDescription>> resultProcessor) {
ProgressManager.getInstance().run(new Task.Backgroundable(project, CommonBundle.message("maven"), false) {
ProgressManager.getInstance().run(new Task.Backgroundable(project, JavaCoreBundle.message("task.background.title.maven"), false) {
@Override
public void run(@NotNull ProgressIndicator indicator) {
final Ref<List<RemoteRepositoryDescription>> result = Ref.create(Collections.emptyList());

2
java/idea-ui/src/com/intellij/jarRepository/settings/RepositoryLibraryPropertiesEditor.java
View File

@@ -89,7 +89,7 @@ public class RepositoryLibraryPropertiesEditor {
myIncludeTransitiveDepsCheckBox = new ThreeStateCheckBox(UIUtil.replaceMnemonicAmpersand("Include &transitive dependencies"));
myIncludeTransitiveDepsCheckBox.setThirdStateEnabled(false);
myTransitiveDependenciesPanel.add(myIncludeTransitiveDepsCheckBox);
myManageDependenciesLink = new SwingActionLink(new AbstractAction(CommonBundle.message("configure.ellipsis")) {
myManageDependenciesLink = new SwingActionLink(new AbstractAction(CommonBundle.message("action.text.configure.ellipsis")) {
@Override
public void actionPerformed(ActionEvent e) {
configureTransitiveDependencies();

3
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurable.java
View File

@@ -34,6 +34,7 @@ import com.intellij.packaging.impl.artifacts.PackagingElementPath;
import com.intellij.packaging.impl.artifacts.PackagingElementProcessor;
import com.intellij.packaging.impl.elements.LibraryElementType;
import com.intellij.packaging.impl.elements.LibraryPackagingElement;
import com.intellij.ui.UIBundle;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -283,7 +284,7 @@ public class ArtifactsStructureConfigurable extends BaseStructureConfigurable {
@Override
public void apply() throws ConfigurationException {
myPackagingEditorContext.saveEditorSettings();
checkForEmptyAndDuplicatedNames(CommonBundle.message("artifact"), CommonBundle.getErrorTitle(), ArtifactConfigurableBase.class);
checkForEmptyAndDuplicatedNames(UIBundle.message("configurable.artifact.prefix"), CommonBundle.getErrorTitle(), ArtifactConfigurableBase.class);
super.apply();
myPackagingEditorContext.getManifestFilesInfo().saveManifestFiles();

2
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryRootsComponent.java
View File

@@ -545,7 +545,7 @@ public class LibraryRootsComponent implements Disposable, LibraryEditorComponent
private class AddExcludedRootActionButton extends AnActionButton {
AddExcludedRootActionButton() {
super(CommonBundle.message("exclude"), null, AllIcons.Modules.AddExcludedRoot);
super(CommonBundle.message("button.exclude"), null, AllIcons.Modules.AddExcludedRoot);
}
@Override

3
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/BaseLibrariesConfigurable.java
View File

@@ -29,6 +29,7 @@ import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.ui.UIBundle;
import com.intellij.util.containers.MultiMap;
import com.intellij.util.ui.tree.TreeUtil;
import org.jetbrains.annotations.NonNls;
@@ -84,7 +85,7 @@ public abstract class BaseLibrariesConfigurable extends BaseStructureConfigurabl
@Override
public void checkCanApply() throws ConfigurationException {
super.checkCanApply();
checkForEmptyAndDuplicatedNames(CommonBundle.message("library"), CommonBundle.getErrorTitle(), LibraryConfigurable.class);
checkForEmptyAndDuplicatedNames(UIBundle.message("configurable.library.prefix"), CommonBundle.getErrorTitle(), LibraryConfigurable.class);
for (LibraryConfigurable configurable : getLibraryConfigurables()) {
if (configurable.getDisplayName().isEmpty()) {
((LibraryProjectStructureElement)configurable.getProjectStructureElement()).navigate();

2
java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaLensProvider.java
View File

@@ -230,7 +230,7 @@ public class JavaLensProvider implements InlayHintsProvider<JavaLensSettings>, E
@NotNull
@Override
public String getName() {
return CommonBundle.message("lenses");
return CommonBundle.message("title.lenses");
}
@NotNull

2
java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java
View File

@@ -36,7 +36,7 @@ import javax.swing.*;
import java.util.*;
public class JavaLineMarkerProvider extends LineMarkerProviderDescriptor {
public static final Option LAMBDA_OPTION = new Option("java.lambda", CommonBundle.message("lambda"), AllIcons.Gutter.ImplementingFunctionalInterface) {
public static final Option LAMBDA_OPTION = new Option("java.lambda", CommonBundle.message("title.lambda"), AllIcons.Gutter.ImplementingFunctionalInterface) {
@Override
public boolean isEnabledByDefault() {
return false;

2
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateServiceImplementationClassFix.java
View File

@@ -200,7 +200,7 @@ public class CreateServiceImplementationClassFix extends CreateServiceClassFixBa
builder.add(UI.PanelFactory.panel(mySubclassButton).withLabel(CodeInsightBundle.message("implementation")))
.add(UI.PanelFactory.panel(myProviderButton));
if (myRootDirCombo.getModel().getSize() > 1) {
builder.add(UI.PanelFactory.panel(myRootDirCombo).withLabel(CommonBundle.message("source.root") + ":"));
builder.add(UI.PanelFactory.panel(myRootDirCombo).withLabel(CommonBundle.message("label.source.root") + ":"));
}
return builder.createPanel();
}

8
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateServiceInterfaceOrClassFix.java
View File

@@ -183,14 +183,14 @@ public class CreateServiceInterfaceOrClassFix extends CreateServiceClassFixBase
JTextField nameTextField = new JTextField(myInterfaceName);
nameTextField.setEditable(false);
PanelGridBuilder builder = UI.PanelFactory.grid();
builder.add(UI.PanelFactory.panel(nameTextField).withLabel(CommonBundle.message("name") + ":"));
builder.add(UI.PanelFactory.panel(nameTextField).withLabel(CommonBundle.message("label.name") + ":"));
if (myModuleCombo.getModel().getSize() > 1) {
builder.add(UI.PanelFactory.panel(myModuleCombo).withLabel(CommonBundle.message("module") + ":"));
builder.add(UI.PanelFactory.panel(myModuleCombo).withLabel(CommonBundle.message("label.module") + ":"));
}
if (myRootDirCombo.getModel().getSize() > 1) {
builder.add(UI.PanelFactory.panel(myRootDirCombo).withLabel(CommonBundle.message("source.root") + ":"));
builder.add(UI.PanelFactory.panel(myRootDirCombo).withLabel(CommonBundle.message("label.source.root") + ":"));
}
builder.add(UI.PanelFactory.panel(myKindCombo).withLabel(CommonBundle.message("kind") + ":"));
builder.add(UI.PanelFactory.panel(myKindCombo).withLabel(CommonBundle.message("label.kind") + ":"));
return builder.createPanel();
}

2
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/PullAsAbstractUpFix.java
View File

@@ -57,7 +57,7 @@ public class PullAsAbstractUpFix extends LocalQuickFixAndIntentionActionOnPsiEle
@Override
@NotNull
public String getFamilyName() {
return CommonBundle.message("pull.up");
return CommonBundle.message("title.pull.up");
}
@Override

6
java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateClassInPackageInModuleFix.java
View File

@@ -175,12 +175,12 @@ public class CreateClassInPackageInModuleFix implements IntentionAction {
protected JComponent createNorthPanel() {
PanelGridBuilder builder = UI.PanelFactory.grid();
builder.add(UI.PanelFactory.panel(myNameTextField)
.withLabel(CommonBundle.message("name") + ":")
.withLabel(CommonBundle.message("label.name") + ":")
.withComment(CodeInsightBundle.message("the.class.will.be.created.in.the.package.0", myPackageName)));
if (myRootDirCombo.getModel().getSize() > 1) {
builder.add(UI.PanelFactory.panel(myRootDirCombo).withLabel(CommonBundle.message("source.root") + ":"));
builder.add(UI.PanelFactory.panel(myRootDirCombo).withLabel(CommonBundle.message("label.source.root") + ":"));
}
builder.add(UI.PanelFactory.panel(myKindCombo).withLabel(CommonBundle.message("kind") + ":"));
builder.add(UI.PanelFactory.panel(myKindCombo).withLabel(CommonBundle.message("label.kind") + ":"));
return builder.createPanel();
}

4
java/java-impl/src/com/intellij/codeInsight/template/JavaCommentContextType.java
View File

@@ -15,7 +15,7 @@
*/
package com.intellij.codeInsight.template;
import com.intellij.CommonBundle;
import com.intellij.core.JavaCoreBundle;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.psi.PsiComment;
import com.intellij.psi.PsiElement;
@@ -30,7 +30,7 @@ import org.jetbrains.annotations.NotNull;
*/
public class JavaCommentContextType extends TemplateContextType {
public JavaCommentContextType() {
super("JAVA_COMMENT", CommonBundle.message("comment"), JavaCodeContextType.Generic.class);
super("JAVA_COMMENT", JavaCoreBundle.message("context.type.java.comment"), JavaCodeContextType.Generic.class);
}
@Override

4
java/java-impl/src/com/intellij/codeInsight/template/JavaStringContextType.java
View File

@@ -15,7 +15,7 @@
*/
package com.intellij.codeInsight.template;
import com.intellij.CommonBundle;
import com.intellij.core.JavaCoreBundle;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
@@ -29,7 +29,7 @@ import org.jetbrains.annotations.NotNull;
*/
public class JavaStringContextType extends TemplateContextType {
public JavaStringContextType() {
super("JAVA_STRING", CommonBundle.message("string"), JavaCodeContextType.Generic.class);
super("JAVA_STRING", JavaCoreBundle.message("context.type.string"), JavaCodeContextType.Generic.class);
}
@Override

4
java/java-impl/src/com/intellij/unscramble/ThreadDumpPanel.java
View File

@@ -97,7 +97,7 @@ public class ThreadDumpPanel extends JPanel implements DataProvider {
});
myFilterPanel = new JPanel(new BorderLayout());
myFilterPanel.add(new JLabel(CommonBundle.message("filter") + ":"), BorderLayout.WEST);
myFilterPanel.add(new JLabel(CommonBundle.message("label.filter") + ":"), BorderLayout.WEST);
myFilterPanel.add(myFilterField);
myFilterPanel.setVisible(false);
@@ -356,7 +356,7 @@ public class ThreadDumpPanel extends JPanel implements DataProvider {
private class FilterAction extends ToggleAction implements DumbAware {
private FilterAction() {
super(CommonBundle.message("filter"), IdeBundle.message("show.only.threads.containing.a.specific.string"), AllIcons.General.Filter);
super(CommonBundle.message("action.text.filter"), IdeBundle.message("show.only.threads.containing.a.specific.string"), AllIcons.General.Filter);
}
@Override

5
java/java-psi-api/src/messages/JavaCoreBundle.properties
View File

@@ -42,4 +42,7 @@ element.enum=enum
element.annotation=annotation
element.statement=statement
element.expression=expression
element.unknown=element
element.unknown=element
context.type.java.comment=Comment
context.type.string=string
task.background.title.maven=Maven

13
json/resources/messages/JsonBundle.properties
View File

@@ -104,4 +104,15 @@ property.0.is.deprecated.1=Property ''{0}'' is deprecated: {1}
add.mapping.for.a=Add mapping for a
no.schema.mappings.defined=No schema mappings defined
json5=JSON5
navigate.to.duplicates=Navigate to duplicates
navigate.to.duplicates=Navigate to duplicates
annotation.property.key=property key
color.page.attribute.keyword=Keyword
color.page.attribute.string=string
color.page.attribute.number=Number
color.page.attribute.colon=Colon
color.page.attribute.comma=Comma
color.page.attribute.brackets=Brackets
color.page.attribute.braces=Braces
color.page.attribute.block.comment=Block comment
color.page.attribute.line.comment=Line comment
color.page.attribute.property.key=property key

3
json/src/com/intellij/json/codeinsight/JsonLiteralAnnotator.java
View File

@@ -1,7 +1,6 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.json.codeinsight;
import com.intellij.CommonBundle;
import com.intellij.json.JsonBundle;
import com.intellij.json.highlighting.JsonSyntaxHighlighterFactory;
import com.intellij.json.psi.JsonNumberLiteral;
@@ -76,7 +75,7 @@ public class JsonLiteralAnnotator implements Annotator {
private static void highlightPropertyKey(@NotNull PsiElement element, @NotNull AnnotationHolder holder) {
if (JsonPsiUtil.isPropertyKey(element)) {
if (Holder.DEBUG) {
holder.newAnnotation(HighlightSeverity.INFORMATION, CommonBundle.message("property.key")).textAttributes(JsonSyntaxHighlighterFactory.JSON_PROPERTY_KEY).create();
holder.newAnnotation(HighlightSeverity.INFORMATION, JsonBundle.message("annotation.property.key")).textAttributes(JsonSyntaxHighlighterFactory.JSON_PROPERTY_KEY).create();
}
else {
holder.newSilentAnnotation(HighlightSeverity.INFORMATION).textAttributes(JsonSyntaxHighlighterFactory.JSON_PROPERTY_KEY).create();

21
json/src/com/intellij/json/highlighting/JsonColorsPage.java
View File

@@ -1,7 +1,6 @@
package com.intellij.json.highlighting;
import com.google.common.collect.ImmutableMap;
import com.intellij.CommonBundle;
import com.intellij.icons.AllIcons;
import com.intellij.json.JsonBundle;
import com.intellij.json.JsonLanguage;
@@ -29,17 +28,17 @@ public class JsonColorsPage implements RainbowColorSettingsPage, DisplayPriority
private static final Map<String, TextAttributesKey> ourAdditionalHighlighting = ImmutableMap.of("propertyKey", JSON_PROPERTY_KEY);
private static final AttributesDescriptor[] ourAttributeDescriptors = new AttributesDescriptor[]{
new AttributesDescriptor(CommonBundle.message("property.key"), JSON_PROPERTY_KEY),
new AttributesDescriptor(JsonBundle.message("color.page.attribute.property.key"), JSON_PROPERTY_KEY),
new AttributesDescriptor(CommonBundle.message("braces"), JSON_BRACES),
new AttributesDescriptor(CommonBundle.message("brackets"), JSON_BRACKETS),
new AttributesDescriptor(CommonBundle.message("comma"), JSON_COMMA),
new AttributesDescriptor(CommonBundle.message("colon"), JSON_COLON),
new AttributesDescriptor(CommonBundle.message("number"), JSON_NUMBER),
new AttributesDescriptor(CommonBundle.message("string"), JSON_STRING),
new AttributesDescriptor(CommonBundle.message("keyword"), JSON_KEYWORD),
new AttributesDescriptor(CommonBundle.message("line.comment"), JSON_LINE_COMMENT),
new AttributesDescriptor(CommonBundle.message("block.comment"), JSON_BLOCK_COMMENT),
new AttributesDescriptor(JsonBundle.message("color.page.attribute.braces"), JSON_BRACES),
new AttributesDescriptor(JsonBundle.message("color.page.attribute.brackets"), JSON_BRACKETS),
new AttributesDescriptor(JsonBundle.message("color.page.attribute.comma"), JSON_COMMA),
new AttributesDescriptor(JsonBundle.message("color.page.attribute.colon"), JSON_COLON),
new AttributesDescriptor(JsonBundle.message("color.page.attribute.number"), JSON_NUMBER),
new AttributesDescriptor(JsonBundle.message("color.page.attribute.string"), JSON_STRING),
new AttributesDescriptor(JsonBundle.message("color.page.attribute.keyword"), JSON_KEYWORD),
new AttributesDescriptor(JsonBundle.message("color.page.attribute.line.comment"), JSON_LINE_COMMENT),
new AttributesDescriptor(JsonBundle.message("color.page.attribute.block.comment"), JSON_BLOCK_COMMENT),
//new AttributesDescriptor("", JSON_IDENTIFIER),
new AttributesDescriptor(JsonBundle.message("valid.escape.sequence"), JSON_VALID_ESCAPE),
new AttributesDescriptor(JsonBundle.message("invalid.escape.sequence"), JSON_INVALID_ESCAPE),

85
platform/platform-resources-en/src/messages/CommonBundle.properties
View File

@@ -49,54 +49,41 @@ vfs.broken.link=Broken link
dialog.options.do.not.show=Do not show this dialog in the future
dialog.options.do.not.ask=&Remember, don't ask again
configure.ellipsis=Configure...
advanced.ellipsis=Advanced...
action.text.configure.ellipsis=Configure...
action.text.advanced.ellipsis=Advanced...
# plural
fields=Fields
button.without.mnemonics.cancel=Cancel
button.without.mnemonic.close=Close
toggle=Toggle
filter=Filter
no.data=No data
close=Close
set=Set
comment=Comment
string=String
pull.up=Pull up
lenses=Lenses
lambda=Lambda
name=Name
kind=Kind
module=Module
source.root=Source root
library=Library
exclude=Exclude
artifact=Artifact
keyword=Keyword
number=Number
colon=Colon
comma=Comma
brackets=Brackets
braces=Braces
block.comment=Block comment
line.comment=Line comment
property.key=property key
all=All
image=Image
remove=Remove
xml=XML
html=HTML
xhtml=XHTML
dtd=DTD
overwrite=Overwrite
reuse=Reuse
cancel=Cancel
none=None
maven=Maven
merge=Merge
split=Split
rename=Rename
title=Title
output=Output
input=Input
prefix=Prefix
action.text.toggle=Toggle
action.text.filter=Filter
action.text.close=Close
action.text.all=All
action.text.merge=Merge
action.text.split=Split
action.text.rename=Rename
button.filter=Filter
button.set=Set
button.exclude=Exclude
button.overwrite=Overwrite
button.reuse=Reuse
label.filter=Filter
label.no.data=No data
label.name=Name
label.kind=Kind
label.module=Module
label.source.root=Source root
label.prefix=Prefix
title.pull.up=Pull up
title.lenses=Lenses
title.lambda=Lambda
title.output=Output
title.input=Input
dialog.title.remove=Remove
dialog.title.merge=Merge
file.type.image=Image

4
platform/platform-resources-en/src/messages/UIBundle.properties
View File

@@ -228,4 +228,6 @@ configurable.CertificateConfigurable.display.name=Server Certificates
action.DesignerToolWindow.Anonymous.text.expand.all=Expand All
action.DesignerToolWindow.Anonymous.text.collapse.all=Collapse All
action.DesignerActionPanel.Anonymous.text.select.parent=Select Parent
action.DesignerActionPanel.Anonymous.description.select.parent=Select Parent
action.DesignerActionPanel.Anonymous.description.select.parent=Select Parent
configurable.library.prefix=Library
configurable.artifact.prefix=Artifact

5
python/rest/resources/messages/RestBundle.properties
View File

@@ -32,4 +32,7 @@ bold.text=Bold text
inline.literals=Inline literals
reference.name=Reference name
explicit.markup=Explicit markup
preview.panel=Preview panel:
preview.panel=Preview panel:
colors.page.attributes.descriptor.comment=Comment
colors.page.attributes.descriptor.title=Title
colors.page.attributes.descriptor.fields=Fields

7
python/rest/src/com/jetbrains/rest/RestColorsPage.java
View File

@@ -1,7 +1,6 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.jetbrains.rest;
import com.intellij.CommonBundle;
import com.intellij.openapi.editor.colors.TextAttributesKey;
import com.intellij.openapi.fileTypes.SyntaxHighlighter;
import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory;
@@ -20,10 +19,10 @@ import java.util.Map;
*/
public class RestColorsPage implements ColorSettingsPage {
private static final AttributesDescriptor[] ATTRS = new AttributesDescriptor[]{
new AttributesDescriptor(CommonBundle.message("comment"), RestSyntaxHighlighter.REST_COMMENT),
new AttributesDescriptor(CommonBundle.message("title"), RestSyntaxHighlighter.REST_SECTION_HEADER),
new AttributesDescriptor(RestBundle.message("colors.page.attributes.descriptor.comment"), RestSyntaxHighlighter.REST_COMMENT),
new AttributesDescriptor(RestBundle.message("colors.page.attributes.descriptor.title"), RestSyntaxHighlighter.REST_SECTION_HEADER),
new AttributesDescriptor(RestBundle.message("explicit.markup"), RestSyntaxHighlighter.REST_EXPLICIT),
new AttributesDescriptor(CommonBundle.message("fields"), RestSyntaxHighlighter.REST_FIELD),
new AttributesDescriptor(RestBundle.message("colors.page.attributes.descriptor.fields"), RestSyntaxHighlighter.REST_FIELD),
new AttributesDescriptor(RestBundle.message("reference.name"), RestSyntaxHighlighter.REST_REF_NAME),
new AttributesDescriptor(RestBundle.message("inline.literals"), RestSyntaxHighlighter.REST_FIXED),
new AttributesDescriptor(RestBundle.message("bold.text"), RestSyntaxHighlighter.REST_BOLD),

4
xml/dom-impl/src/com/intellij/util/xml/tree/actions/DeleteDomElement.java
View File

@@ -53,8 +53,8 @@ public class DeleteDomElement extends BaseDomTreeAction {
final DomElement domElement = ((BaseDomElementNode)selectedNode).getDomElement();
final int ret = Messages.showOkCancelDialog(getPresentationText(selectedNode, "Remove") + "?", CommonBundle.message("remove"),
Messages.getQuestionIcon());
final int ret = Messages.showOkCancelDialog(getPresentationText(selectedNode, "Remove") + "?",
CommonBundle.message("dialog.title.remove"), Messages.getQuestionIcon());
if (ret == Messages.OK) {
WriteCommandAction.writeCommandAction(domElement.getManager().getProject(), DomUtil.getFile(domElement)).run(() -> domElement.undefine());
}

2
xml/relaxng/src/org/intellij/plugins/relaxNG/convert/AdvancedDtdOptions.java
View File

@@ -84,7 +84,7 @@ public class AdvancedDtdOptions implements AdvancedOptions {
}
});
myNamespaceMap.setModel(new NamespaceMapModel());
myNamespaceMap.getColumnModel().getColumn(0).setMaxWidth((int)(new JLabel(CommonBundle.message("prefix")).getPreferredSize().width * 1.2));
myNamespaceMap.getColumnModel().getColumn(0).setMaxWidth((int)(new JLabel(CommonBundle.message("label.prefix")).getPreferredSize().width * 1.2));
final DefaultActionGroup group = new DefaultActionGroup();
group.add(new AnAction(Presentation.NULL_STRING, XmlBundle.lazyMessage("action.AdvancedDtdOptions.Anonymous.text.remove.entry"),

4
xml/relaxng/src/org/intellij/plugins/relaxNG/convert/AdvancedOptionsDialog.java
View File

@@ -53,8 +53,8 @@ public class AdvancedOptionsDialog extends DialogWrapper {
JComponent root;
if (myInputOptions != null && myOutputOptions != null) {
root = new JBTabbedPane();
((JTabbedPane)root).addTab(CommonBundle.message("input"), myInputOptions.getRoot());
((JTabbedPane)root).addTab(CommonBundle.message("output"), myOutputOptions.getRoot());
((JTabbedPane)root).addTab(CommonBundle.message("title.input"), myInputOptions.getRoot());
((JTabbedPane)root).addTab(CommonBundle.message("title.output"), myOutputOptions.getRoot());
} else if (myInputOptions != null) {
root = myInputOptions.getRoot();
} else {

2
xml/relaxng/src/org/intellij/plugins/relaxNG/convert/ConvertSchemaDialog.java
View File

@@ -41,7 +41,7 @@ public class ConvertSchemaDialog extends DialogWrapper implements PropertyChange
mySettings.addPropertyChangeListener(ConvertSchemaSettingsImpl.OUTPUT_TYPE, this);
mySettings.addPropertyChangeListener(ConvertSchemaSettingsImpl.OUTPUT_PATH, this);
myAdvancedAction = new AbstractAction(CommonBundle.message("advanced.ellipsis")) {
myAdvancedAction = new AbstractAction(CommonBundle.message("action.text.advanced.ellipsis")) {
@Override
public void actionPerformed(ActionEvent e) {
mySettings.showAdvancedSettings();

3
xml/xml-psi-impl/src/com/intellij/ide/highlighter/DTDFileType.java
View File

@@ -15,7 +15,6 @@
*/
package com.intellij.ide.highlighter;
import com.intellij.CommonBundle;
import com.intellij.icons.AllIcons;
import com.intellij.ide.IdeBundle;
import com.intellij.lang.dtd.DTDLanguage;
@@ -34,7 +33,7 @@ public class DTDFileType extends LanguageFileType {
@Override
@NotNull
public String getName() {
return CommonBundle.message("dtd");
return "DTD";
}
@Override

3
xml/xml-psi-impl/src/com/intellij/ide/highlighter/HtmlFileType.java
View File

@@ -15,7 +15,6 @@
*/
package com.intellij.ide.highlighter;
import com.intellij.CommonBundle;
import com.intellij.icons.AllIcons;
import com.intellij.ide.IdeBundle;
import com.intellij.lang.Language;
@@ -50,7 +49,7 @@ public class HtmlFileType extends XmlLikeFileType {
@Override
@NotNull
public String getName() {
return CommonBundle.message("html");
return "HTML";
}
@Override

3
xml/xml-psi-impl/src/com/intellij/ide/highlighter/XHtmlFileType.java
View File

@@ -15,7 +15,6 @@
*/
package com.intellij.ide.highlighter;
import com.intellij.CommonBundle;
import com.intellij.icons.AllIcons;
import com.intellij.ide.IdeBundle;
import com.intellij.lang.xhtml.XHTMLLanguage;
@@ -33,7 +32,7 @@ public class XHtmlFileType extends HtmlFileType {
@Override
@NotNull
public String getName() {
return CommonBundle.message("xhtml");
return "XHTML";
}
@Override

3
xml/xml-psi-impl/src/com/intellij/ide/highlighter/XmlFileType.java
View File

@@ -15,7 +15,6 @@
*/
package com.intellij.ide.highlighter;
import com.intellij.CommonBundle;
import com.intellij.icons.AllIcons;
import com.intellij.ide.IdeBundle;
import com.intellij.lang.xml.XMLLanguage;
@@ -36,7 +35,7 @@ public class XmlFileType extends XmlLikeFileType implements DomSupportEnabled {
@Override
@NotNull
public String getName() {
return CommonBundle.message("xml");
return "XML";
}
@Override