Ignore:
Timestamp:
2010-01-13T20:12:48+01:00 (14 years ago)
Author:
mjulius
Message:

fix messages for gui/dialogs

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java

    r2715 r2847  
    214214                        tr("Continue resolving")};
    215215                int ret = JOptionPane.showOptionDialog(Main.parent,
    216                         tr("<html>You didn''t finish to merge the differences in this conflict.<br>"
     216                        tr("<html>You did not finish to merge the differences in this conflict.<br>"
    217217                                + "Conflict resolutions won't be applied unless all differences<br>"
    218218                                + "are resolved."
Note: See TracChangeset for help on using the changeset viewer.