Merge remote-tracking branch 'origin/develop' into feature/b931

# Conflicts: # .idea/inspectionProfiles/Combodo.xml # application/cmdbabstract.class.inc.php # core/attributedef.class.inc.php # css/light-grey.css # css/light-grey.scss
2026-05-19 07:12:26 +02:00 · 2018-09-25 12:03:44 +02:00
parent 16476f736a 534f6b6a54
commit a94211d3d3
33 changed files with 1404 additions and 139 deletions
--- a/dictionaries/da.dictionary.itop.core.php
+++ b/dictionaries/da.dictionary.itop.core.php
@@ -36,7 +36,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:ActionEmail/Attribute:to+' => 'Modtager af emailen',
 	'Class:ActionEmail/Attribute:cc' => 'Cc',
 	'Class:ActionEmail/Attribute:cc+' => 'Kopi sendes til',
-	'Class:ActionEmail/Attribute:bcc' => 'bcc',
+	'Class:ActionEmail/Attribute:bcc' => 'Bcc',
 	'Class:ActionEmail/Attribute:bcc+' => 'Blind kopi sendes til',
 	'Class:ActionEmail/Attribute:subject' => 'Emne',
 	'Class:ActionEmail/Attribute:subject+' => 'Tekst i emne feltet',
--- a/dictionaries/da.dictionary.itop.ui.php
+++ b/dictionaries/da.dictionary.itop.ui.php
@@ -574,7 +574,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'UI:AddObjectsOf_Class_LinkedWith_Class_Instance' => 'Tilføj %1$s objekter kædet til %2$s: %3$s',
 	'UI:AddObjectsOf_Class_LinkedWith_Class' => 'Tilføj %1$s objekter til kæden til %2$s',
 	'UI:ManageObjectsOf_Class_LinkedWith_Class_Instance' => 'Administrer %1$s objekter kædet til %2$s: %3$s',
-	'UI:AddLinkedObjectsOf_Class' => 'Tilføj %1$ss...',
+	'UI:AddLinkedObjectsOf_Class' => 'Tilføj %1$s objekter...',
 	'UI:RemoveLinkedObjectsOf_Class' => 'Fjern valgte objekter',
 	'UI:Message:EmptyList:UseAdd' => 'Listen er tom, brug "Tilføj..." knappen for at tilføje elementer.',
 	'UI:Message:EmptyList:UseSearchForm' => 'Brug søgeformularen ovenfor, til søgning efter objekters som skal tilføjes.',
--- a/dictionaries/en.dictionary.itop.core.php
+++ b/dictionaries/en.dictionary.itop.core.php
@@ -495,11 +495,11 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:ActionEmail/Attribute:to+' => 'Destination of the email',
 	'Class:ActionEmail/Attribute:cc' => 'Cc',
 	'Class:ActionEmail/Attribute:cc+' => 'Carbon Copy',
-	'Class:ActionEmail/Attribute:bcc' => 'bcc',
+	'Class:ActionEmail/Attribute:bcc' => 'Bcc',
 	'Class:ActionEmail/Attribute:bcc+' => 'Blind Carbon Copy',
-	'Class:ActionEmail/Attribute:subject' => 'subject',
+	'Class:ActionEmail/Attribute:subject' => 'Subject',
 	'Class:ActionEmail/Attribute:subject+' => 'Title of the email',
-	'Class:ActionEmail/Attribute:body' => 'body',
+	'Class:ActionEmail/Attribute:body' => 'Body',
 	'Class:ActionEmail/Attribute:body+' => 'Contents of the email',
 	'Class:ActionEmail/Attribute:importance' => 'importance',
 	'Class:ActionEmail/Attribute:importance+' => 'Importance flag',
@@ -588,6 +588,17 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:TriggerOnObjectCreate+' => 'Trigger on object creation of [a child class of] the given class',
 ));

+//
+// Class: TriggerOnObjectUpdate
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:TriggerOnObjectUpdate' => 'Trigger (on object update)',
+	'Class:TriggerOnObjectUpdate+' => 'Trigger on object update of [a child class of] the given class',
+	'Class:TriggerOnObjectUpdate/Attribute:target_attcodes' => 'Target attributes',
+	'Class:TriggerOnObjectUpdate/Attribute:target_attcodes+' => '',
+));
+
 //
 // Class: TriggerOnThresholdReached
 //
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -751,7 +751,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI:AddObjectsOf_Class_LinkedWith_Class_Instance' => 'Add %1$s objects linked with %2$s: %3$s',
 	'UI:AddObjectsOf_Class_LinkedWith_Class' => 'Add %1$s objects to link with the %2$s',
 	'UI:ManageObjectsOf_Class_LinkedWith_Class_Instance' => 'Manage %1$s objects linked with %2$s: %3$s',
-	'UI:AddLinkedObjectsOf_Class' => 'Add %1$ss...',
+	'UI:AddLinkedObjectsOf_Class' => 'Add %1$s objects...',
 	'UI:RemoveLinkedObjectsOf_Class' => 'Remove selected objects',
 	'UI:Message:EmptyList:UseAdd' => 'The list is empty, use the "Add..." button to add elements.',
 	'UI:Message:EmptyList:UseSearchForm' => 'Use the search form above to search for objects to be added.',
--- a/dictionaries/fr.dictionary.itop.core.php
+++ b/dictionaries/fr.dictionary.itop.core.php
@@ -61,6 +61,10 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:TriggerOnStateLeave+' => '',
 	'Class:TriggerOnObjectCreate' => 'Déclencheur sur la création d\'un objet',
 	'Class:TriggerOnObjectCreate+' => '',
+	'Class:TriggerOnObjectUpdate' => 'Déclencheur sur la modification d\'un objet',
+	'Class:TriggerOnObjectUpdate+' => '',
+	'Class:TriggerOnObjectUpdate/Attribute:target_attcodes' => 'Attributs cible',
+	'Class:TriggerOnObjectUpdate/Attribute:target_attcodes+' => '',
 	'Class:lnkTriggerAction' => 'Actions-Déclencheur',
 	'Class:lnkTriggerAction+' => '',
 	'Class:lnkTriggerAction/Attribute:action_id' => 'Action',
--- a/dictionaries/ja.dictionary.itop.core.php
+++ b/dictionaries/ja.dictionary.itop.core.php
@@ -34,11 +34,11 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:ActionEmail/Attribute:to+' => 'メールの宛先',
 	'Class:ActionEmail/Attribute:cc' => 'Cc',
 	'Class:ActionEmail/Attribute:cc+' => 'Carbon Copy',
-	'Class:ActionEmail/Attribute:bcc' => 'bcc',
+	'Class:ActionEmail/Attribute:bcc' => 'Bcc',
 	'Class:ActionEmail/Attribute:bcc+' => 'Blind Carbon Copy',
-	'Class:ActionEmail/Attribute:subject' => 'subject',
+	'Class:ActionEmail/Attribute:subject' => 'Subject',
 	'Class:ActionEmail/Attribute:subject+' => 'メールの題名',
-	'Class:ActionEmail/Attribute:body' => 'body',
+	'Class:ActionEmail/Attribute:body' => 'Body',
 	'Class:ActionEmail/Attribute:body+' => 'メールの本文',
 	'Class:ActionEmail/Attribute:importance' => '重要度',
 	'Class:ActionEmail/Attribute:importance+' => '重要度フラグ',
--- a/dictionaries/nl.dictionary.itop.core.php
+++ b/dictionaries/nl.dictionary.itop.core.php
@@ -485,11 +485,11 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:ActionEmail/Attribute:to+' => 'Bestemming van de e-mail',
 	'Class:ActionEmail/Attribute:cc' => 'Cc',
 	'Class:ActionEmail/Attribute:cc+' => 'Carbon Copy',
-	'Class:ActionEmail/Attribute:bcc' => 'bcc',
+	'Class:ActionEmail/Attribute:bcc' => 'Bcc',
 	'Class:ActionEmail/Attribute:bcc+' => 'Blind Carbon Copy',
-	'Class:ActionEmail/Attribute:subject' => 'onderwerp',
+	'Class:ActionEmail/Attribute:subject' => 'Onderwerp',
 	'Class:ActionEmail/Attribute:subject+' => 'Titel van de e-mail',
-	'Class:ActionEmail/Attribute:body' => 'body',
+	'Class:ActionEmail/Attribute:body' => 'Body',
 	'Class:ActionEmail/Attribute:body+' => 'Inhoud van de e-mail',
 	'Class:ActionEmail/Attribute:importance' => 'Prioriteit',
 	'Class:ActionEmail/Attribute:importance+' => 'Prioriteitsvlag',
--- a/dictionaries/tr.dictionary.itop.core.php
+++ b/dictionaries/tr.dictionary.itop.core.php
@@ -302,9 +302,9 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:ActionEmail/Attribute:to+' => 'E-posta alıcısı',
 	'Class:ActionEmail/Attribute:cc' => 'Kopya',
 	'Class:ActionEmail/Attribute:cc+' => 'Kopya',
-	'Class:ActionEmail/Attribute:bcc' => 'gizli kopya',
+	'Class:ActionEmail/Attribute:bcc' => 'Gizli kopya',
 	'Class:ActionEmail/Attribute:bcc+' => 'Gizli alıcı',
-	'Class:ActionEmail/Attribute:subject' => 'konu',
+	'Class:ActionEmail/Attribute:subject' => 'Konu',
 	'Class:ActionEmail/Attribute:subject+' => 'E-posta konusu',
 	'Class:ActionEmail/Attribute:body' => 'E-posta içeriği',
 	'Class:ActionEmail/Attribute:body+' => 'E-posta içeriği',
--- a/dictionaries/zh.dictionary.itop.core.php
+++ b/dictionaries/zh.dictionary.itop.core.php
@@ -301,7 +301,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:ActionEmail/Attribute:to+' => '邮件的目的地',
 	'Class:ActionEmail/Attribute:cc' => 'Cc',
 	'Class:ActionEmail/Attribute:cc+' => 'Carbon Copy',
-	'Class:ActionEmail/Attribute:bcc' => 'bcc',
+	'Class:ActionEmail/Attribute:bcc' => 'Bcc',
 	'Class:ActionEmail/Attribute:bcc+' => 'Blind Carbon Copy',
 	'Class:ActionEmail/Attribute:subject' => '主题',
 	'Class:ActionEmail/Attribute:subject+' => '邮件标题',