Changeset 9452 in josm for trunk/src


Ignore:
Timestamp:
2016-01-14T23:19:57+01:00 (4 years ago)
Author:
simon04
Message:

see #12338 - Typo

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

    r9449 r9452  
    129129        popupMenuHandler.addAction(Main.main.menu.autoScaleActions.get("conflict"));
    130130
    131         final ResolveTpMyVersionAction resolveTpMyVersionAction = new ResolveTpMyVersionAction();
     131        final ResolveToMyVersionAction resolveToMyVersionAction = new ResolveToMyVersionAction();
    132132        final ResolveToTheirVersionAction resolveToTheirVersionAction = new ResolveToTheirVersionAction();
    133         addListSelectionListener(resolveTpMyVersionAction);
     133        addListSelectionListener(resolveToMyVersionAction);
    134134        addListSelectionListener(resolveToTheirVersionAction);
    135         final JMenuItem btnResolveMy = popupMenuHandler.addAction(resolveTpMyVersionAction);
     135        final JMenuItem btnResolveMy = popupMenuHandler.addAction(resolveToMyVersionAction);
    136136        final JMenuItem btnResolveTheir = popupMenuHandler.addAction(resolveToTheirVersionAction);
    137137
     
    539539    }
    540540
    541     class ResolveTpMyVersionAction extends ResolveToAction {
    542         ResolveTpMyVersionAction() {
     541    class ResolveToMyVersionAction extends ResolveToAction {
     542        ResolveToMyVersionAction() {
    543543            super(tr("Resolve to my versions"), tr("Resolves all unresolved conflicts to ''my'' version"),
    544544                    MergeDecisionType.KEEP_MINE);
Note: See TracChangeset for help on using the changeset viewer.