From be3fe912791f7332374ca231422d3a06b05778e9 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Fri, 1 Aug 2008 21:13:35 +0200 Subject: Sync with ikiwiki 2.55. --- editpage.tmpl | 58 +++++++++++++++++----------------------------------------- 1 file changed, 17 insertions(+), 41 deletions(-) (limited to 'editpage.tmpl') diff --git a/editpage.tmpl b/editpage.tmpl index b0bb0ec..4b54db2 100644 --- a/editpage.tmpl +++ b/editpage.tmpl @@ -1,44 +1,6 @@ - -

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

-

-Conflict markers have been inserted into the page content. Reconcile the -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. -

- +
+ + @@ -60,6 +22,20 @@ Optional comment about this change:
+ +Attachments +
+ + + + + + + + +
+
+ -- cgit v1.2.3