diff --git a/java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java
index f48a81ed0589..7614ebcdeed0 100644
--- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java
+++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java
@@ -41,7 +41,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-public class CompilerConfigurable implements SearchableConfigurable.Parent {
+public class CompilerConfigurable implements SearchableConfigurable.Parent, Configurable.NoScroll {
private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.options.CompilerConfigurable");
private final Project myProject;
diff --git a/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form b/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form
index 5294042ebf11..3438552c1290 100644
--- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form
+++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form
@@ -1,6 +1,6 @@
diff --git a/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java
index 61e32f8aa50b..1fa9511d4b14 100644
--- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java
+++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java
@@ -49,10 +49,10 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura
myProject = project;
myCbUseCompileServer.setVisible(ApplicationManager.getApplication().isInternal());
myPatternLegendLabel.setText("" +
- "Use ; to separate patterns and ! to negate a pattern.
" +
- "Accepted wildcards: ? — exactly one symbol; * — zero or more symbols;
" +
- " / — path separator; /**/ — any number of directories;
" +
- " <dir_name>:<pattern> — restrict to source roots with the specified name" +
+ "Use ; to separate patterns and ! to negate a pattern. " +
+ "Accepted wildcards: ? — exactly one symbol; * — zero or more symbols; " +
+ "/ — path separator; /**/ — any number of directories; " +
+ "<dir_name>:<pattern> — restrict to source roots with the specified name" +
"");
}
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/ExpressionEvaluationDialog.java b/java/debugger/impl/src/com/intellij/debugger/ui/ExpressionEvaluationDialog.java
index c61d1301b83e..eab6dd027d74 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/ExpressionEvaluationDialog.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/ExpressionEvaluationDialog.java
@@ -80,8 +80,8 @@ public class ExpressionEvaluationDialog extends EvaluationDialog {
final JPanel panel = new JPanel(new GridBagLayout());
final JLabel expressionLabel = new JLabel(DebuggerBundle.message("label.evaluate.dialog.expression"));
- panel.add(expressionLabel, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 0, 0, 0), 0, 0));
- panel.add(getExpressionCombo(), new GridBagConstraints(1, GridBagConstraints.RELATIVE, 1, 1, 1.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(5, 0, 0, 0), 0, 0));
+ panel.add(expressionLabel, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 0.0, 0.0, GridBagConstraints.BASELINE_LEADING, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ panel.add(getExpressionCombo(), new GridBagConstraints(1, GridBagConstraints.RELATIVE, 1, 1, 1.0, 0.0, GridBagConstraints.BASELINE_LEADING, GridBagConstraints.HORIZONTAL, new Insets(0, 10, 0, 0), 0, 0));
final JLabel resultLabel = new JLabel(DebuggerBundle.message("label.evaluate.dialog.result"));
panel.add(resultLabel, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 2, 1, 1.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(5, 0, 0, 0), 0, 0));
diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/TemplateCommentPanel.form b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/TemplateCommentPanel.form
index 2316c1cb25ab..c4fe5a943446 100644
--- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/TemplateCommentPanel.form
+++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/TemplateCommentPanel.form
@@ -64,7 +64,7 @@
-
+
@@ -84,7 +84,7 @@
-
+
@@ -121,7 +121,7 @@
-
+
@@ -219,7 +219,7 @@
-
+
diff --git a/resources-en/src/messages/CompilerBundle.properties b/resources-en/src/messages/CompilerBundle.properties
index 2a8cebb6cceb..6d67ba3e3db7 100644
--- a/resources-en/src/messages/CompilerBundle.properties
+++ b/resources-en/src/messages/CompilerBundle.properties
@@ -110,7 +110,7 @@ label.option.deploy.never=Never
label.option.deploy.always=Always
label.option.deploy.text=Deploy web applications to server after compilation:
label.option.clear.output.directory.on.rebuild=C&lear output directory on rebuild
-label.option.resource.patterns.text=Resource Patterns
+label.option.resource.patterns.text=Resource patterns\:
error.compiler.configurable.malformed.patterns=The following resource patterns are malformed:\n{0}
exclude.from.compile.table.path.column.name=Path
exclude.from.compile.table.recursively.column.name=Recursively