Help:Paragraph-based Edit Conflict Interface/ko



단락 기반 편집 충돌 인터페이스는 편집 충돌 해결 문서를 위한 새로운 인터페이스입니다. 서로 한 쌍으로 충돌되는 텍스트 메시지를 표시하며 사용자의 텍스트를 현재 작업 중인 텍스트와 더 쉽게 병합할 수 있게 해줍니다. 이 인터페이스는 토론 문서에서 발생하는 편집 충돌에 대해서는 현재 비활성화되어 있습니다. An additional interface specifically designed for solving edit conflicts on talk pages is currently under development and is planned to be deployed later this year.

이 기능은 베타 기능으로서 2017년 2~5월부터 제공됩니다.

배경
The Paragraph-based Edit Conflict Interface aims to fulfill a wish from the German-speaking community's technical wishlist and is developed by WMDE's Technical Wishes team. More information can be found on the main project page on the Meta wiki.

사용법
새로운 뷰 활성화: 편집 충돌 해결을 위해 새로운 뷰를 활성화하려면 로그인한 다음 beta-features preferences 페이지의 단락 기반 편집 충돌 기능 체크 상자에 체크해야 합니다. 이미 최초 베타 기능을 활성화하셨다면 자동으로 새로운 뷰를 가져오게 됩니다.



요약
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 . A new page version is created, combining all of the text you selected and the grey boxes.



단계별 순서
''' 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 check mark 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.



JS가 아닌 버전
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 ✅

새 베타 기능:
 * 모든 위키를 대상으로 최초 기능에서 새 베타 기능으로 전환: 2018-11-08 ✅

Default feature on:
 * Dewiki: March 25, 2020 ✅
 * Arwiki: March 25, 2020 ✅
 * Fawiki: March 25, 2020 ✅



번역 돕기
이 기능의 소프트웨어 메시지는 번역 위키에서 번역이 가능합니다. 도와주시면 매우 감사하겠습니다!