merge

trytond/ir/de_DE.csv

@@ -130,10 +130,10 @@ field,"ir.lang,translatable",0,Translatable,Übersetzbar,0
 field,"ir.model.access,description",0,Description,Beschreibung,0
 field,"ir.model.access,group",0,Group,Gruppe,0
 field,"ir.model.access,model",0,Model,Modell,0
-field,"ir.model.access,perm_create",0,Create Access,Berechtigung erstellen,0
-field,"ir.model.access,perm_delete",0,Delete Permission,Berechtigung löschen,0
-field,"ir.model.access,perm_read",0,Read Access,Leseberechtigung,0
-field,"ir.model.access,perm_write",0,Write Access,Schreibberechtigung,0
+field,"ir.model.access,perm_create",0,Create Access,Erstellen,0
+field,"ir.model.access,perm_delete",0,Delete Permission,Löschen,0
+field,"ir.model.access,perm_read",0,Read Access,Lesen,0
+field,"ir.model.access,perm_write",0,Write Access,Schreiben,0
 field,"ir.model.data,date_init",0,Init Date,Initialdatum,0
 field,"ir.model.data,date_update",0,Update Date,Aktualisierungsdatum,0
 field,"ir.model.data,db_id",0,Resource ID,ID Ressource,0
@@ -483,7 +483,7 @@ view,ir.lang,0,Languages,Sprachen,0
 view,ir.lang,0,Numbers Formatting,Zahlenformat,0
 view,ir.model,0,Fields Description,Feld Beschreibung,0
 view,ir.model,0,Model Description,Modell Beschreibung,0
-view,ir.model.access,0,Access controls,Zugangsberechtigungen,0
+view,ir.model.access,0,Access controls,Zugriffsberechtigungen,0
 view,ir.model.field,0,Fields,Felder,0
 view,ir.module.module,0,Cancel Installation,Installation abbrechen,0
 view,ir.module.module,0,Cancel Uninstallation,Deinstallation abbrechen,0
@@ -551,7 +551,7 @@ wizard_button,"ir.module.module.config_wizard,first,end",0,Cancel,Abbrechen,0
 wizard_button,"ir.module.module.config_wizard,first,wizard",0,Ok,OK,0
 wizard_button,"ir.module.module.install_upgrade,init,end",0,Cancel,Abbrechen,0
 wizard_button,"ir.module.module.install_upgrade,init,start",0,Start Upgrade,Aktualisierung starten,0
-wizard_button,"ir.module.module.install_upgrade,start,config",0,Ok,OK,0
+wizard_button,"ir.module.module.install_upgrade,start,menu",0,Ok,OK,0
 wizard_button,"ir.translation.clean,init,end",0,Cancel,Abbrechen,0
 wizard_button,"ir.translation.clean,init,start",0,Start,Start,0
 wizard_button,"ir.translation.clean,start,end",0,Ok,Ok,0

trytond/res/de_DE.csv

@@ -1,6 +1,6 @@
 type,name,res_id,src,value,fuzzy
 error,res.group,0,The name of the group must be unique!,Der Name der Gruppe kann nicht mehrfach vergeben werden!,0
-error,res.user,0,You can not have two users with the same login!,Der Anmeldename eines Benutzers kann nicht mehrfach vergeben werden!,0
+error,res.user,0,You can not have two users with the same login!,Der Name für einen Benutzer kann nur einmal vergeben werden!,0
 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
@@ -65,10 +65,10 @@ field,"res.user,groups",0,Groups,Gruppenzugehörigkeit,0
 field,"res.user,id",0,ID,ID,0
 field,"res.user,language",0,Language,Sprache,0
 field,"res.user,language_direction",0,Language Direction,Sprache Richtung,0
-field,"res.user,login",0,Login,Anmeldename,0
+field,"res.user,login",0,Login,Benutzername,0
 field,"res.user,menu",0,Menu Action,Menüaktion,0
 field,"res.user,name",0,Name,Name,0
-field,"res.user,password",0,Password,Kennwort,0
+field,"res.user,password",0,Password,Passwort,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
@@ -101,6 +101,12 @@ selection,"res.request,state",0,Chatting,Schreibt gerade...,0
 selection,"res.request,state",0,Closed,Geschlossen,0
 selection,"res.request,state",0,Draft,Entwurf,0
 selection,"res.request,state",0,Waiting,Wartend,0
+view,ir.module.module,0,Cancel Installation,Installation abbrechen,0
+view,ir.module.module,0,Cancel Uninstallation,Deinstallation abbrechen,0
+view,ir.module.module,0,Cancel Upgrade,Vormerkung für Installation / Aktualisierung aufheben,0
+view,ir.module.module,0,Mark for Installation,Für die Installation vormerken,0
+view,ir.module.module,0,Mark for Uninstallation (beta),Für die Deinstallation (beta) vormerken,0
+view,ir.module.module,0,Mark for Upgrade,Für die Aktualisierung vormerken,0
 view,res.group,0,Group,Gruppe,0
 view,res.group,0,Groups,Gruppen,0
 view,res.group,0,Security,Sicherheit,0
@@ -121,8 +127,8 @@ view,res.user,0,Security,Sicherheit,0
 view,res.user,0,User,Benutzer,0
 view,res.user,0,Users,Benutzer,0
 view,res.user.config.init,0,Add Users,Benutzer hinzufügen,0
-view,res.user.config.init,0,Be careful that the login must be unique!,"WICHTIG - Achten Sie darauf, dass ein Anmeldename nicht mehrfach vergeben werden kann.
-(der Anmeldename admin wird automatisch angelegt)",0
+view,res.user.config.init,0,Be careful that the login must be unique!,"WICHTIG - Achten Sie darauf, dass ein Benutzername nicht mehrfach vergeben werden kann.
+(der Benutzername admin wird automatisch angelegt)",0
 view,res.user.config.init,0,You can now add some users into the system.,Sie können nun neue Benutzer der Datenbank hinzufügen,0
 wizard_button,"res.user.config,init,end",0,Cancel,Abbrechen,0
 wizard_button,"res.user.config,init,user",0,Ok,OK,0

trytond/workflow/de_DE.csv

@@ -7,7 +7,7 @@ field,"workflow.activity,flow_start",0,Flow Start,Flow Start,0
 field,"workflow.activity,flow_stop",0,Flow Stop,Flow Stop,0
 field,"workflow.activity,in_transitions",0,Incoming transitions,Eingehende Übergänge,0
 field,"workflow.activity,join_mode",0,Join Mode,Verbindungsmodus,0
-field,"workflow.activity,kind",0,Kind,Typ,0
+field,"workflow.activity,kind",0,Kind,Art,0
 field,"workflow.activity,name",0,Name,Name,0
 field,"workflow.activity,out_transitions",0,Outgoing transitions,Ausgehende Übergänge,0
 field,"workflow.activity,signal_send",0,Signal (subflow.*),Signal (subflow.*),0