X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b187641376a3d0519005c80c1ef0dd19266dda84..f1b09207bf7d00dcd34dcafeaa177e9b2640297c:/templates/editpage.tmpl?ds=sidebyside diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 1ee4c4947..15a4069c0 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -2,21 +2,44 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - - <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.

@@ -26,6 +49,7 @@ confict and commit again to save your changes. + Page location: Page type: @@ -39,7 +63,7 @@ Page type: Optional comment about this change:

 - +