X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/3c239b14bc84e33535cb8980fcdcf8ab5d1022eb..650c0dc8de22b83bb73993cdc43dffd8135ecef3:/templates/editpage.tmpl?ds=sidebyside diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 6aa9ecd1c..cf4950ead 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,33 +1,72 @@ - -<TMPL_VAR FORM-TITLE> -

-Your changes confict with other changes made to the page. +Your changes conflict with other changes made to the page. +

+

Conflict markers have been inserted into the page content. Reconcile the -confict and commit again to save your changes. +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 location: +Page type: +
+
-
+
-Optional comment about this change:
-
+Optional comment about this change:
+
+ + -
-

Page preview:

+
+
+Page preview: +
+
+
- -