Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java	(revision 3217)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java	(revision 3218)
@@ -641,5 +641,5 @@
                             + "On the next upload the server will assign<br>"
                             + "it a new id.<br>"
-                            + "Do yo agree?</html>",
+                            + "Do you agree?</html>",
                             model.getMyPrimitive().getId()
                     ),
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java	(revision 3217)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java	(revision 3218)
@@ -30,5 +30,5 @@
 
 /**
- * This is a {@se JTree} rendering the hierarchical structure of {@see Relation}s.
+ * This is a {@see JTree} rendering the hierarchical structure of {@see Relation}s.
  *
  * @see RelationTreeModel