Changeset 2895 in josm
- Timestamp:
- 2010-01-26T18:02:36+01:00 (15 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
r2862 r2895 279 279 Main.parent, 280 280 ExceptionUtil.explainMissingOAuthAccessTokenException(e), 281 tr("Authentication ifailed"),281 tr("Authentication failed"), 282 282 JOptionPane.ERROR_MESSAGE, 283 283 ht("/ErrorMessages#MissingOAuthAccessToken") -
trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java
r2847 r2895 215 215 int ret = JOptionPane.showOptionDialog(Main.parent, 216 216 tr("<html>You did not finish to merge the differences in this conflict.<br>" 217 + "Conflict resolutions w on'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>" 219 219 + "Click <strong>{0}</strong> to close anyway.<strong>Already<br>" 220 + "resolved differences w on't be applied.</strong><br>"220 + "resolved differences will not be applied.</strong><br>" 221 221 + "Click <strong>{1}</strong> to return to resolving conflicts.</html>" 222 222 , options[0].toString(), options[1].toString()
Note:
See TracChangeset
for help on using the changeset viewer.