X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/96eb9bb3fa1d805df967f44d13876f57b8ea121d..edfbd7e1aa8f9f2cb789f45c0668a0d987e0b368:/templates/editpage.tmpl?ds=sidebyside diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index ad1faa3a5..f8eda1b47 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,33 +1,51 @@ - - - - - -<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 type: @@ -41,17 +59,30 @@ Page type: Optional comment about this change:

- + +Attachments + +
+ + + + + + + + +
+
+
+
Page preview:
-
+
- -