From: Amir E. Aharoni Date: Wed, 21 Oct 2015 11:50:11 +0000 (+0300) Subject: Better phrasing for the contentmodelediterror message X-Git-Tag: 1.31.0-rc.0~9316 X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=07cf031ce8f7e1c512daa61f7d07886f783af835;p=lhc%2Fweb%2Fwiklou.git Better phrasing for the contentmodelediterror message Change-Id: Ie69642f8ae6993d7bb08b785229321ed04428502 --- diff --git a/languages/i18n/en.json b/languages/i18n/en.json index eefdce629a..3e545d2645 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 $1, but the current content model of the page is $2.", + "contentmodelediterror": "You cannot edit this revision because its content model is $1, and the current content model of the page is $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.",