wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-25 06:46:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Add GENDER support to visualeditor-editconflict"

Browse source
This commit is contained in:
jenkins-bot 2014-04-21 19:29:59 +00:00 committed by Gerrit Code Review
parent d2563c7e6f 595524f7a6
commit f8b7b0d849
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
VisualEditor.php
View file

@ -650,6 +650,7 @@ $wgResourceModules += array(
'mediawiki.action.history.diff',
'mediawiki.user',
'mediawiki.util',
'mediawiki.jqueryMsg',
'jquery.autoEllipsis',
'jquery.byteLimit',
),

2
modules/ve-mw/i18n/en.json
View file

@ -144,7 +144,7 @@
"visualeditor-dialogbutton-transclusion-tooltip": "Transclusion",
"visualeditor-diff-nochanges": "Could not start the review because your revision matches the latest version of this page.",
"visualeditor-differror": "Error loading data from server: $1.",
"visualeditor-editconflict": "Your changes could not be saved because of an edit conflict. Would you like to resolve the conflict manually?",
"visualeditor-editconflict": "Your changes could not be saved because of an edit conflict. Would {{GENDER:|you}} like to resolve the conflict manually?",
"visualeditor-editnotices-tool": "$1 {{PLURAL:$1|notice|notices}}",
"visualeditor-editnotices-tooltip": "Edit notices",
"visualeditor-editsummary": "Describe what you changed",