Help:Paragraph-based Edit Conflict Interface/ja



「2列で編集の競合を表示」は編集競合を解消するページの新しいインターフェイスです. その編集者と相違する変更点との違いを直接、テキストフィールドで強調表示しテキストのコピーと貼り付け、矛盾の解消が容易にできます.

2017年2月から5月にかけて提供されたベータ版機能です.

経緯
2列で編集の競合を表示する機能はドイツ語使用者の技術面のウィッシュリストにコミュニティが要望したものに WMDE のテクニカル部門が応じようとしました. 詳細はメタのメイン･プロジェクトのページをご参照ください.

使用法
新しい表示の有効化: 編集の競合解消のために新しいビューを有効にするには、ログインしてベータ版機能ページの「2列で編集の競合を表示」のチェックボックスにチェックを入れる必要があります.

In a nutshell
The edit conflict interface wants to help you merge your text with the one that’s currently online. It breaks down the differences between the two text versions visually:
 * Text passages that differ are displayed in pairs next to each other: The current version of the page is shown in yellow and your version in blue. Inside, text that was changed is highlighted.
 * Text passages that are identical in both versions are displayed as a grey bar, spanning the whole width.


 * How to solve an edit conflict
 * 1) For each pair of text, select the version you want to keep.
 * 2) Edit the selected text, if needed.
 * 3) Click Publish changes. A new page version is created, combining all of the text you selected and the grey boxes.

Step by step
1. Get oriented.

A tutorial guides you through the interface the first time you encounter an edit conflict. You can open it again by clicking on the help icon (?).

In order to help you solve the edit conflict, the interface breaks down the differences between the two revisions like this:
 * Text passages that differ are displayed in pairs next to each other: The current version of the page is shown in yellow and your version in blue. Inside, text that was changed is highlighted.
 * Text passages that are identical in both versions are displayed as a grey bar, spanning the whole width.

2. Build a new version by merging your text with the one that’s currently online.
 * Select the passages you want to keep by clicking on the radio buttons next to them. By default, all texts from the other person are selected, so if you publish immediately, none of your text changes are saved.
 * Edit passages, if needed.
 * Click on the black pencil to open the editing mode for a text passage. If the pencil is grey, it means you need to select the text passage first. Otherwise, this version won’t be saved when you click publish.
 * You can also edit text passages that are identical in both versions.
 * The highlights that indicate the differences between the versions disappear when you edit a text passage.
 * You can integrate parts from other text passages by copy and paste, either with the copy and paste function on your keyboard or with a right click.
 * Click on the checkmark to apply changes to a text box and to close its editing mode.
 * If you want to discard your changes and reset the contents of the text box to what it was when the edit conflict occurred, click on the back arrow. This also restores the highlighting.

3. Publish a new page version.

When you’re done selecting and editing all of the passages, click “Publish changes”. This composes all of the text passages you selected and the grey boxes into a new page revision. As on all wiki pages, you can preview the changes first via the Preview button. On clicking Cancel, you return to the current version of the page.

Non-JS version
If you’re not using JavaScript, the look or behavior of the feature will be as follows:


 * All text passages are shown in editor boxes.
 * There are no buttons within the editor boxes.
 * Text passages that are identical in both versions are always expanded.

展開の工程
ベータ版機能として:
 * MediaWiki.org: 2017-02-06 ✅
 * Meta: 2017-02-13 ✅
 * Dewiki: 2017-02-14 ✅
 * Arwiki: 2017-02-21 ✅
 * Hewiki: 2017-02-23 ✅
 * Fiwiki: 2017-04-12 ✅
 * その他すべてのウィキ: 2017-05-10 ✅

New beta feature:
 * The switch from the first to the new beta feature is planned for November 2018 on all wikis.

翻訳に手を貸す
機能のソフトウェアメッセージは翻訳wikiで翻訳できます. どんな手助けでも大歓迎です!