Changeset 3765 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java

Timestamp:

2011-01-02T01:54:29+01:00 (15 years ago)

Author:

stoecker

Message:

fix help

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java

@@ -170 +170 @@
 
         resolver.addPropertyChangeListener(this);
-        HelpUtil.setHelpContext(this.getRootPane(), "Dialog/ConflictDialog");
+        HelpUtil.setHelpContext(this.getRootPane(), ht("Dialog/Conflict"));
 
         registerListeners();
@@ -212 +212 @@
 
         public void actionPerformed(ActionEvent arg0) {
-            HelpBrowser.setUrlForHelpTopic("/Dialog/ConflictDialog");
+            HelpBrowser.setUrlForHelpTopic(ht("/Dialog/Conflict"));
         }
     }