diff --git a/htdocs/includes/triggers/interface_webcal.class.php b/htdocs/includes/triggers/interface_webcal.class.php index 5937af070ff..5788b4c21a5 100644 --- a/htdocs/includes/triggers/interface_webcal.class.php +++ b/htdocs/includes/triggers/interface_webcal.class.php @@ -17,7 +17,6 @@ * * $Id$ * $Source$ - * */ /** @@ -155,7 +154,7 @@ class InterfaceWebCal $this->desc.="\n".$langs->trans("Prefix").': '.$object->prefix; //$this->desc.="\n".$langs->trans("Customer").': '.yn($object->client); //$this->desc.="\n".$langs->trans("Supplier").': '.yn($object->fournisseur); - $this->desc.="\n".$langs->trans("CreatedBy").': '.$user->code; + $this->desc.="\n".$langs->trans("Author").': '.$user->code; } if ($action == 'CONTRACT_VALIDATE') @@ -168,7 +167,7 @@ class InterfaceWebCal $this->duree=0; $this->texte=$langs->trans("ContractValidatedInDolibarr",$object->ref); $this->desc=$langs->trans("ContractValidatedInDolibarr",$object->ref); - $this->desc.="\n".$langs->trans("ValidatedBy").': '.$user->code; + $this->desc.="\n".$langs->trans("Author").': '.$user->code; } if ($action == 'CONTRACT_CANCEL') { @@ -179,7 +178,7 @@ class InterfaceWebCal $this->duree=0; $this->texte=$langs->trans("ContractCanceledInDolibarr",$object->ref); $this->desc=$langs->trans("ContractCanceledInDolibarr",$object->ref); - $this->desc.="\n".$langs->trans("CanceledBy").': '.$user->code; + $this->desc.="\n".$langs->trans("Author").': '.$user->code; } if ($action == 'CONTRACT_CLOSE') { @@ -190,7 +189,7 @@ class InterfaceWebCal $this->duree=0; $this->texte=$langs->trans("ContractClosedInDolibarr",$object->ref); $this->desc=$langs->trans("ContractClosedInDolibarr",$object->ref); - $this->desc.="\n".$langs->trans("ClosedBy").': '.$user->code; + $this->desc.="\n".$langs->trans("Author").': '.$user->code; } if ($action == 'BILL_VALIDATE') @@ -202,7 +201,7 @@ class InterfaceWebCal $this->duree=0; $this->texte=$langs->trans("InvoiceValidatedInDolibarr",$object->ref); $this->desc=$langs->trans("InvoiceValidatedInDolibarr",$object->ref); - $this->desc.="\n".$langs->trans("ValidatedBy").': '.$user->code; + $this->desc.="\n".$langs->trans("Author").': '.$user->code; } if ($action == 'BILL_PAYED') { @@ -213,7 +212,7 @@ class InterfaceWebCal $this->duree=0; $this->texte=$langs->trans("InvoicePayedInDolibarr",$object->ref); $this->desc=$langs->trans("InvoicePayedInDolibarr",$object->ref); - $this->desc.="\n".$langs->trans("EditedBy").': '.$user->code; + $this->desc.="\n".$langs->trans("Author").': '.$user->code; } if ($action == 'BILL_CANCELED') { @@ -224,7 +223,7 @@ class InterfaceWebCal $this->duree=0; $this->texte=$langs->trans("InvoiceCanceledInDolibarr",$object->ref); $this->desc=$langs->trans("InvoiceCanceledInDolibarr",$object->ref); - $this->desc.="\n".$langs->trans("CanceledBy").': '.$user->code; + $this->desc.="\n".$langs->trans("Author").': '.$user->code; } // Ajoute entrée dans webcal diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 43797821851..8de378f6508 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -67,10 +67,6 @@ Approve=Approve Upload=Send file Select=Select Choose=Choose -CreatedBy=Created by -ModifiedBy=Modified by -ValidatedBy=Validated by -ClosedBy=Closed by ChooseLangage=Please choose your language Author=Author User=User diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index 8f194c0b37e..8723149aa69 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -39,6 +39,11 @@ ListOfBookmarks=List of bookmarks NoExportableData=No exportable data (no modules with exportable data loaded, or missing permissions) ToExport=Export NewExport=New export +CreatedBy=Created by %s +ModifiedBy=Modified by %s +ValidatedBy=Validated by %s +CanceledBy=Canceled by %s +ClosedBy=Closed by %s ##### Webcal ##### LoginWebcal=Login for Webcalendar AddCalendarEntry=Add entry in calendar diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 25df5bdaa63..52cc92645d3 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -67,10 +67,6 @@ Approve=Approuver Upload=Envoyer fichier Select=Sélectionner Choose=Choisir -CreatedBy=Créé par -ModifiedBy=Modifié par -ValidatedBy=Validé par -ClosedBy=Clôturé par ChooseLangage=Choisissez votre langue Author=Auteur User=Utilisateur diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang index 5ea8ea3245b..5e51eb2792b 100644 --- a/htdocs/langs/fr_FR/other.lang +++ b/htdocs/langs/fr_FR/other.lang @@ -39,6 +39,11 @@ ListOfBookmarks=Liste des marque-pages NoExportableData=Pas de données exportables (pas de modules avec données exportables chargés, ou manque de permissions) ToExport=Exporter NewExport=Nouvel export +CreatedBy=Créé par %s +ModifiedBy=Modifié par %s +ValidatedBy=Validé par %s +CanceledBy=Annulé par %s +ClosedBy=Cloturé par %s ##### Webcal ##### LoginWebcal=Login Webcalendar AddCalendarEntry=Ajouter entrée dans le calendrier