Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 17167) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 17168) @@ -408,8 +408,8 @@ return new ExtendedDialog( MainApplication.getMainFrame(), - tr("Overwrite key"), - tr("Replace"), tr("Cancel")) + tr("Overwrite tag"), + tr("Overwrite"), tr("Cancel")) .setButtonIcons("ok", "cancel") - .setContent(action+'\n'+ tr("The new key is already used, overwrite values?")) + .setContent(action) .setCancelButton(2) .toggleEnable(togglePref) @@ -544,5 +544,6 @@ for (OsmPrimitive osm: sel) { if (osm.get(newkey) != null) { - if (!warnOverwriteKey(tr("You changed the key from ''{0}'' to ''{1}''.", key, newkey), + if (!warnOverwriteKey(tr("You changed the key from ''{0}'' to ''{1}''.", key, newkey) + + "\n" + tr("The new key is already used, overwrite values?"), "overwriteEditKey")) return; @@ -1100,6 +1101,8 @@ String val = osm.get(key); if (val != null && !val.equals(value)) { - if (!warnOverwriteKey(tr("You changed the value of ''{0}'' from ''{1}'' to ''{2}''.", key, val, value), - "overwriteAddKey")) + String valueHtmlString = Utils.joinAsHtmlUnorderedList(Arrays.asList("" + val + "", value)); + if (!warnOverwriteKey("" + + tr("You changed the value of ''{0}'': {1}", key, valueHtmlString) + + tr("Overwrite?"), "overwriteAddKey")) return; break;