- Timestamp:
- 2010-02-15T10:45:11+01:00 (16 years ago)
- File:
- 
      - 1 edited
 
 
Legend:
- Unmodified
- Added
- Removed
- 
      trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.javar2982 r2991 641 641 ImageIcon icon = ImageProvider.get("dialogs/conflict", "useallleft.png"); 642 642 putValue(Action.SMALL_ICON, icon); 643 putValue(Action.SHORT_DESCRIPTION, tr(" Useall my elements"));643 putValue(Action.SHORT_DESCRIPTION, tr("Copy all my elements to the target")); 644 644 } 645 645 … … 667 667 ImageIcon icon = ImageProvider.get("dialogs/conflict", "useallright.png"); 668 668 putValue(Action.SMALL_ICON, icon); 669 putValue(Action.SHORT_DESCRIPTION, tr(" Useall their elements"));669 putValue(Action.SHORT_DESCRIPTION, tr("Copy all their elements to the target")); 670 670 } 671 671 
  Note:
 See   TracChangeset
 for help on using the changeset viewer.
  
