Merge.

doc/ref/models/fields.rst

@@ -89,6 +89,8 @@ This method must return a dictionary with the values of fields to be updated.
 
 The set of field names could be filled by using the decorator :meth:`depends`.
 
+.. _ref-models-fields-on_change_with:
+
 ``on_change_with``
 ------------------
 

doc/topics/modules/index.rst

@@ -111,6 +111,7 @@ Here is the list of the tags:
 
     * ``data``: Define a set of data inside the file. It can have the
       attributes:
+
         * ``noupdate`` to prevent the framework to update the records,
         * ``skiptest`` to prevent import of data when running tests,
         * ``depends`` to import data only if all modules in the comma separated

trytond/ir/locale/fr_FR.po

@@ -20,25 +20,35 @@ msgstr ""
 
 msgctxt "error:delete_xml_record:"
 msgid "You are not allowed to delete this record."
-msgstr "Vous n'êtes pas authorisé à supprimer cet enregistrement"
+msgstr "Vous n'êtes pas autorisé à supprimer cet enregistrement"
 
 msgctxt "error:digits_validation_record:"
-msgid "The field \"%s\" on \"%s\" has too many decimal digits."
-msgstr "Le champ \"%s\" de \"%s\" à trop de décimales."
+msgid ""
+"The number of digits \"%(digits)s\" of field \"%(field)s\" on \"%(value)s\" "
+"exceeds it's limit."
+msgstr ""
+"Le nombre de décimales \"%(digits)s\" du champ \"%(field)s\" dépasse sa "
+"limite."
 
 msgctxt "error:domain_validation_record:"
-msgid "The value of the field \"%s\" on \"%s\" is not valid according to its domain."
-msgstr "La valeur du champ \"%s\" de \"%s\" n'est pas valide suivant son domaine."
+msgid ""
+"The value of the field \"%(field)s\" on \"%(model)s\" is not valid according"
+" to its domain."
+msgstr ""
+"La valeur du champ \"%(field)s\" sur \"%(model)s\" n'est pas valide selon "
+"son domaine."
 
 msgctxt "error:foreign_model_exist:"
-msgid "Could not delete \"%s\" records because they are used on field \"%s\" of \"%s\"."
+msgid ""
+"Could not delete the records because they are used on field \"%(field)s\" of"
+" \"%(model)s\"."
 msgstr ""
-"Impossible de supprimer les enregistrements \"%s\" car ils sont utilisé dans"
-" le champ \"%s\" de \"%s\"."
+"Impossible de supprimer les enregistrements car ils sont utilisés dans le "
+"champ \"%(field)s\" de \"%(model)s\"."
 
 msgctxt "error:foreign_model_missing:"
-msgid "The value of field \"%s\" on \"%s\" doesn't exist."
-msgstr "La valeur du champ \"%s\" de \"%s\" est absente."
+msgid "The value \"%(value)s\" of field \"%(field)s\" on \"%(model)s\" doesn't exist."
+msgstr "La valeur \"%(value)s\" du champ \"%(field)s\" sur \"%(model)s\" n'existe pas."
 
 msgctxt "error:ir.action.act_window:"
 msgid "Invalid context \"%(context)s\" on action \"%(action)s\"."
@@ -266,10 +276,6 @@ msgctxt "error:ir.ui.view:"
 msgid "Invalid XML for view \"%s\"."
 msgstr "XML invalide sur la vue \"%s\"."
 
-msgctxt "error:not_found_in_selection:"
-msgid "Key %r not found in selection field %r"
-msgstr "Clé %r non trouvée dans la sélection %r"
-
 msgctxt "error:read_error:"
 msgid ""
 "You try to read records that don't exist anymore!\n"
@@ -303,32 +309,36 @@ msgid "Relation not found: %r in %s"
 msgstr "Relation non trouvée : %r dans %r"
 
 msgctxt "error:required_field:"
-msgid "The field \"%s\" on \"%s\" is required."
-msgstr "Le champ \"%s\" de \"%s\" est requis."
+msgid "The field \"%(field)s\" on \"%(model)s\" is required."
+msgstr "Le champ \"%(field)s\" sur \"%(model)s\" est requis."
 
 msgctxt "error:required_validation_record:"
-msgid "The field \"%s\" on \"%s\" is required."
-msgstr "Le champ \"%s\" de \"%s\" est requis."
+msgid "The field \"%(field)s\" on \"%(model)s\" is required."
+msgstr "Le champ \"%(field)s\" sur \"%(model)s\" est requis."
 
 msgctxt "error:search_function_missing:"
 msgid "Missing search function on field \"%s\"."
 msgstr "Fonction de recherche absente pour le champ \"%s\"."
 
 msgctxt "error:selection_validation_record:"
-msgid "The field \"%s\" on \"%s\" is not in the selection."
-msgstr "Le champ \"%s\" sur \"%s\" n'est pas dans la sélection."
+msgid ""
+"The value \"%(value)s\" of field \"%(field)s\" on \"%(model)s\" is not in "
+"the selection."
+msgstr ""
+"La valeur \"%(value)s\" du champ \"%(field)s\" sur \"%(model)s\" n'est pas "
+"dans la sélection."
 
 msgctxt "error:selection_value_notfound:"
 msgid "Value not in the selection for field \"%s\"."
 msgstr "Valeur absente de la sélection pour le champ \"%s\"."
 
 msgctxt "error:size_validation_record:"
-msgid "The field \"%s\" on \"%s\" is too long."
-msgstr "Le champ \"%s\" de \"%s\" est trop long"
+msgid "The size \"%(size)s\" of the field \"%(field)s\" on \"%(model)s\" is too long."
+msgstr "La taille \"%(size)s\" du champ \"%(field)s\" sur \"%(model)s\" est trop longue."
 
 msgctxt "error:time_format_validation_record:"
-msgid "The time value of field \"%s\" on \"%s\" is not valid."
-msgstr "La valeur de type temps du champ \"%s\" de \"%s\" n'est pas valide"
+msgid "The time value \"%(value)s\" of field \"%(field)s\" on \"%(model)s\" is not valid."
+msgstr "L'heure \"%(value)s\" du champ \"%(field)s\" sur \"%(model)s\" n'est pas valide."
 
 msgctxt "error:too_many_relations_found:"
 msgid "Too many relations found: %r in %s"
@@ -430,10 +440,6 @@ msgctxt "field:ir.action.act_window,active:"
 msgid "Active"
 msgstr "Actif"
 
-msgctxt "field:ir.action.act_window,auto_refresh:"
-msgid "Auto-Refresh"
-msgstr "Auto-rafraîchissement"
-
 msgctxt "field:ir.action.act_window,context:"
 msgid "Context Value"
 msgstr "Valeur du contexte"
@@ -730,6 +736,10 @@ msgctxt "field:ir.action.report,report_content_custom:"
 msgid "Content"
 msgstr "Contenu"
 
+msgctxt "field:ir.action.report,report_content_name:"
+msgid "Content Name"
+msgstr "Nom du contenu"
+
 msgctxt "field:ir.action.report,report_name:"
 msgid "Internal Name"
 msgstr "Nom interne"
@@ -1590,6 +1600,10 @@ msgctxt "field:ir.module.module,write_uid:"
 msgid "Write User"
 msgstr "Mis à jour par"
 
+msgctxt "field:ir.module.module.config_wizard.done,id:"
+msgid "ID"
+msgstr "ID"
+
 msgctxt "field:ir.module.module.config_wizard.first,id:"
 msgid "ID"
 msgstr "ID"
@@ -2618,10 +2632,6 @@ msgctxt "field:ir.ui.view_tree_width,write_uid:"
 msgid "Write User"
 msgstr "Mis à jour par"
 
-msgctxt "help:ir.action.act_window,auto_refresh:"
-msgid "Add an auto-refresh on the view"
-msgstr "Ajoute un auto-rafraîchissement sur la vue"
-
 msgctxt "help:ir.action.act_window,limit:"
 msgid "Default limit for the list view"
 msgstr "Limite par défaut pour la vue liste"
@@ -3061,6 +3071,10 @@ msgctxt "model:ir.module.module,name:"
 msgid "Module"
 msgstr "Module"
 
+msgctxt "model:ir.module.module.config_wizard.done,name:"
+msgid "Module Config Wizard Done"
+msgstr "Assistant de configuration de module - Fin"
+
 msgctxt "model:ir.module.module.config_wizard.first,name:"
 msgid "Module Config Wizard First"
 msgstr "Assistant de configuration de module - Première"
@@ -3713,6 +3727,14 @@ msgctxt "view:ir.model:"
 msgid "Model Description"
 msgstr "Description de modèle"
 
+msgctxt "view:ir.module.module.config_wizard.done:"
+msgid "Module configuration"
+msgstr "Configuration de module"
+
+msgctxt "view:ir.module.module.config_wizard.done:"
+msgid "The configuration is done."
+msgstr "La configuration est faite."
+
 msgctxt "view:ir.module.module.config_wizard.first:"
 msgid "Welcome to the module configuration wizard!"
 msgstr "Bienvenu dans l'assistant de configuration de module !"
@@ -4012,6 +4034,10 @@ msgctxt "wizard_button:ir.model.print_model_graph,start,print_:"
 msgid "Print"
 msgstr "Imprimer"
 
+msgctxt "wizard_button:ir.module.module.config_wizard,done,end:"
+msgid "Ok"
+msgstr "Ok"
+
 msgctxt "wizard_button:ir.module.module.config_wizard,first,action:"
 msgid "Ok"
 msgstr "Ok"

trytond/res/locale/fr_FR.po

@@ -364,6 +364,10 @@ msgctxt "field:res.user,password:"
 msgid "Password"
 msgstr "Mot de passe"
 
+msgctxt "field:res.user,password_hash:"
+msgid "Password Hash"
+msgstr "Hachage de mot de passe"
+
 msgctxt "field:res.user,pyson_menu:"
 msgid "PySON Menu"
 msgstr "Menu PySON"
@@ -376,10 +380,6 @@ msgctxt "field:res.user,rule_groups:"
 msgid "Rules"
 msgstr "Règles"
 
-msgctxt "field:res.user,salt:"
-msgid "Salt"
-msgstr "Sel"
-
 msgctxt "field:res.user,sessions:"
 msgid "Sessions"
 msgstr "Sessions"
@@ -392,10 +392,6 @@ msgctxt "field:res.user,status_bar:"
 msgid "Status Bar"
 msgstr "Barre d'état"
 
-msgctxt "field:res.user,timezone:"
-msgid "Timezone"
-msgstr "Fuseau horaire"
-
 msgctxt "field:res.user,warnings:"
 msgid "Warnings"
 msgstr "Avertissements"