Changes between Version 14 and Version 15 of Help/Dialog/ConflictList


Ignore:
Timestamp:
2019-08-24T15:30:55+02:00 (6 years ago)
Author:
leni
Comment:

added wikitr: see Wiki/Translations / Wiki Some notes:*

Legend:

Unmodified
Added
Removed
Modified

  • Help/Dialog/ConflictList

    v14 v15  
    44[[Image(source:/trunk/images/dialogs/conflict.png)]] ''Keyboard shortcut'': '''{{{Alt+Shift+C}}}'''
    55
    6 '''The Conflict List Dialog displays the list of [wiki:/Help/Concepts/Conflict conflicts] in the current data layer.'''
     6'''The Conflict List Dialog displays the list of [wikitr:/Help/Concepts/Conflict conflicts] in the current data layer.'''
    77
    88== Showing/Hiding the Conflict List Dialog ==
    … …  
    1818* 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.
    1919
    20 * [[Image(source:/trunk/images/dialogs/conflict.png)]] '''Resolve''' launches the [wiki:/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.
     20* [[Image(source:/trunk/images/dialogs/conflict.png)]] '''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.
    2121
    2222* [[Image(source:/trunk/images/dialogs/select.png)]] '''Select''' selects the objects which the currently selected conflicts have been generated for.
    … …  
    2626The context menu has the following options:
    2727* [[Image(source:/trunk/images/dialogs/autoscale/conflict.png)]] '''Zoom to conflict'''
    28 * [[Image(source:/trunk/images/dialogs/conflict.png)]] '''Resolve to my versions''' will resolve all selected conflicts to my version(s). Use with care! **([ExpertMode expert mode] only)**
    29 * [[Image(source:/trunk/images/dialogs/conflict.png)]] '''Resolve to their versions''' will resolve all selected conflicts to their version(s). Use with care! **([ExpertMode expert mode] only)**
     28* [[Image(source:/trunk/images/dialogs/conflict.png)]] '''Resolve to my versions''' will resolve all selected conflicts to my version(s). Use with care! **([wikitr:/Help/ExpertMode expert mode] only)**
     29* [[Image(source:/trunk/images/dialogs/conflict.png)]] '''Resolve to their versions''' will resolve all selected conflicts to their version(s). Use with care! **([wikitr:/Help/ExpertMode expert mode] only)**
    3030
    3131== See also ==
    32 * [wiki:/Help/Concepts/Conflict Conflict][[BR]]
    33 * [wiki:/Help/Dialog/Conflict Conflict Dialog]
     32* [wikitr:/Help/Concepts/Conflict Conflict][[BR]]
     33* [wikitr:/Help/Dialog/Conflict Conflict Dialog]
    3434
    3535----