Changes between Version 16 and Version 17 of Help/Dialog/ConflictList

Timestamp:

2020-03-10T18:29:27+01:00 (6 years ago)

Author:

stoecker

Comment:

Directory rework, see #18845

Help/Dialog/ConflictList

@@ -2 +2 @@
 = Conflict List Dialog =
 
-[[Image(source:/trunk/images/dialogs/conflict.png,middle)]] ''Keyboard shortcut'': '''{{{Alt+Shift+C}}}'''
+[[JOSMImage(dialogs/conflict,middle)]] ''Keyboard shortcut'': '''{{{Alt+Shift+C}}}'''
 
 '''The Conflict List Dialog displays the list of [wikitr:/Help/Concepts/Conflict conflicts] in the current data layer.''' 
@@ -8 +8 @@
 == Showing/Hiding the Conflict List Dialog ==
 
-* Click on the [[Image(source:/trunk/images/dialogs/conflict.png,20,middle)]] conflict icon in the button column on the left of the JOSM main window to show or hide the Conflict List Dialog.
+* Click on the [[JOSMImage(dialogs/conflict,20,middle)]] conflict icon in the button column on the left of the JOSM main window to show or hide the Conflict List Dialog.
 * Press '''{{{Alt+Shift+C}}}''' to show or hide the Conflict List Dialog.
 * It will also open automatically if conflicts were detected.
@@ -18 +18 @@
 * The Conflict List Dialog displays a list of conflicts. The total amount of unresolved conflicts is shown in the header. You can select a conflict by clicking on it.
 
-* [[Image(source:/trunk/images/dialogs/conflict.png,middle)]] '''Resolve''' launches the [wikitr:/Help/Dialog/Conflict Conflict Dialog] for the selected conflict. The Conflict Dialog is used to resolve the conflict. Double-Click on a conflict in the list also launches the Conflict Dialog.
+* [[JOSMImage(dialogs/conflict,middle)]] '''Resolve''' launches the [wikitr:/Help/Dialog/Conflict Conflict Dialog] for the selected conflict. The Conflict Dialog is used to resolve the conflict. Double-Click on a conflict in the list also launches the Conflict Dialog.
 
-* [[Image(source:/trunk/images/dialogs/select.png,middle)]] '''Select''' selects the objects which the currently selected conflicts have been generated for. 
- * Use '''View -> ''' [[Image(source:/trunk/images/dialogs/autoscale/selection.png,middle)]] '''Zoom to selection''' if the selected element is not visible in the current view.
+* [[JOSMImage(dialogs/select,middle)]] '''Select''' selects the objects which the currently selected conflicts have been generated for. 
+ * Use '''View -> ''' [[JOSMImage(dialogs/autoscale/selection,middle)]] '''Zoom to selection''' if the selected element is not visible in the current view.
 
 === Context menu ===
 The context menu has the following options:
-* [[Image(source:/trunk/images/dialogs/autoscale/conflict.png,middle)]] '''Zoom to conflict'''
-* [[Image(source:/trunk/images/dialogs/conflict.png,middle)]] '''Resolve to my versions''' will resolve all selected conflicts to my version(s). Use with care! **([wikitr:/Help/ExpertMode expert mode] only)**
-* [[Image(source:/trunk/images/dialogs/conflict.png,middle)]] '''Resolve to their versions''' will resolve all selected conflicts to their version(s). Use with care! **([wikitr:/Help/ExpertMode expert mode] only)**
+* [[JOSMImage(dialogs/autoscale/conflict,middle)]] '''Zoom to conflict'''
+* [[JOSMImage(dialogs/conflict,middle)]] '''Resolve to my versions''' will resolve all selected conflicts to my version(s). Use with care! **([wikitr:/Help/ExpertMode expert mode] only)**
+* [[JOSMImage(dialogs/conflict,middle)]] '''Resolve to their versions''' will resolve all selected conflicts to their version(s). Use with care! **([wikitr:/Help/ExpertMode expert mode] only)**
 
 == See also ==