Changeset 7304 in josm
- Timestamp:
- 2014-07-12T15:01:47+02:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
r7005 r7304 211 211 int conflictsCount = conflicts.size(); 212 212 if (conflictsCount > 0) { 213 setTitle(tr ("Conflicts: {0} unresolved", conflicts.size()) +213 setTitle(trn("Conflict: {0} unresolved", "Conflicts: {0} unresolved", conflictsCount, conflictsCount) + 214 214 " ("+tr("Rel.:{0} / Ways:{1} / Nodes:{2}", 215 215 conflicts.getRelationConflicts().size(),
Note:
See TracChangeset
for help on using the changeset viewer.