Index: trunk/src/org/openstreetmap/josm/gui/MapStatus.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 687)
+++ trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 692)
@@ -334,5 +334,5 @@
 
 	public String helpTopic() {
-		return tr("Statusline");
+		return "Statusline";
 	}
 	
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 687)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 692)
@@ -273,19 +273,25 @@
 		}
 		@Override public void addCommands(Collection<OsmPrimitive> sel, List<Command> cmds) {
-			Object display = combo.getSelectedItem();
+			String display = combo.getSelectedItem().toString();
 			String value = null;
-			if (display != null) 
-				for (String key : lhm.keySet()) { 
+			if(display == null && combo.isEditable())
+				display = combo.getEditor().getItem().toString();
+
+			if (display != null)
+			{
+				for (String key : lhm.keySet()) {
 					String k = lhm.get(key);
-					if (k != null && k.equals(display)) value=key; 
+					if (k != null && k.equals(display)) value=key;
 				}
-			String str = combo.isEditable() ? combo.getEditor().getItem().toString() : value;
-			
+				if(value == null)
+					value = display;
+			}
+
 			// no change if same as before
-			if (str.equals(originalValue) || (originalValue == null && str.length() == 0)) return;
-			
-			if (delete_if_empty && str != null && str.length() == 0)
-				str = null;
-			cmds.add(new ChangePropertyCommand(sel, key, str));
+			if (value.equals(originalValue) || (originalValue == null && (value == null || value.length() == 0))) return;
+			
+			if (delete_if_empty && value != null && value.length() == 0)
+				value = null;
+			cmds.add(new ChangePropertyCommand(sel, key, value));
 		}
 		@Override boolean requestFocusInWindow() {return combo.requestFocusInWindow();}