# HG changeset patch
# User Dan
# Date 1270565185 14400
# Node ID e88534039a8d0070d5e3d74fee64aa478c091d95
# Parent  83fd4ed90cc674d654d79b8a4de8138e2b14a5e5
Clarified some edit conflict related strings

diff -r 83fd4ed90cc6 -r e88534039a8d language/english/core.json
--- a/language/english/core.json	Tue Mar 30 11:43:17 2010 -0400
+++ b/language/english/core.json	Tue Apr 06 10:46:25 2010 -0400
@@ -353,8 +353,8 @@
 			err_access_denied_body: 'You are not authorized to edit or view the source of this page.',
 			err_save_title: 'There was a problem saving the page.',
 			err_save_body: 'A few problems were encountered while your page was being saved:',
-			err_obsolete_title: 'Someone else modified this page while you were editing it',
-			err_obsolete_body: 'While you were editing this page, %author% modified this page. The edit took place on %timestamp%. You can <a href="%page_url%" onclick="window.open(this.href); return false;">view the latest version of the page</a>, or click %this.editor_btn_save% again to replace the page with your revision.',
+			err_obsolete_title: 'Edit conflict detected',
+			err_obsolete_body: '%author% saved a new revision of this page on %timestamp% while you were editing it. You can <a href="%page_url%" onclick="window.open(this.href); return false;">view the latest version of the page</a>, or click %this.editor_btn_save% again to replace the page with your revision.<br /><br />You can also click the Show Changes button to see a side-by-side difference between your revision and the current one.',
 			err_need_captcha_title: 'Missing confirmation code',
 			err_need_captcha_body: 'Please enter the confirmation code in the box labeled "%this.editor_lbl_field_captcha_code%". %this.editor_msg_captcha_blind%',
 			err_no_text_title: 'No text entered',