Index: src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java
===================================================================
--- src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java	(revision 3217)
+++ src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java	(working copy)
@@ -640,7 +640,7 @@
                             + "has to reset the id of primitive {0} to 0.<br>"
                             + "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()
                     ),
                     tr("Reset id to 0"),
Index: src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java	(revision 3217)
+++ src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java	(working copy)
@@ -29,7 +29,7 @@
 import org.xml.sax.SAXException;
 
 /**
- * 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
  */