diff --git a/htdocs/includes/triggers/interface_webcal.class.php b/htdocs/includes/triggers/interface_webcal.class.php index 5937af070ff847d1a77781e60c7c27a3c3dc5a76..5788b4c21a5dd55329b0f4987f1e1f9f9b86b5d8 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 437978218518a3a230f6224450b5b6b4563eca9f..8de378f6508858a5206bdf7444f896dbfc8fdc4d 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 8f194c0b37e946fe864182e68dc0e2812e09ed29..8723149aa69fa3a57475f998e44fdf307c375fec 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 25df5bdaa630d9207cca83a062a926f4f38713e5..52cc92645d3f2b17a9f6dfe0a04681fa8dcfb995 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 5ea8ea3245b429fb3ae3f92486682a5798b3c4a4..5e51eb2792b3fc412303202f5b648379ccefda7b 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