jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/350557 )
Change subject: Adapt help dialog to current version
......................................................................
Adapt help dialog to current version
Bug: T163886
Change-Id: Ie5299802d3858cd0bd7474436058aace957851a4
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
jenkins-bot: Verified
Andrew-WMDE: Looks good to me, approved
diff --git a/i18n/en.json b/i18n/en.json
index ac7b994..dadbef8 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -23,10 +23,10 @@
"twoColConflict-label-show-changes": "show changes",
"twoColConflict-label-unchanged": "unchanged text",
"twoColConflict-show-help-tooltip": "Show help text",
- "twoColConflict-help-dialog-slide1": "After enabled, whenever an edit
conflict happens, the new two-column view for conflict resolution will appear.
You will see a box with the conflicting changes in one column and an editor
with the currently saved version of the text in another column. Feedback is
very much appreciated [[mw:Help_talk:Two_Column_Edit_Conflict_View|here]].",
- "twoColConflict-help-dialog-slide2": "Inside the box containing the
conflicting changes, both the conflicting text and your text is shown, and the
differences between the two are highlighted.",
- "twoColConflict-help-dialog-slide3": "There are buttons above the box
which allow you to hide any unchanged parts of the text to make it easier to
focus on the conflicting areas. Also you have the possibility to only show your
version of the text.",
- "twoColConflict-help-dialog-slide4": "You can then copy and paste the
desired parts of the text to the editor to adjust the version that should be
saved. Once you hit the \"Save changes\" button, the version from the editor
will be saved.",
+ "twoColConflict-help-dialog-slide1": "This page helps you to resolve an
edit conflict. There are two columns: The first shows the conflicting changes
and the second column is a text editor, whose content will be saved.\n\n
Feedback is very much appreciated
[[mw:Help_talk:Two_Column_Edit_Conflict_View|here]].",
+ "twoColConflict-help-dialog-slide2": "The first column shows the
changes in your version and the changes in the currently saved version. The
differences between both versions are highlighted.",
+ "twoColConflict-help-dialog-slide3": "At the top of the first column
you can click on \"show\" to see unchanged text. This might help to understand
the context of changes. By default, unchanged text is greyed out and collapsed.
You can also click on \"mine\" to see only your changes.",
+ "twoColConflict-help-dialog-slide4": "The second column is an editor.
Copy and paste the desired parts of your version into the text in the editor.
Only what is in the editor will be published, when you click the \"Publish
changes\" button.",
"twoColConflict-tutorial": "Edit conflict solving tutorial",
"twoColConflict-previous-dialog": "Previous",
"twoColConflict-next-dialog": "Next",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 2a5726c..66170ae 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -27,9 +27,9 @@
"twoColConflict-label-show-changes": "Label for the options which
filter conflicting text in the diff view.\n{{Identical|Show change}}",
"twoColConflict-label-unchanged": "Label for the options showing and
hiding unchanged text in the diff view.",
"twoColConflict-show-help-tooltip": "Text shown in a tooltip for the
\"Show help\" button.",
- "twoColConflict-help-dialog-slide1": "Text shown on the first slide of
the help dialog.",
+ "twoColConflict-help-dialog-slide1": "{{doc-important|The \"editor\"
here refers to the editor softwares/extensions/features such as Wikitext
editor, VisualEditor, ... etc. Not a random user who edited some pages.}}\nText
shown on the first slide of the help dialog.",
"twoColConflict-help-dialog-slide2": "Text shown on the second slide of
the help dialog.",
- "twoColConflict-help-dialog-slide3": "Text shown on the third slide of
the help dialog.",
+ "twoColConflict-help-dialog-slide3": "Text shown on the third slide of
the help dialog.\n\n\"show\" is {{msg-mw|twoColConflict-label-show}} and
\"mine\" is {{msg-mw|twoColConflict-label-mine}}.",
"twoColConflict-help-dialog-slide4": "{{doc-important|The \"editor\"
here refers to the editor softwares/extensions/features such as Wikitext
editor, VisualEditor, ... etc. Not a random user who edited some pages.}}\nText
shown on the fourth slide of the help dialog.",
"twoColConflict-tutorial": "Text shown above the TwoColConflict
tutorial. This should contain as few words as possible to avoid being
truncated.",
"twoColConflict-previous-dialog": "Label of the button to go to the
previous tutorial slide.\n{{Identical|Previous}}",
--
To view, visit https://gerrit.wikimedia.org/r/350557
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5299802d3858cd0bd7474436058aace957851a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch <[email protected]>
Gerrit-Reviewer: Andrew-WMDE <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
