X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/0f25ec8eb640a850a8f1efe7081c03d05d04eda4..583cfab61438289db843a9c01d66f362efb77e01:/templates/editpage.tmpl?ds=sidebyside diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 0bec3d6b2..d418bac69 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,24 +1,56 @@ - + - - + + <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.

@@ -28,24 +60,25 @@ confict and commit again to save your changes. + Page location: Page type: -
+
-
+
-Optional comment about this change:
-
+Optional comment about this change:
+
- + -
+
Page preview:
@@ -53,5 +86,8 @@ Optional comment about this change:
+