merge

trytond/ir/de_DE.csv

@@ -121,7 +121,6 @@ field,"ir.cron,rec_name",0,Name,Name,0
 field,"ir.cron,request_user",0,Request User,Fehlermeldung an,0
 field,"ir.cron,running",0,Running,Wird zur Zeit ausgeführt,0
 field,"ir.cron,user",0,Execution User,Benutzer,0
-field,"ir.date,rec_name",0,Name,Name,0
 field,"ir.default,clause",0,Clause,Klausel,0
 field,"ir.default,field",0,Field,Feld,0
 field,"ir.default,model",0,Model,Modell,0
@@ -533,7 +532,6 @@ selection,"ir.ui.menu,icon",0,tryton-users,tryton-users,0
 selection,"ir.ui.menu,icon",0,tryton-web-browser,tryton-web-browser,0
 selection,"ir.ui.view,type",0,,,0
 selection,"ir.ui.view,type",0,Board,Infoseite,0
-selection,"ir.ui.view,type",0,Calendar,Kalender,0
 selection,"ir.ui.view,type",0,Form,Formular,0
 selection,"ir.ui.view,type",0,Graph,Diagramm,0
 selection,"ir.ui.view,type",0,Tree,Baum,0

trytond/res/de_DE.csv

@@ -4,6 +4,21 @@ error,res.user,0,You can not have two users with the same login!,Der Name für e
 error,res.user,0,"You can not remove the root user
 as it is used internally for resources
 created by the system (updates, module installation, ...)","Der Benutzer root kann nicht gelöscht werden, da er intern für Systemverwaltungsaufgaben (Updates, Modulinstallation, ...) verwendet wird",0
+field,"ir.action-res.group,action_id",0,Action,Aktion,0
+field,"ir.action-res.group,gid",0,Group,Gruppe,0
+field,"ir.action-res.group,rec_name",0,Name,Name,0
+field,"ir.model.field-res.group,field_id",0,Model Field,Modell Feld,0
+field,"ir.model.field-res.group,group_id",0,Group,Gruppe,0
+field,"ir.model.field-res.group,rec_name",0,Name,Name,0
+field,"ir.rule.group-res.group,group_id",0,Group,Gruppe,0
+field,"ir.rule.group-res.group,rec_name",0,Name,Name,0
+field,"ir.rule.group-res.group,rule_group_id",0,Rule Group,Regel Gruppe,0
+field,"ir.rule.group-res.user,rec_name",0,Name,Name,0
+field,"ir.rule.group-res.user,rule_group_id",0,Rule Group,Regel Gruppe,0
+field,"ir.rule.group-res.user,user_id",0,User,Benutzer,0
+field,"ir.ui.menu-res.group,gid",0,Group,Gruppe,0
+field,"ir.ui.menu-res.group,menu_id",0,Menu,Menü,0
+field,"ir.ui.menu-res.group,rec_name",0,Name,Name,0
 field,"res.group,create_date",0,Creation date,Erstellungsdatum,0
 field,"res.group,create_uid",0,Creation user,Ersteller,0
 field,"res.group,id",0,ID,ID,0
@@ -75,6 +90,9 @@ field,"res.user,menu",0,Menu Action,Menüaktion,0
 field,"res.user,name",0,Name,Name,0
 field,"res.user,password",0,Password,Passwort,0
 field,"res.user,rec_name",0,Name,Name,0
+field,"res.user-res.group,gid",0,Group,Gruppe,0
+field,"res.user-res.group,rec_name",0,Name,Name,0
+field,"res.user-res.group,uid",0,User,Benutzer,0
 field,"res.user,rule_groups",0,Rules,Rollen,0
 field,"res.user,signature",0,Signature,Signatur,0
 field,"res.user,status_bar",0,Status Bar,Status Anzeige,0
@@ -90,11 +108,16 @@ model,"ir.action,name",act_group_form,Groups,Gruppen,0
 model,"ir.action,name",act_request_link_form,Request Links,Anfrageverknüpfungen,0
 model,"ir.action,name",act_request_form,Requests,Anfragen,0
 model,"ir.action,name",act_user_form,Users,Benutzer,0
+model,"ir.action-res.group,name",0,ir.action-res.group,ir.action-res.group,0
+model,"ir.model.field-res.group,name",0,ir.model.field-res.group,ir.model.field-res.group,0
+model,"ir.rule.group-res.group,name",0,ir.rule.group-res.group,ir.rule.group-res.group,0
+model,"ir.rule.group-res.user,name",0,ir.rule.group-res.user,ir.rule.group-res.user,0
 model,"ir.ui.menu,name",menu_group_form,Groups,Gruppen,0
 model,"ir.ui.menu,name",menu_request_link_form,Request Links,Anfrageverknüpfungen,0
 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,ir.ui.menu-res.group,ir.ui.menu-res.group,0
 model,"res.group,name",group_admin,Administration,Administration Intern,0
 model,"res.group,name",0,Group,Gruppe,0
 model,"res.request.history,name",0,Request history,Bisherige Anfragen,0
@@ -105,6 +128,7 @@ model,"res.request.reference,name",0,Request Reference,Anfrage Verweis,0
 model,"res.user.config.init,name",0,User Config Init,Benutzerkonfiguration Init,0
 model,"res.user,name",user_admin,Administrator,Administrator,0
 model,"res.user,name",0,User,Benutzer,0
+model,"res.user-res.group,name",0,res.user-res.group,res.user-res.group,0
 model,"res.user.warning,name",0,User Warning,Benutzer Warnung,0
 selection,"res.request.history,priority",0,High,Hoch,0
 selection,"res.request.history,priority",0,Low,Niedrig,0

trytond/workflow/de_DE.csv

@@ -37,6 +37,9 @@ field,"workflow.transition,rec_name",0,Name,Name,0
 field,"workflow.transition,signal",0,Signal (button Name),Signal (Name des Knopfes),0
 field,"workflow.transition,trigger_expr_id",0,Trigger Expr ID,ID des Auslöseausdrucks,0
 field,"workflow.transition,trigger_model",0,Trigger Type,Typ Auslöser,0
+field,"workflow.transition-workflow.instance,inst_id",0,Instance,Instanz,0
+field,"workflow.transition-workflow.instance,rec_name",0,Name,Name,0
+field,"workflow.transition-workflow.instance,trans_id",0,Transition,Übergang,0
 field,"workflow.trigger,instance",0,Destination Instance,Bestimmungsinstanz,0
 field,"workflow.trigger,model",0,Model,Modell,0
 field,"workflow.trigger,rec_name",0,Name,Name,0
@@ -62,6 +65,7 @@ model,"workflow.activity,name",0,Workflow activity,Workflow Aktivität,0
 model,"workflow.instance,name",0,Workflow instance,Workflow Instanz,0
 model,"workflow,name",0,Workflow,Workflow,0
 model,"workflow.transition,name",0,Workflow transition,Workflow Übergang,0
+model,"workflow.transition-workflow.instance,name",0,workflow.transition-workflow.instance,workflow.transition-workflow.instance,0
 model,"workflow.trigger,name",0,Workflow trigger,Workflow Trigger,0
 model,"workflow.workitem,name",0,Workflow workitem,Workflow Element,0
 selection,"workflow.activity,join_mode",0,And,Und,0