Index: trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java (revision 2894)
+++ trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java (revision 2895)
@@ -279,5 +279,5 @@
Main.parent,
ExceptionUtil.explainMissingOAuthAccessTokenException(e),
- tr("Authenticationi failed"),
+ tr("Authentication failed"),
JOptionPane.ERROR_MESSAGE,
ht("/ErrorMessages#MissingOAuthAccessToken")
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (revision 2894)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (revision 2895)
@@ -215,8 +215,8 @@
int ret = JOptionPane.showOptionDialog(Main.parent,
tr("You did not finish to merge the differences in this conflict.
"
- + "Conflict resolutions won't be applied unless all differences
"
- + "are resolved."
+ + "Conflict resolutions will not be applied unless all differences
"
+ + "are resolved.
"
+ "Click {0} to close anyway.Already
"
- + "resolved differences won't be applied.
"
+ + "resolved differences will not be applied.
"
+ "Click {1} to return to resolving conflicts."
, options[0].toString(), options[1].toString()