jenkins-bot has submitted this change and it was merged.
Change subject: Tweak wording for 'contentmodelediterror'
......................................................................
Tweak wording for 'contentmodelediterror'
The message didn't really explain why this is an error, and it's easy
to miss the difference between "revision content model" and "page
content model".
Change-Id: I424ff972469ada9835dd08466724df63cf8971bf
---
M languages/i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index a1fff73..34e67f8 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -697,7 +697,7 @@
"permissionserrors": "Permission error",
"permissionserrorstext": "You do not have permission to do that, for
the following {{PLURAL:$1|reason|reasons}}:",
"permissionserrorstext-withaction": "You do not have permission to $2,
for the following {{PLURAL:$1|reason|reasons}}:",
- "contentmodelediterror": "You cannot edit this revision because its
content model is <code>$1</code>, and the current content model of the page is
<code>$2</code>.",
+ "contentmodelediterror": "You cannot edit this revision because its
content model is <code>$1</code>, which differs from the current content model
of the page <code>$2</code>.",
"recreate-moveddeleted-warn": "<strong>Warning: You are recreating a
page that was previously deleted.</strong>\n\nYou should consider whether it is
appropriate to continue editing this page.\nThe deletion and move log for this
page are provided here for convenience:",
"moveddeleted-notice": "This page has been deleted.\nThe deletion and
move log for the page are provided below for reference.",
"moveddeleted-notice-recent": "Sorry, this page was recently deleted
(within the last 24 hours).\nThe deletion and move log for the page are
provided below for reference.",
--
To view, visit https://gerrit.wikimedia.org/r/259299
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I424ff972469ada9835dd08466724df63cf8971bf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
