jenkins-bot has submitted this change and it was merged.

Change subject: Better phrasing for the contentmodelediterror message
......................................................................


Better phrasing for the contentmodelediterror message

Change-Id: Ie69642f8ae6993d7bb08b785229321ed04428502
---
M languages/i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Siebrand: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index eefdce6..3e545d2 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -694,7 +694,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>, but 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>, and the current content model of the page is 
<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/247817
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie69642f8ae6993d7bb08b785229321ed04428502
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Amire80 <[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

Reply via email to