X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/1626831cc85307682610e58f4bca2a4b7c583024..ceffae8af1c797a715ad8bc375ee3f233703b03d:/templates/editpage.tmpl?ds=sidebyside diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index f63a4b089..cf4950ead 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,17 +1,3 @@ - - - - - -<TMPL_VAR FORM-TITLE> - - - - - - -

Your changes conflict with other changes made to the page. @@ -21,13 +7,43 @@ Conflict markers have been inserted into the page content. Reconcile the conflict and commit again to save your changes.

+ +

+Failed to save your changes. +

+

+Your changes were not able to be saved to disk. The system gave the error: +

+ +
+Your changes are preserved below, and you can try again to save them. +

+
+ +

+The page you were editing has disappeared. +

+

+Perhaps someone else has deleted it or moved it. If you want to recreate +this page with your text, click "Save Page" again. +

+
+ +

+While you were creating this page, someone else independently created a page +with the same name. +

+

+The edit box below contains the page's current content, followed by the +content you entered previously, to allow you to merge the two +together before saving. +

+
-
-/ -
+ Page location: Page type: @@ -41,17 +57,16 @@ Page type: Optional comment about this change:

- + +
Page preview:
-
+
- -