Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 9451)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 9452)
@@ -129,9 +129,9 @@
         popupMenuHandler.addAction(Main.main.menu.autoScaleActions.get("conflict"));
 
-        final ResolveTpMyVersionAction resolveTpMyVersionAction = new ResolveTpMyVersionAction();
+        final ResolveToMyVersionAction resolveToMyVersionAction = new ResolveToMyVersionAction();
         final ResolveToTheirVersionAction resolveToTheirVersionAction = new ResolveToTheirVersionAction();
-        addListSelectionListener(resolveTpMyVersionAction);
+        addListSelectionListener(resolveToMyVersionAction);
         addListSelectionListener(resolveToTheirVersionAction);
-        final JMenuItem btnResolveMy = popupMenuHandler.addAction(resolveTpMyVersionAction);
+        final JMenuItem btnResolveMy = popupMenuHandler.addAction(resolveToMyVersionAction);
         final JMenuItem btnResolveTheir = popupMenuHandler.addAction(resolveToTheirVersionAction);
 
@@ -539,6 +539,6 @@
     }
 
-    class ResolveTpMyVersionAction extends ResolveToAction {
-        ResolveTpMyVersionAction() {
+    class ResolveToMyVersionAction extends ResolveToAction {
+        ResolveToMyVersionAction() {
             super(tr("Resolve to my versions"), tr("Resolves all unresolved conflicts to ''my'' version"),
                     MergeDecisionType.KEEP_MINE);