Index: D:/Data/Work/xwiki_svnTran/xwiki/core/src/main/resources/ApplicationResources.properties =================================================================== --- D:/Data/Work/xwiki_svnTran/xwiki/core/src/main/resources/ApplicationResources.properties (revision 3545) +++ D:/Data/Work/xwiki_svnTran/xwiki/core/src/main/resources/ApplicationResources.properties (working copy) @@ -67,9 +67,11 @@ filename=Filename default=default confirmobjectremove=Are you sure you want to remove this object? -confirmdelete=This action is not reversible. Are you sure you want to delete this document? +confirmdelete=The deletion of a page is not reversible. Are you sure you want to continue? +confirmdeletebacklinks=In addition, the deletion of a page is not reversible. Are you sure you want to continue? confirmdelete2=Please confirm you want to delete this document? -backlinkswarningdelete=There are pages that link here! +backlinkswarningdelete=The following links lead to the current page: +deletebacklinkswarning=When this page is deleted these links will point to an empty page. confirmdelattachment=Please confirm you want to delete this attachment? deleted=The document has been deleted. editincludepagemsg=This document contains (an) included page(s). To edit this page, click on the following links: Index: D:/Data/Work/xwiki_svnTran/xwiki/core/src/main/resources/ApplicationResources_en.properties =================================================================== --- D:/Data/Work/xwiki_svnTran/xwiki/core/src/main/resources/ApplicationResources_en.properties (revision 3545) +++ D:/Data/Work/xwiki_svnTran/xwiki/core/src/main/resources/ApplicationResources_en.properties (working copy) @@ -65,9 +65,11 @@ filename=Filename default=default confirmobjectremove=Are you sure you want to remove this object? -confirmdelete=This action is not reversible. Are you sure you want to delete this document? +confirmdelete=The deletion of a page is not reversible. Are you sure you want to continue? +confirmdeletebacklinks=In addition, the deletion of a page is not reversible. Are you sure you want to continue? confirmdelete2=Please confirm you want to delete this document? -backlinkswarningdelete=There are pages that link here! +backlinkswarningdelete=The following links lead to the current page: +deletebacklinkswarning=When this page is deleted these links will point to an empty page. confirmdelattachment=Please confirm you want to delete this attachment? deleted=The document has been deleted. editincludepagemsg=This document contains (an) included page(s). To edit this page, click on the following links: Index: D:/Data/Work/xwiki_svnTran/xwiki/web/standard/src/main/webapp/skins/albatross/delete.vm =================================================================== --- D:/Data/Work/xwiki_svnTran/xwiki/web/standard/src/main/webapp/skins/albatross/delete.vm (revision 3547) +++ D:/Data/Work/xwiki_svnTran/xwiki/web/standard/src/main/webapp/skins/albatross/delete.vm (working copy) @@ -3,19 +3,24 @@ ### ### #template("startpage.vm") -
+
#if($message) -
$message
+
$message
#end -#xwikimessagebox($msg.get("delete") $msg.get("confirmdelete") $doc.getURL("delete", "confirm=1&$languageparams") $doc.getURL("view") $msg.get("yes") $msg.get("no")) -
#set($links=$doc.getBacklinks()) #if($links && $links.size() > 0) -#warning ($msg.get("backlinkswarningdelete")) -#foreach($docname in $links) -#set($rdoc = $xwiki.getDocument($docname).getTranslatedDocument()) - $rdoc.displayTitle -#end + #set ($fullmsg="") + #set ($fullmsg=$fullmsg+"

"+$msg.get("deletebacklinkswarning")+"

"+"

"+$msg.get("confirmdeletebacklinks")+"

") + #xwikimessagebox($msg.get("delete") $fullmsg $doc.getURL("delete", "confirm=1&$languageparams") $doc.getURL("view") $msg.get("yes") $msg.get("no")) +#else + #xwikimessagebox($msg.get("delete") $msg.get("confirmdelete") $doc.getURL("delete", "confirm=1&$languageparams") $doc.getURL("view") $msg.get("yes") $msg.get("no")) #end -
-#template("endpage.vm") +
+
+#template("endpage.vm") \ No newline at end of file