Changeset 1989 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair
- Timestamp:
- 2009-08-23T19:34:25+02:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java
r1954 r1989 586 586 null, 587 587 tr("<html>To keep your local version, JOSM<br>" 588 + "has to reset the id of {0} {1} to 0.<br>"588 + "has to reset the id of primitive {0} to 0.<br>" 589 589 + "On the next upload the server will assign<br>" 590 590 + "it a new id.<br>" 591 591 + "Do yo agree?</html>", 592 OsmPrimitiveType.from(model.getMyPrimitive()).getLocalizedDisplayNamePlural(),593 592 model.getMyPrimitive().id 594 593 ),
Note:
See TracChangeset
for help on using the changeset viewer.