Index: core/src/main/resources/ApplicationResources_fr.properties
===================================================================
--- core/src/main/resources/ApplicationResources_fr.properties (revision 3458)
+++ core/src/main/resources/ApplicationResources_fr.properties (working copy)
@@ -67,6 +67,7 @@
confirmobjectremove=Etes-vous s\u00fbr de vouloir effacer cet objet ?
confirmdelete=Cette action ne peut-\u00eatre annul\u00e9e. Etes-vous s\u00fbr de vouloir effacer ce document ?
confirmdelete2=Voulez vous vraiment effacer ce document ?
+backlistwarningdelete=Il y a des documents avec des liens ici.
confirmdelattachment=Voulez vous vraiment effacer cette pi\u00e8ce jointe ?
deleted=Le document a \u00e9t\u00e9 \u00e9ffac\u00e9.
editincludepagemsg=Ce document contient un (des) page(s) incluse(s). Pour editer cette (ces) page(s), cliquez sur le(s) lien(s) suivant:
@@ -448,7 +449,7 @@
viewattributestitle=Attributs de $doc.displayTitle
adminprefs=Pr\u00e9f\u00e9rences
adminglobalrights=Droits Globaux
-adminspacerights=Droits Espaces
+adminspacerights=Droits de l'Espace
admingroups=Groupes
adminusers=Utilisateurs
adminusersandgroups=Membres
@@ -683,33 +684,3 @@
core.comment.createduser=Ajout d'utilisateur
core.comment.addedusertogroup=Ajout d'utilisateur dans un groupe
core.comment.rollback=Retour \u00e0 la version {0}
-
-# top menu
-core.menu.documentation=Documentation
-core.menu.create=Cr\u00e9er
-core.menu.create.page=Page
-core.menu.create.space=Espace
-core.menu.create.blogpost=Article de Blog
-core.menu.create.event=Ev\u00e9nement
-core.menu.create.panel=Panel
-core.menu.edit=Editer
-core.menu.edit.wiki=Wiki
-core.menu.edit.visual=WYSIWYG
-core.menu.edit.form=Formulaire
-core.menu.edit.object=XObjets
-core.menu.edit.class=XClasse
-core.menu.edit.rights=Droits d'Acc\u00e8s
-core.menu.view=Voir
-core.menu.view.code=Wiki code
-core.menu.view.xml=XML
-core.menu.view.attributes=Atributes
-core.menu.view.comments=Commentaires
-core.menu.view.attachments=Pi\u00e8ces jointes
-core.menu.view.history=Historique
-core.menu.print=Imprimer
-core.menu.print.pdf=PDF
-core.menu.print.rtf=RTF
-core.menu.print.preview=Previsualiser
-core.menu.watch=Favoris
-core.menu.delete=Effacer
-core.menu.rename=Renommer
\ No newline at end of file
Index: core/src/main/resources/ApplicationResources_es.properties
===================================================================
--- core/src/main/resources/ApplicationResources_es.properties (revision 3458)
+++ core/src/main/resources/ApplicationResources_es.properties (working copy)
@@ -67,6 +67,7 @@
confirmobjectremove= ¿ Está seguro(a) que quiere borrar ese objeto ?
confirmdelete= Esta acción no puede ser cancelada ¿ Está seguro(a) que quiere borrar ese objeto ?
confirmdelete2= ¿ Está seguro(a)que quiere borrar ese documento ?
+backlistwarningdelete=Hay paginas con enlaces aqui.
confirmdelattachment= ¿ Está seguro(a) que quiere borrar ese enlace?
deleted=El documento ha sido borrado.
editincludepagemsg=Ese documento contiene una (o más) página(s)incluida(s). Para editar esa(s) página(s), cliquea en los siguientes enlaces :
Index: core/src/main/resources/ApplicationResources.properties
===================================================================
--- core/src/main/resources/ApplicationResources.properties (revision 3458)
+++ core/src/main/resources/ApplicationResources.properties (working copy)
@@ -3,12 +3,10 @@
chinese=Chinese
english=English
french=French
-german=German
-italian=Italian
-polish=Polish
russian=Russian
spanish=Spanish
-
+italian=Italian
+german=German
# User Page
firstname=First Name
lastname=Last Name
@@ -69,6 +67,7 @@
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?
confirmdelete2=Please confirm you want to delete this document?
+backlistwarningdelete=There are pages that link here.
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:
@@ -125,7 +124,6 @@
pagetopreferers=Top Referers
#newinterface
pdf=PDF
-rtf=RTF
editpage=Edit this Page
addattachment=Add an attachment
history=History
@@ -662,7 +660,7 @@
# Rename
core.rename.title = Renaming {0}
-core.rename.inputPrompt=
+core.rename.inputPrompt=
core.rename.newspace=New space
core.rename.newpage=New page
core.rename.title.newName=New document name
@@ -697,35 +695,4 @@
core.comment.createduser=Created user
core.comment.addedusertogroup=Added user to group
core.comment.rollback=Rollback to version {0}
-core.comment.updatecontent=Update Content
-
-# top menu
-core.menu.documentation=Documentation
-core.menu.create=Create
-core.menu.create.page=Page
-core.menu.create.space=Space
-core.menu.create.blogpost=Blog entry
-core.menu.create.event=Event
-core.menu.create.panel=Panel
-core.menu.edit=Edit
-core.menu.edit.wiki=Wiki
-core.menu.edit.visual=WYSIWYG
-core.menu.edit.form=Inline form
-core.menu.edit.object=XObjects
-core.menu.edit.class=XClass
-core.menu.edit.rights=Access rights
-core.menu.view=Show
-core.menu.view.code=Wiki code
-core.menu.view.xml=XML export
-core.menu.view.attributes=Attributes
-core.menu.view.comments=Comments
-core.menu.view.attachments=Attachments
-core.menu.view.history=History
-core.menu.print=Print
-core.menu.print.pdf=PDF
-core.menu.print.rtf=RTF
-core.menu.print.preview=Preview
-core.menu.watch=Watch
-core.menu.delete=Delete
-core.menu.rename=Rename
-
+core.comment.updatecontent=Update Content
\ No newline at end of file
Index: core/src/main/resources/ApplicationResources_en.properties
===================================================================
--- core/src/main/resources/ApplicationResources_en.properties (revision 3458)
+++ core/src/main/resources/ApplicationResources_en.properties (working copy)
@@ -67,6 +67,7 @@
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?
confirmdelete2=Please confirm you want to delete this document?
+backlistwarningdelete=There are pages that link here.
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:
@@ -123,7 +124,6 @@
pagetopreferers=Top Referers
#newinterface
pdf=PDF
-rtf=RTF
editpage=Edit this Page
addattachment=Add an attachment
history=History
Index: web/standard/src/main/webapp/skins/albatross/delete.vm
===================================================================
--- web/standard/src/main/webapp/skins/albatross/delete.vm (revision 3458)
+++ web/standard/src/main/webapp/skins/albatross/delete.vm (working copy)
@@ -9,5 +9,15 @@
#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)
+ #if ($links.size() > 0)
+ #warning ($msg.get("backlistwarningdelete"))
+ #foreach($docname in $links)
+ #set($rdoc = $xwiki.getDocument($docname).getTranslatedDocument())
+ $rdoc.displayTitle
+ #end
+#end
+
#template("endpage.vm")
Index: web/exo/src/main/webapp/WEB-INF/xwiki.cfg
===================================================================
--- web/exo/src/main/webapp/WEB-INF/xwiki.cfg (revision 3458)
+++ web/exo/src/main/webapp/WEB-INF/xwiki.cfg (working copy)
@@ -61,7 +61,7 @@
xwiki.encoding=ISO-8859-1
xwiki.render.macromapping=1
-xwiki.backlinks=0
+xwiki.backlinks=1
xwiki.tags=1
# GraphViz plugin configuration. The GraphViz plugin is not configured by default.