From 282ce91522affa27606bc5b835d8a7d7a91b4df5 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Tue, 16 Oct 2007 17:39:27 +0200 Subject: Grab upstream pages from version 2.9. --- editpage.tmpl | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 editpage.tmpl (limited to 'editpage.tmpl') diff --git a/editpage.tmpl b/editpage.tmpl new file mode 100644 index 0000000..cf4950e --- /dev/null +++ b/editpage.tmpl @@ -0,0 +1,72 @@ + +

+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. +

+ + + + + + + +Page location: +Page type: + +
+ + + +
+ +Optional comment about this change:
+
+ + + + + + +
+
+Page preview: +
+
+ +
+ -- cgit v1.2.3