Merge from trunk

trytond/ir/de_DE.csv

@@ -634,7 +634,7 @@ view,ir.module.module.install_upgrade.start,0,You may have to reinstall some lan
 view,ir.property,0,Properties,Eigenschaften,0
 view,ir.property,0,Property,Eigenschaft,0
 view,ir.rule,0,Test,Test,0
-view,ir.rule.group,0,"If there is no test defined, the rule is always satified if not global","Wenn kein Test festgelegt wird, wird die Regel immer als gültig bewertet (außer global)",0
+view,ir.rule.group,0,"If there is no test defined, the rule is always satisfied if not global","Wenn kein Test festgelegt wird, wird die Regel immer als gültig bewertet (außer global)",0
 view,ir.rule.group,0,Record rules,Datensatzregeln,0
 view,ir.rule.group,0,The rule is satisfied if at least one test is True,"Die Regel wird als gültig bewertet, wenn wenigstens ein Test positiv ist (True)",0
 view,ir.sequence,0,${day},${day},0

trytond/ir/es_CO.csv

@@ -609,7 +609,7 @@ view,ir.module.module.install_upgrade.start,0,You may have to reinstall some lan
 view,ir.property,0,Properties,Propiedades,0
 view,ir.property,0,Property,Propiedad,0
 view,ir.rule,0,Test,Prueba,0
-view,ir.rule.group,0,"If there is no test defined, the rule is always satified if not global","Si no hay prueba definida, la regla se aplica siempre que no sea global",0
+view,ir.rule.group,0,"If there is no test defined, the rule is always satisfied if not global","Si no hay prueba definida, la regla se aplica siempre que no sea global",0
 view,ir.rule.group,0,Record rules,Grabar Reglas,0
 view,ir.rule.group,0,The rule is satisfied if at least one test is True,La regla se satisface si por lo menos una condición es Verdadera,0
 view,ir.sequence,0,${day},${day},0

trytond/ir/es_ES.csv

@@ -627,7 +627,7 @@ view,ir.module.module.install_upgrade.start,0,You may have to reinstall some lan
 view,ir.property,0,Properties,Propiedades,0
 view,ir.property,0,Property,Propiedad,0
 view,ir.rule,0,Test,Prueba,0
-view,ir.rule.group,0,"If there is no test defined, the rule is always satified if not global","Si no hay ninguna prueba definida, la regla se aplica siempre que no sea global",0
+view,ir.rule.group,0,"If there is no test defined, the rule is always satisfied if not global","Si no hay ninguna prueba definida, la regla se aplica siempre que no sea global",0
 view,ir.rule.group,0,Record rules,Grabar reglas,0
 view,ir.rule.group,0,The rule is satisfied if at least one test is True,La regla se satisface si por lo menos una condición es verdadera,0
 view,ir.sequence,0,${day},${day},0

trytond/ir/fr_FR.csv

@@ -632,7 +632,7 @@ view,ir.module.module.install_upgrade.start,0,You may have to reinstall some lan
 view,ir.property,0,Properties,Propriétés,0
 view,ir.property,0,Property,Propriété,0
 view,ir.rule,0,Test,Test,0
-view,ir.rule.group,0,"If there is no test defined, the rule is always satified if not global","Si il n'y a pas de test définit, la règle est toujours satisfaite s'il est n'est pas globale",0
+view,ir.rule.group,0,"If there is no test defined, the rule is always satisfied if not global","Si il n'y a pas de test définit, la règle est toujours satisfaite s'il est n'est pas globale",0
 view,ir.rule.group,0,Record rules,Règles d'enregistrement,0
 view,ir.rule.group,0,The rule is satisfied if at least one test is True,La règle est satisfaite si au moins un test est vrai,0
 view,ir.sequence,0,${day},,0

trytond/ir/rule.xml

@@ -30,7 +30,7 @@ this repository contains the full copyright notices and license terms. -->
                     <field name="rules" colspan="6"/>
                     <label string="The rule is satisfied if at least one test is True"
                         colspan="6" align="0.0" id="satisfied"/>
-                    <label string="If there is no test defined, the rule is always satified if not global"
+                    <label string="If there is no test defined, the rule is always satisfied if not global"
                         colspan="6" align="0.0" id="no_test"/>
                 </form>
                 ]]>

trytond/res/de_DE.csv

@@ -122,7 +122,7 @@ model,"ir.ui.menu,name",menu_request_form,Requests,Anfragen,0
 model,"ir.ui.menu,name",menu_res,Users,Benutzer,0
 model,"ir.ui.menu,name",menu_user_form,Users,Benutzer,0
 model,"ir.ui.menu-res.group,name",0,UI Menu - Group,Oberfläche Menü - Gruppe,0
-model,"res.group,name",group_admin,Administration,Administration Intern,0
+model,"res.group,name",group_admin,Administration,Interne Administration,0
 model,"res.group,name",0,Group,Gruppe,0
 model,"res.request.history,name",0,Request history,Bisherige Anfragen,0
 model,"res.request.link,name",0,Request link,Anfrage Verknüpfung,0