From: Nemo bis <federicoleva@tiscali.it>
Date: Sat, 27 Jul 2013 17:05:25 +0000 (+0200)
Subject: Clarify userrights-conflict
X-Git-Tag: 1.31.0-rc.0~18998^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%29%20.%20%22?a=commitdiff_plain;h=d4ccad88cf38aff9610bece18de2f5b817bc4a9e;p=lhc%2Fweb%2Fwiklou.git

Clarify userrights-conflict

Spotted by Nikerabbit:
<https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Userrights-conflict/fi>

Change-Id: Iaa519a063dd6b24226db82aed7163903b0b7b02b
---

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index b525465180..a8a588cd44 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2043,7 +2043,7 @@ Your email address is not revealed when other users contact you.',
 'userrights-changeable-col'      => 'Groups you can change',
 'userrights-unchangeable-col'    => 'Groups you cannot change',
 'userrights-irreversible-marker' => '$1*', # only translate this message to other languages if you have to change it
-'userrights-conflict'            => 'User rights conflict! Please apply your changes again.',
+'userrights-conflict'            => 'Conflict of user rights changes! Please review and confirm your changes.',
 'userrights-removed-self'        => 'You successfully removed your own rights. As such, you are no longer able to access this page.',
 
 # Groups