X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=templates%2Feditpage.tmpl;h=b0bb0ecb99ceb52b4b7214f214aa5660a64dae53;hb=d5c964508f159c7209b98771bed1ec8df4c952a0;hp=27155f5cf7e1b47c9ef17b8f718b74cd38d5159f;hpb=cf3021ef3f5cb839195585d601de76df519da510;p=ikiwiki.git diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 27155f5cf..b0bb0ecb9 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,29 +1,50 @@ - - - - - -<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: @@ -40,14 +61,13 @@ Optional comment about this change:
+
Page preview:
-
+
- -