Index: /trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Check.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Check.java	(revision 16034)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Check.java	(revision 16035)
@@ -27,6 +27,4 @@
 public class Check extends KeyedItem {
 
-    /** The localized version of {@link #text}. */
-    public String locale_text; // NOSONAR
     /** the value to set when checked (default is "yes") */
     public String value_on = OsmUtils.TRUE_VALUE; // NOSONAR
@@ -54,7 +52,5 @@
         def = "on".equals(default_) ? Boolean.TRUE : "off".equals(default_) ? Boolean.FALSE : null;
 
-        if (locale_text == null) {
-            locale_text = getLocaleText(text, text_context, null);
-        }
+        initializeLocaleText(null);
 
         if (usage.values.size() < 2 && (oneValue == null || value_on.equals(oneValue) || value_off.equals(oneValue))) {
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java	(revision 16034)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java	(revision 16035)
@@ -48,6 +48,4 @@
     private static final Renderer RENDERER = new Renderer();
 
-    /** The localized version of {@link #text}. */
-    public String locale_text; // NOSONAR
     /**
      * A list of entries.
@@ -422,7 +420,5 @@
             }
         }
-        if (locale_text == null) {
-            locale_text = getLocaleText(text, text_context, null);
-        }
+        initializeLocaleText(null);
         initialized = true;
     }
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/KeyedItem.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/KeyedItem.java	(revision 16034)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/KeyedItem.java	(revision 16035)
@@ -20,5 +20,5 @@
  * Preset item associated to an OSM key.
  */
-public abstract class KeyedItem extends TaggingPresetItem {
+public abstract class KeyedItem extends TextItem {
 
     /** Translation of "&lt;different&gt;". Use in combo boxes to display an entry matching several different values. */
@@ -32,8 +32,4 @@
     /** This specifies the property key that will be modified by the item. */
     public String key; // NOSONAR
-    /** The text to display */
-    public String text; // NOSONAR
-    /** The context used for translating {@link #text} */
-    public String text_context; // NOSONAR
     /**
      * Allows to change the matching process, i.e., determining whether the tags of an OSM object fit into this preset.
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java	(revision 16034)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java	(revision 16035)
@@ -40,6 +40,4 @@
     private static int auto_increment_selected; // NOSONAR
 
-    /** The localized version of {@link #text}. */
-    public String locale_text; // NOSONAR
     /** The default value for the item. If not specified, the current value of the key is chosen as default (if applicable). Defaults to "". */
     public String default_; // NOSONAR
@@ -115,7 +113,5 @@
             originalValue = DIFFERENT;
         }
-        if (locale_text == null) {
-            locale_text = getLocaleText(text, text_context, null);
-        }
+        initializeLocaleText(null);
 
         // if there's an auto_increment setting, then wrap the text field