[MERGE] Sync with trunk.

bzr revid: tde@openerp.com-20121219093924-5rqmhb6ve7bv7qzl

3 files changed, 39 insertions, 15 deletions

diff --git a/addons/document/i18n/fr.po b/addons/document/i18n/fr.po
index d21db0e04a4..d051e4f3d0c 100644
--- a/addons/document/i18n/fr.po
+++ b/addons/document/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-12-15 22:02+0000\n"
-"Last-Translator: Ludovic CHEVALIER <Unknown>\n"
+"PO-Revision-Date: 2012-12-18 18:20+0000\n"
+"Last-Translator: Nicolas JEUDY <njeudy@tuxservices.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-16 04:48+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -81,7 +81,7 @@ msgstr "Fichiers"
 #. module: document
 #: field:document.directory.content.type,mimetype:0
 msgid "Mime Type"
-msgstr "Type mime"
+msgstr "Type MIME"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -228,6 +228,15 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Cliquez pour ajouter un nouveau document.\n"
+"          </p><p>\n"
+"            L'espace documentaire vous donne accès à toutes les pièces-"
+"jointes,\n"
+"            qu'il s'agisse de courriels, de documents de projet, de "
+"factures, etc.\n"
+"          </p>\n"
+"        "
 
 #. module: document
 #: field:process.node,directory_id:0
@@ -296,7 +305,7 @@ msgstr "Type"
 #: code:addons/document/document_directory.py:234
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (copie)"
 
 #. module: document
 #: help:document.directory,ressource_type_id:0
@@ -318,7 +327,7 @@ msgstr ""
 #. module: document
 #: constraint:document.directory:0
 msgid "Error! You cannot create recursive directories."
-msgstr "Erreur! Vous ne pouvez pas créer des répertoires récursifs."
+msgstr "Erreur ! Vous ne pouvez pas créer de répertoires récursifs."
 
 #. module: document
 #: field:document.directory,resource_field:0
@@ -402,7 +411,7 @@ msgstr "Sécurité"
 #: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
-msgstr "Utilisateur de la Dernière Modification"
+msgstr "Utilisateur ayant réaliser la dernière modification"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_files_by_user_graph
@@ -413,7 +422,7 @@ msgstr "Fichiers par Utilisateur"
 #. module: document
 #: view:ir.attachment:0
 msgid "on"
-msgstr ""
+msgstr "à la date du"
 
 #. module: document
 #: field:document.directory,domain:0
@@ -884,7 +893,7 @@ msgstr ""
 #: code:addons/document/static/src/js/document.js:17
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #. module: document
 #: field:document.directory.content,sequence:0
diff --git a/addons/document/i18n/it.po b/addons/document/i18n/it.po
index df8b3006f7c..bf94b69b5d5 100644
--- a/addons/document/i18n/it.po
+++ b/addons/document/i18n/it.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-05-10 17:28+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-12-18 22:57+0000\n"
+"Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -154,6 +154,8 @@ msgid ""
 "If true, all attachments that match this resource will  be located. If "
 "false, only ones that have this as parent."
 msgstr ""
+"Se vero, tutti gli allegati che corrispondono a questa risorsa verranno "
+"collocati. Se falso, solo quelli che hanno questa come superiore."
 
 #. module: document
 #: view:document.directory:0
@@ -510,6 +512,9 @@ msgid ""
 "name.\n"
 "If set, the directory will have to be a resource one."
 msgstr ""
+"Selezionare questo campo se si desidera che il nome del file contenga il "
+"nome del record.\n"
+"Se impostata, la cartella dovrà essere una risorsa."
 
 #. module: document
 #: model:ir.actions.act_window,name:document.open_board_document_manager
@@ -558,6 +563,8 @@ msgid ""
 "Along with Parent Model, this ID attaches this folder to a specific record "
 "of Parent Model."
 msgstr ""
+"Insieme con il Modello Superiore, questo ID attribuisce questa cartella ad "
+"uno specifico record del Modello Superiore."
 
 #. module: document
 #. openerp-web
@@ -615,6 +622,10 @@ msgid ""
 "record, just like attachments. Don't put a parent directory if you select a "
 "parent model."
 msgstr ""
+"Se si inserisce un oggetto qui, questo modello di cartella apparirà sotto  "
+"tutti questi oggetti. Tali cartelle saranno \"collegate\" ad uno specifico "
+"modello o record, semplicemente come allegati. Non inserire una cartella "
+"superiore se si seleziona un modello superiore."
 
 #. module: document
 #: view:document.directory:0
@@ -712,7 +723,7 @@ msgstr "Archivio file esterno"
 #. module: document
 #: help:document.storage,path:0
 msgid "For file storage, the root path of the storage"
-msgstr ""
+msgstr "Per l'archiviazione dei file, il percorso dell'archivio"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -779,6 +790,8 @@ msgid ""
 "These groups, however, do NOT apply to children directories, which must "
 "define their own groups."
 msgstr ""
+"Questi gruppi, comunque, NON si applicano alle cartelle di livello "
+"inferiore, per le quali bisogna definire i loro gruppi."
 
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml
index cacde50c36e..a7ec76eafac 100644
--- a/addons/document/security/document_security.xml
+++ b/addons/document/security/document_security.xml
@@ -11,6 +11,8 @@
 <!--    <record id="group_document_manager" model="res.groups">-->
 <!--        <field name="name">Document / Manager</field>-->
 <!--    </record>-->
+</data>
+<data noupdate="1">
 
     <record id="ir_rule_readpublicdirectories0" model="ir.rule">
         <field name="model_id" ref="document.model_document_directory"/>