From: Bartosz DziewoƄski Date: Tue, 15 Dec 2015 18:16:44 +0000 (+0100) Subject: Tweak wording for 'contentmodelediterror' X-Git-Tag: 1.31.0-rc.0~8666 X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/journal.php?a=commitdiff_plain;h=2289918c8877897459153bc500774cf2c375f710;p=lhc%2Fweb%2Fwiklou.git 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 --- diff --git a/languages/i18n/en.json b/languages/i18n/en.json index a1fff73067..34e67f8aef 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 $1, and the current content model of the page is $2.", + "contentmodelediterror": "You cannot edit this revision because its content model is $1, which differs from the current content model of the page $2.", "recreate-moveddeleted-warn": "Warning: You are recreating a page that was previously deleted.\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.",