diff --git a/dictionaries/en.dictionary.itop.core.php b/dictionaries/en.dictionary.itop.core.php index b4c473a8d..9326771a7 100644 --- a/dictionaries/en.dictionary.itop.core.php +++ b/dictionaries/en.dictionary.itop.core.php @@ -521,32 +521,48 @@ Dict::Add('EN US', 'English', 'English', array( Dict::Add('EN US', 'English', 'English', array( 'Class:ActionEmail' => 'Email notification', 'Class:ActionEmail+' => '', - 'Class:ActionEmail/Attribute:status+' => 'This status drives who will be notified: just the Test recipient, all (To, cc and Bcc) or no-one', + 'Class:ActionEmail/Attribute:status+' => 'This status drives who will be notified: +- Being tested: just the Test recipient, +- In production: all (To, cc and Bcc) +- Inactive: no-one', 'Class:ActionEmail/Attribute:status/Value:test+' => 'Only the Test recipient is notified', 'Class:ActionEmail/Attribute:status/Value:enabled+' => 'All To, Cc and Bcc emails are notified', 'Class:ActionEmail/Attribute:status/Value:disabled+' => 'The email notification will not be sent', 'Class:ActionEmail/Attribute:test_recipient' => 'Test recipient', - 'Class:ActionEmail/Attribute:test_recipient+' => 'Destination email used when notification is being tested', + 'Class:ActionEmail/Attribute:test_recipient+' => 'Destination email address used instead of To, Cc and Bcc when notification is being tested', 'Class:ActionEmail/Attribute:from' => 'From (email)', - 'Class:ActionEmail/Attribute:from+' => 'Sender email address will be sent into the email header', + 'Class:ActionEmail/Attribute:from+' => 'Either a static email address or a placeholder like $this->agent_id->email$. +The latest may not be accepted by some email servers.', 'Class:ActionEmail/Attribute:from_label' => 'From (label)', - 'Class:ActionEmail/Attribute:from_label+' => 'Sender display name will be sent into the email header', + 'Class:ActionEmail/Attribute:from_label+' => 'Either a static label or a placeholder like $this->agent_id->friendlyname$', 'Class:ActionEmail/Attribute:reply_to' => 'Reply to (email)', - 'Class:ActionEmail/Attribute:reply_to+' => 'Reply to email address will be sent into the email header', + 'Class:ActionEmail/Attribute:reply_to+' => 'Either a static email address or a placeholder like $this->team_id->email$. +If omitted the From (email) is used.', 'Class:ActionEmail/Attribute:reply_to_label' => 'Reply to (label)', - 'Class:ActionEmail/Attribute:reply_to_label+' => 'Reply to display name will be sent into the email header', + 'Class:ActionEmail/Attribute:reply_to_label+' => 'Either a static label or a placeholder like $this->team_id->friendlyname$. +If omitted the From (label) is used.', 'Class:ActionEmail/Attribute:to' => 'To', - 'Class:ActionEmail/Attribute:to+' => 'Destination of the email', + 'Class:ActionEmail/Attribute:to+' => 'To: an OQL query returning objects having an email field. +While editing, click on the magnifier to get pertinent examples', 'Class:ActionEmail/Attribute:cc' => 'Cc', - 'Class:ActionEmail/Attribute:cc+' => 'Carbon Copy', + 'Class:ActionEmail/Attribute:cc+' => 'Carbon Copy: an OQL query returning objects having an email field. +While editing, click on the magnifier to get pertinent examples', 'Class:ActionEmail/Attribute:bcc' => 'Bcc', - 'Class:ActionEmail/Attribute:bcc+' => 'Blind Carbon Copy', + 'Class:ActionEmail/Attribute:bcc+' => 'Blind Carbon Copy: an OQL query returning objects having an email field. +While editing, click on the magnifier to get pertinent examples', 'Class:ActionEmail/Attribute:subject' => 'Subject', - 'Class:ActionEmail/Attribute:subject+' => 'Title of the email', + 'Class:ActionEmail/Attribute:subject+' => 'Title of the email. Can contain placeholders like $this->attribute_code$', 'Class:ActionEmail/Attribute:body' => 'Body', - 'Class:ActionEmail/Attribute:body+' => 'Contents of the email', + 'Class:ActionEmail/Attribute:body+' => 'Contents of the email. Can contain placeholders like: +- $this->attribute_code$ any attribute of the object triggering the notification, +- $this->html(attribute_code)$ same as above but displayed in html format, +- $this->hyperlink()$ hyperlink in the console to the object triggering the notification, +- $this->hyperlink(portal)$ hyperlink in the portal to the object triggering the notification, +- $this->head_html(case_log_attribute)$ last reply in html format of a caselog attribute, +- $this->attribute_external_key->attribute$ recursive syntax for any remote attribute, +- $current_contact->attribute$ attribute of the Person who triggered the notification', 'Class:ActionEmail/Attribute:importance' => 'importance', - 'Class:ActionEmail/Attribute:importance+' => 'Importance flag', + 'Class:ActionEmail/Attribute:importance+' => 'Importance flag set on the generated email', 'Class:ActionEmail/Attribute:importance/Value:low' => 'Low', 'Class:ActionEmail/Attribute:importance/Value:low+' => '', 'Class:ActionEmail/Attribute:importance/Value:normal' => 'Normal', diff --git a/dictionaries/fr.dictionary.itop.core.php b/dictionaries/fr.dictionary.itop.core.php index bdb7120e8..573c6d5ea 100644 --- a/dictionaries/fr.dictionary.itop.core.php +++ b/dictionaries/fr.dictionary.itop.core.php @@ -481,25 +481,25 @@ Dict::Add('FR FR', 'French', 'Français', array( // Dict::Add('FR FR', 'French', 'Français', array( - 'Class:Action' => 'Action', - 'Class:Action+' => 'Action spécifique', - 'Class:Action/Attribute:name' => 'Nom', - 'Class:Action/Attribute:name+' => 'Label', - 'Class:Action/Attribute:description' => 'Description', - 'Class:Action/Attribute:description+' => '', - 'Class:Action/Attribute:status' => 'Etat', - 'Class:Action/Attribute:status+' => '', - 'Class:Action/Attribute:status/Value:test' => 'En test', - 'Class:Action/Attribute:status/Value:test+' => '', - 'Class:Action/Attribute:status/Value:enabled' => 'En production', - 'Class:Action/Attribute:status/Value:enabled+' => '', - 'Class:Action/Attribute:status/Value:disabled' => 'Inactive', + 'Class:Action' => 'Action', + 'Class:Action+' => 'Action spécifique', + 'Class:Action/Attribute:name' => 'Nom', + 'Class:Action/Attribute:name+' => 'Label', + 'Class:Action/Attribute:description' => 'Description', + 'Class:Action/Attribute:description+' => '', + 'Class:Action/Attribute:status' => 'Etat', + 'Class:Action/Attribute:status+' => '', + 'Class:Action/Attribute:status/Value:test' => 'En test', + 'Class:Action/Attribute:status/Value:test+' => '', + 'Class:Action/Attribute:status/Value:enabled' => 'En production', + 'Class:Action/Attribute:status/Value:enabled+' => '', + 'Class:Action/Attribute:status/Value:disabled' => 'Inactive', 'Class:Action/Attribute:status/Value:disabled+' => '', - 'Class:Action/Attribute:trigger_list' => 'Déclencheurs liés', - 'Class:Action/Attribute:trigger_list+' => 'Déclencheurs liés à cette action', - 'Class:Action/Attribute:finalclass' => 'Sous-classe d\'Action', - 'Class:Action/Attribute:finalclass+' => 'Nom de la classe instanciable', - 'Action:WarningNoTriggerLinked' => 'Attention, aucun déclencheur n\'est associé à l\'action. Elle ne sera pas active tant qu\'elle n\'en aura pas au moins 1.', + 'Class:Action/Attribute:trigger_list' => 'Déclencheurs liés', + 'Class:Action/Attribute:trigger_list+' => 'Déclencheurs à l\'origine de cette action', + 'Class:Action/Attribute:finalclass' => 'Sous-classe d\'Action', + 'Class:Action/Attribute:finalclass+' => 'Nom de la classe instanciable', + 'Action:WarningNoTriggerLinked' => 'Attention, aucun déclencheur n\'est associé à l\'action. Elle ne sera pas active tant qu\'elle n\'en aura pas au moins 1.', )); // @@ -518,32 +518,51 @@ Dict::Add('FR FR', 'French', 'Français', array( Dict::Add('FR FR', 'French', 'Français', array( 'Class:ActionEmail' => 'Notification par mél', 'Class:ActionEmail+' => '', - 'Class:ActionEmail/Attribute:status+' => 'Cet état définit qui va être notifié: le \'Destinataire de test\', tous les destinataires (A, Copie and Copie Cachée) ou personne', + 'Class:ActionEmail/Attribute:status+' => 'Cet état définit qui va être notifié: +- En test : le Destinataire de test uniquement, +- En production : tous les destinataires (A, Copie and Copie Cachée), +- Inactive : personne.', 'Class:ActionEmail/Attribute:status/Value:test+' => 'Seul le destinataire de test est notifié ', 'Class:ActionEmail/Attribute:status/Value:enabled+' => 'Tous les destinataires (A, Copie and Copie Cachée) sont notifiés', 'Class:ActionEmail/Attribute:status/Value:disabled+' => 'La notification n\'est pas envoyée', 'Class:ActionEmail/Attribute:test_recipient' => 'Destinataire de test', - 'Class:ActionEmail/Attribute:test_recipient+' => '', + 'Class:ActionEmail/Attribute:test_recipient+' => 'Adresse mél utilisé en remplacement des A, Copie et Copie Cachée, lorsque la notification est \'En test\'', 'Class:ActionEmail/Attribute:from' => 'De (mél)', - 'Class:ActionEmail/Attribute:from+' => 'Adresse mél qui sera affichés en expéditeur de la notification', + 'Class:ActionEmail/Attribute:from+' => 'Soit une adresse mél en clair, soit un mot clé comme $this->agent_id->email$. +Ce dernier pourrait ne pas être accepté par certains serveurs de mél.', 'Class:ActionEmail/Attribute:from_label' => 'De (libellé)', - 'Class:ActionEmail/Attribute:from_label+' => 'Le nom de l\'expéditeur sera inclus dans l\'entête du mél', + 'Class:ActionEmail/Attribute:from_label+' => 'Le nom de l\'expéditeur en dur ou un mot clé comme $this->agent_id->friendlyname$. +Il sera inclus dans l\'entête du mél', 'Class:ActionEmail/Attribute:reply_to' => 'Répondre à (mél)', - 'Class:ActionEmail/Attribute:reply_to+' => 'Adresse mèl qui sera affichée dans le répondre à de la notification', + 'Class:ActionEmail/Attribute:reply_to+' => 'Adresse mèl en clair ou un mot clé comme $this->team_id->email$. +Il sera affichée dans le \'répondre à\' de la notification. +Si ce champ n\'est pas rempli, la valeur de \'De (mél)\' sera utilisée', 'Class:ActionEmail/Attribute:reply_to_label' => 'Répondre à (libellé)', - 'Class:ActionEmail/Attribute:reply_to_label+' => 'Le nom du destinataire en cas de réponse sera inclus dans l\'entête du mél.', + 'Class:ActionEmail/Attribute:reply_to_label+' => 'Le nom du destinataire en dur ou un mot clé comme $this->agent_id->friendlyname$. +En cas de réponse, il sera inclus dans l\'entête du mél. +Si ce champ n\'est pas rempli, la valeur de \'De (libellé)\' sera utilisée', 'Class:ActionEmail/Attribute:to' => 'A', - 'Class:ActionEmail/Attribute:to+' => '', + 'Class:ActionEmail/Attribute:to+' => 'A: une requête OQL retournant des objets ayant un attribut mél. +En édition, cliquez sur la loupe pour obtenir des exemples pertinents.', 'Class:ActionEmail/Attribute:cc' => 'Copie', - 'Class:ActionEmail/Attribute:cc+' => '', + 'Class:ActionEmail/Attribute:cc+' => 'Copie: une requête OQL retournant des objets ayant un attribut mél. +En édition, cliquez sur la loupe pour obtenir des exemples pertinents.', 'Class:ActionEmail/Attribute:bcc' => 'Copie Cachée', - 'Class:ActionEmail/Attribute:bcc+' => '', + 'Class:ActionEmail/Attribute:bcc+' => 'Copie Cachée: une requête OQL retournant des objets ayant un attribut mél. +En édition, cliquez sur la loupe pour obtenir des exemples pertinents.', 'Class:ActionEmail/Attribute:subject' => 'Sujet', - 'Class:ActionEmail/Attribute:subject+' => '', + 'Class:ActionEmail/Attribute:subject+' => 'Sujet du mél. Peut contenir des mots-clés comme $this->attribute_code$', 'Class:ActionEmail/Attribute:body' => 'Message', - 'Class:ActionEmail/Attribute:body+' => '', + 'Class:ActionEmail/Attribute:body+' => 'Contenu du mél. Peut contenir des mots-clés: +- $this->attribute_code$ un attribut de l\'objet qui a déclenché la notification, +- $this->html(attribute_code)$ idem mais affiché en html au lieu de texte simple, +- $this->hyperlink()$ hyperlien vers l\'objet déclencheur dans la console, +- $this->hyperlink(portal)$ hyperlien vers l\'objet déclencheur dans le portail utilisateur, +- $this->head_html(case_log_attribute)$ dernière réponse en format html d\'un journal, +- $this->attribute_external_key->attribute$ syntaxe récursive pour afficher un attribut distant, +- $current_contact->attribute$ attribut de la Personne qui a déclenché la notification', 'Class:ActionEmail/Attribute:importance' => 'Importance', - 'Class:ActionEmail/Attribute:importance+' => '', + 'Class:ActionEmail/Attribute:importance+' => 'Sera mis en propriété du mél envoyé', 'Class:ActionEmail/Attribute:importance/Value:low' => 'Basse', 'Class:ActionEmail/Attribute:importance/Value:low+' => '', 'Class:ActionEmail/Attribute:importance/Value:normal' => 'Normale',