|
Review changes and conflicts |
When you work on a document in an online project, it is good to know that others can also work on the same document at the same time. This means that someone else can also change a document that you have in a local copy on your computer.
In an online project with desktop documents, you can download the changes made by others: in the Translations pane of Project home, right-click the document, then choose Synchronize document from the popup menu.
memoQ downloads the newest version of the document. During the download, memoQ will encounter segments that were changed by others. memoQ updates your copy of the document with these changes, but it also marks the changed segments with a change mark. There are two types of change marks:
| · |  : This marks a change in the segment that was made by someone else. Whatever text you had in this segment is gone, and it is replaced by the text written by the other user.
|
| · |  : This marks a change in the segment that was made by you, and was saved to the server. This indicates that the segment was changed by someone else, but that change was overwritten by your version of the text. |
In the Review changes and conflicts tab, you can skim through those segments that are marked by either of those change marks, and make adjustments to your copy of the document as necessary.
Invoking
From the Operations menu, choose Review changes and conflicts. The Review conflict and change marks dialog appears. Choose the scope for the operation, and click OK. memoQ displays the Review changes and conflicts tab.
Note: This command is available only if you work on the local copy of an online project with desktop documents.
Use
The lower part of the tab lists the segments with change marks. It shows the type (direction) of the change, the document name, the row number, and the segment text. In the last column, there is a Dismiss check box for each segment. If you want to clear the change mark from a segment, tick the corresponding check box in the Dismiss column.
When you select a row in the lower part, the segment appears at the top of the Review changes and conflicts tab. You can edit the segment the same way as in the translation grid: the Operations, Edit, and Format menus are available. On the other hand, you cannot access the translation memories and the term bases from this tab.
In addition to the usual commands, the following options are also available in the Review changes and conflicts tab:
| · | Press Ctrl+Up arrow to move one row up in the lower part (in the segment list). Alternatively, you can click the Move to previous item link at the top of the tab. |
| · | Press Ctrl+Down arrow to move one row down in the lower part (in the segment list). Alternatively, you can click the Move to next item link at the top of the tab. |
| · | Click the Dismiss and move to next link to clear the change mark from the highlighted segment, and move to the next segment in the list. |
| · | Click the Dismiss all link to clear the change marks from all segments in the Review changes and conflicts tab. |
| · | Press Ctrl+Enter or click the Confirm link to confirm the current segment, and save the translation to the primary translation memory in the project. |
| · | Press Ctrl+Shift+Enter or click the Confirm without update link to confirm the current segment without saving the translation to the primary translation memory. |
| · | Click Refresh data to reload the contents of the Review changes and conflicts tab. You might need to do this if you synchronized the affected document or documents while this tab was open. |
Navigation
You can navigate the list using the mouse or the keyboard.
| · | Move to previous item: Moves up in the list. Key shortcut: Ctrl+Up arrow. |
| · | Move to next item: Moves down in the list. Key shortcut: Ctrl+Down arrow. |