Ignore:
Timestamp:
2010-01-26T18:02:36+01:00 (14 years ago)
Author:
mjulius
Message:

Fix some messages

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r2847 r2895  
    215215                int ret = JOptionPane.showOptionDialog(Main.parent,
    216216                        tr("<html>You did not finish to merge the differences in this conflict.<br>"
    217                                 + "Conflict resolutions won't be applied unless all differences<br>"
    218                                 + "are resolved."
     217                                + "Conflict resolutions will not be applied unless all differences<br>"
     218                                + "are resolved.<br>"
    219219                                + "Click <strong>{0}</strong> to close anyway.<strong>Already<br>"
    220                                 + "resolved differences won't be applied.</strong><br>"
     220                                + "resolved differences will not be applied.</strong><br>"
    221221                                + "Click <strong>{1}</strong> to return to resolving conflicts.</html>"
    222222                                , options[0].toString(), options[1].toString()
Note: See TracChangeset for help on using the changeset viewer.