From 960990d47d248c46c2c936155608be47e265cf08 Mon Sep 17 00:00:00 2001 From: v-dumas Date: Wed, 18 Mar 2026 17:42:15 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B08994=20-=20fix=20duplicate=20key=20in=20?= =?UTF-8?q?EN=20dico?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dictionaries/en.dict.itop-config-mgmt.php | 15 ++------------- .../dictionaries/en_gb.dict.itop-config-mgmt.php | 4 ++++ .../dictionaries/fr.dict.itop-config-mgmt.php | 15 ++++----------- 3 files changed, 10 insertions(+), 24 deletions(-) diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php index 2fd433c632..4b7962774f 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php @@ -1367,9 +1367,9 @@ Dict::Add('EN US', 'English', 'English', [ 'Class:PhysicalInterface/Attribute:connectableci_id+' => '', 'Class:PhysicalInterface/Attribute:connectableci_name' => 'Device name', 'Class:PhysicalInterface/Attribute:connectableci_name+' => '', - 'Class:PhysicalInterface/Attribute:org_id' => 'Org id', + 'Class:PhysicalInterface/Attribute:org_id' => 'Organization', 'Class:PhysicalInterface/Attribute:org_id+' => '', - 'Class:PhysicalInterface/Attribute:location_id' => 'Location id', + 'Class:PhysicalInterface/Attribute:location_id' => 'Location', 'Class:PhysicalInterface/Attribute:location_id+' => '', 'Class:PhysicalInterface/Attribute:vlans_list' => 'VLANs', 'Class:PhysicalInterface/Attribute:vlans_list+' => '', @@ -1529,17 +1529,6 @@ Dict::Add('EN US', 'English', 'English', [ 'Class:Group/Attribute:parent_id_friendlyname+' => '', ]); -// -// Class: PhysicalInterface -// - -Dict::Add('EN US', 'English', 'English', [ - 'Class:PhysicalInterface/Attribute:org_id' => 'Organization', - 'Class:PhysicalInterface/Attribute:org_id+' => '', - 'Class:PhysicalInterface/Attribute:location_id' => 'Location', - 'Class:PhysicalInterface/Attribute:location_id+' => '', -]); - // // Class: lnkGroupToCI // diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/en_gb.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/en_gb.dict.itop-config-mgmt.php index a6b99fd078..f16fa8ed80 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/en_gb.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/en_gb.dict.itop-config-mgmt.php @@ -1356,6 +1356,10 @@ Dict::Add('EN GB', 'British English', 'British English', [ 'Class:PhysicalInterface/Attribute:connectableci_id+' => '', 'Class:PhysicalInterface/Attribute:connectableci_name' => 'Device name', 'Class:PhysicalInterface/Attribute:connectableci_name+' => '', + 'Class:PhysicalInterface/Attribute:org_id' => 'Organization', + 'Class:PhysicalInterface/Attribute:org_id+' => '', + 'Class:PhysicalInterface/Attribute:location_id' => 'Location', + 'Class:PhysicalInterface/Attribute:location_id+' => '', 'Class:PhysicalInterface/Attribute:vlans_list' => 'VLANs', 'Class:PhysicalInterface/Attribute:vlans_list+' => '', ]); diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php index 38a116268c..cdd9766ef1 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php @@ -1521,6 +1521,10 @@ Dict::Add('FR FR', 'French', 'Français', [ 'Class:PhysicalInterface/Attribute:connectableci_id+' => '', 'Class:PhysicalInterface/Attribute:connectableci_name' => 'Nom matériel', 'Class:PhysicalInterface/Attribute:connectableci_name+' => '', + 'Class:PhysicalInterface/Attribute:org_id' => 'Organisation', + 'Class:PhysicalInterface/Attribute:org_id+' => '', + 'Class:PhysicalInterface/Attribute:location_id' => 'Site', + 'Class:PhysicalInterface/Attribute:location_id+' => '', 'Class:PhysicalInterface/Attribute:vlans_list' => 'VLANs', 'Class:PhysicalInterface/Attribute:vlans_list+' => '', ]); @@ -1679,17 +1683,6 @@ Dict::Add('FR FR', 'French', 'Français', [ 'Class:Group/Attribute:parent_id_friendlyname+' => '', ]); -// -// Class: PhysicalInterface -// - -Dict::Add('FR FR', 'French', 'Français', [ - 'Class:PhysicalInterface/Attribute:org_id' => 'Organisation', - 'Class:PhysicalInterface/Attribute:org_id+' => '', - 'Class:PhysicalInterface/Attribute:location_id' => 'Site', - 'Class:PhysicalInterface/Attribute:location_id+' => '', -]); - // // Class: lnkGroupToCI //