From 217483d9d296c5b20fa75cdd234339ec3d19574b Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Tue, 10 Apr 2012 18:55:20 +0400
Subject: [PATCH] Changed some property names in color settings page.

---
 .../org/jetbrains/jet/plugin/JetBundle.properties    | 12 ++++++------
 .../jet/plugin/highlighter/JetColorSettingsPage.java |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/JetBundle.properties b/idea/src/org/jetbrains/jet/plugin/JetBundle.properties
index 50fc52c1247..069e63bcb23 100644
--- a/idea/src/org/jetbrains/jet/plugin/JetBundle.properties
+++ b/idea/src/org/jetbrains/jet/plugin/JetBundle.properties
@@ -61,19 +61,19 @@ options.jet.attribute.descriptor.kdoc.tag.value=KDoc tag value
 options.jet.attribute.descriptor.kdoc.markup=KDoc markup
 options.jet.attribute.descriptor.trait=Trait
 options.jet.attribute.descriptor.annotation=Annotation
-options.jet.attribute.descriptor.var=Mutable variable, parameter or property (var)
-options.jet.attribute.descriptor.local.variable=Local variable
-options.jet.attribute.descriptor.bound.variable=Function literal or anonymous object bound variable
+options.jet.attribute.descriptor.var=Var (mutable variable, parameter or property)
+options.jet.attribute.descriptor.local.variable=Local variable or value
+options.jet.attribute.descriptor.captured.variable=Variables and values captured in a closure
 options.jet.attribute.descriptor.instance.property=Instance property
-options.jet.attribute.descriptor.namespace.property=Namespace property
+options.jet.attribute.descriptor.namespace.property=Package-level property
 options.jet.attribute.descriptor.property.with.backing=Property with backing field
 options.jet.attribute.descriptor.backing.field.access=Backing field access
 options.jet.attribute.descriptor.extension.property=Extension property
 options.jet.attribute.descriptor.it=Function literal default parameter
 options.jet.attribute.descriptor.fun=Function declaration
 options.jet.attribute.descriptor.fun.call=Function call
-options.jet.attribute.descriptor.namespace.fun.call=Namespace function call
+options.jet.attribute.descriptor.namespace.fun.call=Package-level function call
 options.jet.attribute.descriptor.extension.fun.call=Extension function call
 options.jet.attribute.descriptor.constructor.call=Constructor call
-options.jet.attribute.descriptor.auto.casted=Automatically casted value
+options.jet.attribute.descriptor.auto.casted=Smart-cast value
 options.jet.attribute.descriptor.label=Label
diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java b/idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java
index e20ca17824f..366c166646a 100644
--- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java
+++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java
@@ -139,7 +139,7 @@ public class JetColorSettingsPage implements ColorSettingsPage {
 
             new AttributesDescriptor(JetBundle.message("options.jet.attribute.descriptor.local.variable"), JetHighlightingColors.LOCAL_VARIABLE),
             new AttributesDescriptor(OptionsBundle.message("options.java.attribute.descriptor.parameter"), JetHighlightingColors.PARAMETER),
-            new AttributesDescriptor(JetBundle.message("options.jet.attribute.descriptor.bound.variable"), JetHighlightingColors.WRAPPED_INTO_REF),
+            new AttributesDescriptor(JetBundle.message("options.jet.attribute.descriptor.captured.variable"), JetHighlightingColors.WRAPPED_INTO_REF),
 
             new AttributesDescriptor(JetBundle.message("options.jet.attribute.descriptor.instance.property"), JetHighlightingColors.INSTANCE_PROPERTY),
             new AttributesDescriptor(JetBundle.message("options.jet.attribute.descriptor.namespace.property"), JetHighlightingColors.NAMESPACE_PROPERTY),