Index: trunk/src/org/openstreetmap/josm/actions/UploadAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/UploadAction.java (revision 1667)
+++ trunk/src/org/openstreetmap/josm/actions/UploadAction.java (revision 1668)
@@ -250,5 +250,5 @@
msg = tr("Uploading failed because the server has a newer version of one
"
+ "of your nodes, ways or relations.
"
- + "The conflict is cause by the {0} with id {1},
"
+ + "The conflict is caused by the {0} with id {1},
"
+ "the server has version {2}, your version is {3}.
"
+ "Please synchronize your local dataset using
"