diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/fr.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/fr.dict.itop-bridge-cmdb-ticket.php
index d21668ccb4..8bfcda086f 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/fr.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/fr.dict.itop-bridge-cmdb-ticket.php
@@ -33,7 +33,7 @@
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkFunctionalCIToTicket' => 'Lien CI / Ticket',
'Class:lnkFunctionalCIToTicket+' => '',
- 'Class:lnkFunctionalCIToTicket/Name' => '%1$s / %2$s~~',
+ 'Class:lnkFunctionalCIToTicket/Name' => '%1$s / %2$s',
'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket',
'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Référence',
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 ec00ec9df3..5b64885111 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
@@ -81,7 +81,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkContactToFunctionalCI' => 'Lien Contact / CI Fonctionel',
'Class:lnkContactToFunctionalCI+' => '',
- 'Class:lnkContactToFunctionalCI/Name' => '%1$s / %2$s~~',
+ 'Class:lnkContactToFunctionalCI/Name' => '%1$s / %2$s',
'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'CI',
'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Nom CI',
@@ -138,7 +138,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:PhysicalDevice' => 'Matériel physique',
'Class:PhysicalDevice+' => '',
- 'Class:PhysicalDevice/ComplementaryName' => '%1$s - %2$s~~',
+ 'Class:PhysicalDevice/ComplementaryName' => '%1$s - %2$s',
'Class:PhysicalDevice/Attribute:serialnumber' => 'Numéro de série',
'Class:PhysicalDevice/Attribute:serialnumber+' => '',
'Class:PhysicalDevice/Attribute:location_id' => 'Site',
@@ -178,7 +178,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:Rack' => 'Rack',
'Class:Rack+' => '',
- 'Class:Rack/ComplementaryName' => '%1$s - %2$s~~',
+ 'Class:Rack/ComplementaryName' => '%1$s - %2$s',
'Class:Rack/Attribute:nb_u' => 'NB Unité',
'Class:Rack/Attribute:nb_u+' => '',
'Class:Rack/Attribute:device_list' => 'Matériels',
@@ -245,7 +245,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:ConnectableCI' => 'CI connecté',
'Class:ConnectableCI+' => '',
- 'Class:ConnectableCI/ComplementaryName' => '%1$s - %2$s~~',
+ 'Class:ConnectableCI/ComplementaryName' => '%1$s - %2$s',
'Class:ConnectableCI/Attribute:networkdevice_list' => 'Equipements réseaux',
'Class:ConnectableCI/Attribute:networkdevice_list+' => 'Tous les équipements réseaux connectés à ce matériel',
'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Interfaces réseaux',
@@ -259,7 +259,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:DatacenterDevice' => 'Matériel Datacenter',
'Class:DatacenterDevice+' => '',
- 'Class:DatacenterDevice/ComplementaryName' => '%1$s - %2$s~~',
+ 'Class:DatacenterDevice/ComplementaryName' => '%1$s - %2$s',
'Class:DatacenterDevice/Attribute:rack_id' => 'Rack',
'Class:DatacenterDevice/Attribute:rack_id+' => '',
'Class:DatacenterDevice/Attribute:rack_name' => 'Nom Rack',
@@ -298,7 +298,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:NetworkDevice' => 'Equipement réseau',
'Class:NetworkDevice+' => '',
- 'Class:NetworkDevice/ComplementaryName' => '%1$s - %2$s~~',
+ 'Class:NetworkDevice/ComplementaryName' => '%1$s - %2$s',
'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Type',
'Class:NetworkDevice/Attribute:networkdevicetype_id+' => '',
'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Nom Type',
@@ -320,7 +320,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:Server' => 'Serveur',
'Class:Server+' => '',
- 'Class:Server/ComplementaryName' => '%1$s - %2$s~~',
+ 'Class:Server/ComplementaryName' => '%1$s - %2$s',
'Class:Server/Attribute:osfamily_id' => 'Famille OS',
'Class:Server/Attribute:osfamily_id+' => '',
'Class:Server/Attribute:osfamily_name' => 'Nom Famille OS',
@@ -348,7 +348,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:StorageSystem' => 'Système de stockage',
'Class:StorageSystem+' => '',
- 'Class:StorageSystem/ComplementaryName' => '%1$s - %2$s~~',
+ 'Class:StorageSystem/ComplementaryName' => '%1$s - %2$s',
'Class:StorageSystem/Attribute:logicalvolume_list' => 'Volumes logiques',
'Class:StorageSystem/Attribute:logicalvolume_list+' => 'Tous les volumes logiques dans ce système de stockage',
));
@@ -360,7 +360,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:SANSwitch' => 'Switch SAN',
'Class:SANSwitch+' => '',
- 'Class:SANSwitch/ComplementaryName' => '%1$s - %2$s~~',
+ 'Class:SANSwitch/ComplementaryName' => '%1$s - %2$s',
'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Matériels connectés',
'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'Tous les matériels connectés à ce switch SAN',
));
@@ -372,7 +372,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:TapeLibrary' => 'Bandothèque',
'Class:TapeLibrary+' => '',
- 'Class:TapeLibrary/ComplementaryName' => '%1$s - %2$s~~',
+ 'Class:TapeLibrary/ComplementaryName' => '%1$s - %2$s',
'Class:TapeLibrary/Attribute:tapes_list' => 'Bandes',
'Class:TapeLibrary/Attribute:tapes_list+' => 'Toutes les bandes dans cette bandothèque',
));
@@ -384,7 +384,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:NAS' => 'NAS',
'Class:NAS+' => '',
- 'Class:NAS/ComplementaryName' => '%1$s - %2$s~~',
+ 'Class:NAS/ComplementaryName' => '%1$s - %2$s',
'Class:NAS/Attribute:nasfilesystem_list' => 'Systèmes de fichier NAS',
'Class:NAS/Attribute:nasfilesystem_list+' => 'Tous les systèmes de fichier dans ce NAS',
));
@@ -396,7 +396,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:PC' => 'PC',
'Class:PC+' => '',
- 'Class:PC/ComplementaryName' => '%1$s - %2$s~~',
+ 'Class:PC/ComplementaryName' => '%1$s - %2$s',
'Class:PC/Attribute:osfamily_id' => 'Famille OS',
'Class:PC/Attribute:osfamily_id+' => '',
'Class:PC/Attribute:osfamily_name' => 'Nom Famille OS',
@@ -424,7 +424,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:Printer' => 'Imprimante',
'Class:Printer+' => '',
- 'Class:Printer/ComplementaryName' => '%1$s - %2$s~~',
+ 'Class:Printer/ComplementaryName' => '%1$s - %2$s',
));
//
@@ -434,7 +434,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:PowerConnection' => 'Connexion électrique',
'Class:PowerConnection+' => '',
- 'Class:PowerConnection/ComplementaryName' => '%1$s - %2$s~~',
+ 'Class:PowerConnection/ComplementaryName' => '%1$s - %2$s',
));
//
@@ -444,7 +444,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:PowerSource' => 'Arrivée électrique',
'Class:PowerSource+' => '',
- 'Class:PowerSource/ComplementaryName' => '%1$s - %2$s~~',
+ 'Class:PowerSource/ComplementaryName' => '%1$s - %2$s',
'Class:PowerSource/Attribute:pdus_list' => 'PDUs',
'Class:PowerSource/Attribute:pdus_list+' => 'Toutes les PDUs de cette arrivée électrique',
));
@@ -456,7 +456,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:PDU' => 'PDU',
'Class:PDU+' => '',
- 'Class:PDU/ComplementaryName' => '%1$s - %2$s - %3$s - %4$s~~',
+ 'Class:PDU/ComplementaryName' => '%1$s - %2$s - %3$s - %4$s',
'Class:PDU/Attribute:rack_id' => 'Rack',
'Class:PDU/Attribute:rack_id+' => '',
'Class:PDU/Attribute:rack_name' => 'Nom rack',
@@ -474,7 +474,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:Peripheral' => 'Périphérique',
'Class:Peripheral+' => '',
- 'Class:Peripheral/ComplementaryName' => '%1$s - %2$s~~',
+ 'Class:Peripheral/ComplementaryName' => '%1$s - %2$s',
));
//
@@ -484,7 +484,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:Enclosure' => 'Chassis',
'Class:Enclosure+' => '',
- 'Class:Enclosure/ComplementaryName' => '%1$s - %2$s - %3$s~~',
+ 'Class:Enclosure/ComplementaryName' => '%1$s - %2$s - %3$s',
'Class:Enclosure/Attribute:rack_id' => 'Rack',
'Class:Enclosure/Attribute:rack_id+' => '',
'Class:Enclosure/Attribute:rack_name' => 'Nom rack',
@@ -603,7 +603,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:PCSoftware' => 'Logiciel PC',
- 'Class:PCSoftware+' => '~~',
+ 'Class:PCSoftware+' => 'Application logicielle sur PC',
));
//
@@ -622,7 +622,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:MiddlewareInstance' => 'Instance Middleware',
'Class:MiddlewareInstance+' => '',
- 'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s~~',
+ 'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s',
'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
'Class:MiddlewareInstance/Attribute:middleware_name' => 'Nom Middleware',
@@ -636,7 +636,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:DatabaseSchema' => 'Instance de base de données',
'Class:DatabaseSchema+' => '',
- 'Class:DatabaseSchema/ComplementaryName' => '%1$s - %2$s~~',
+ 'Class:DatabaseSchema/ComplementaryName' => '%1$s - %2$s',
'Class:DatabaseSchema/Attribute:dbserver_id' => 'Serveur de base de données',
'Class:DatabaseSchema/Attribute:dbserver_id+' => '',
'Class:DatabaseSchema/Attribute:dbserver_name' => 'Nom Serveur de base de données',
@@ -650,7 +650,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:WebApplication' => 'Application Web',
'Class:WebApplication+' => '',
- 'Class:WebApplication/ComplementaryName' => '%1$s - %2$s~~',
+ 'Class:WebApplication/ComplementaryName' => '%1$s - %2$s',
'Class:WebApplication/Attribute:webserver_id' => 'Serveur Web',
'Class:WebApplication/Attribute:webserver_id+' => '',
'Class:WebApplication/Attribute:webserver_name' => 'Nom Serveur Web',
@@ -731,7 +731,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:VirtualMachine' => 'Machine virtuelle',
'Class:VirtualMachine+' => '',
- 'Class:VirtualMachine/ComplementaryName' => '%1$s - %2$s~~',
+ 'Class:VirtualMachine/ComplementaryName' => '%1$s - %2$s',
'Class:VirtualMachine/Attribute:virtualhost_id' => 'vCluster / Hyperviseur',
'Class:VirtualMachine/Attribute:virtualhost_id+' => '',
'Class:VirtualMachine/Attribute:virtualhost_name' => 'Nom Host',
@@ -792,7 +792,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkServerToVolume' => 'Lien Serveur / Volume',
'Class:lnkServerToVolume+' => '',
- 'Class:lnkServerToVolume/Name' => '%1$s / %2$s~~',
+ 'Class:lnkServerToVolume/Name' => '%1$s / %2$s',
'Class:lnkServerToVolume/Attribute:volume_id' => 'Volume logique',
'Class:lnkServerToVolume/Attribute:volume_id+' => '',
'Class:lnkServerToVolume/Attribute:volume_name' => 'Nom Volume logique',
@@ -812,7 +812,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkVirtualDeviceToVolume' => 'Lien Device virtuel / Volume',
'Class:lnkVirtualDeviceToVolume+' => '',
- 'Class:lnkVirtualDeviceToVolume/Name' => '%1$s / %2$s~~',
+ 'Class:lnkVirtualDeviceToVolume/Name' => '%1$s / %2$s',
'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Volume logique',
'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => '',
'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'Nom Volume logique',
@@ -832,7 +832,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkSanToDatacenterDevice' => 'Lien San / Device',
'Class:lnkSanToDatacenterDevice+' => '',
- 'Class:lnkSanToDatacenterDevice/Name' => '%1$s / %2$s~~',
+ 'Class:lnkSanToDatacenterDevice/Name' => '%1$s / %2$s',
'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'Switch SAN',
'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => '',
'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'Nom Switch SAN',
@@ -894,7 +894,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:Software' => 'Logiciel',
'Class:Software+' => '',
- 'Class:Software/ComplementaryName' => '%1$s - %2$s~~',
+ 'Class:Software/ComplementaryName' => '%1$s - %2$s',
'Class:Software/Attribute:name' => 'Nom',
'Class:Software/Attribute:name+' => '',
'Class:Software/Attribute:vendor' => 'Vendeur',
@@ -1012,7 +1012,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:OSLicence' => 'Licence OS',
'Class:OSLicence+' => '',
- 'Class:OSLicence/ComplementaryName' => '%1$s - %2$s~~',
+ 'Class:OSLicence/ComplementaryName' => '%1$s - %2$s',
'Class:OSLicence/Attribute:osversion_id' => 'Version OS',
'Class:OSLicence/Attribute:osversion_id+' => '',
'Class:OSLicence/Attribute:osversion_name' => 'Nom Version OS',
@@ -1030,7 +1030,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:SoftwareLicence' => 'Licence Logiciel',
'Class:SoftwareLicence+' => '',
- 'Class:SoftwareLicence/ComplementaryName' => '%1$s - %2$s~~',
+ 'Class:SoftwareLicence/ComplementaryName' => '%1$s - %2$s',
'Class:SoftwareLicence/Attribute:software_id' => 'Logiciel',
'Class:SoftwareLicence/Attribute:software_id+' => '',
'Class:SoftwareLicence/Attribute:software_name' => 'Nom Logiciel',
@@ -1046,7 +1046,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkDocumentToLicence' => 'Lien Document / Licence',
'Class:lnkDocumentToLicence+' => '',
- 'Class:lnkDocumentToLicence/Name' => '%1$s / %2$s~~',
+ 'Class:lnkDocumentToLicence/Name' => '%1$s / %2$s',
'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licence',
'Class:lnkDocumentToLicence/Attribute:licence_id+' => '',
'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Nom Licence',
@@ -1099,7 +1099,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:Model' => 'Modèle',
'Class:Model+' => '',
- 'Class:Model/ComplementaryName' => '%1$s - %2$s~~',
+ 'Class:Model/ComplementaryName' => '%1$s - %2$s',
'Class:Model/Attribute:brand_id' => 'Marque',
'Class:Model/Attribute:brand_id+' => '',
'Class:Model/Attribute:brand_name' => 'Nom marque',
@@ -1179,7 +1179,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkDocumentToPatch' => 'Lien Document / Patch',
'Class:lnkDocumentToPatch+' => '',
- 'Class:lnkDocumentToPatch/Name' => '%1$s / %2$s~~',
+ 'Class:lnkDocumentToPatch/Name' => '%1$s / %2$s',
'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Patch',
'Class:lnkDocumentToPatch/Attribute:patch_id+' => '',
'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Nom patch',
@@ -1197,7 +1197,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Lien Instance logiciel / Patch logiciel',
'Class:lnkSoftwareInstanceToSoftwarePatch+' => '',
- 'Class:lnkSoftwareInstanceToSoftwarePatch/Name' => '%1$s / %2$s~~',
+ 'Class:lnkSoftwareInstanceToSoftwarePatch/Name' => '%1$s / %2$s',
'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Patch logiciel',
'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '',
'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Nom patch logiciel',
@@ -1215,7 +1215,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkFunctionalCIToOSPatch' => 'Lien CI Fonctionel / Patch OS',
'Class:lnkFunctionalCIToOSPatch+' => '',
- 'Class:lnkFunctionalCIToOSPatch/Name' => '%1$s / %2$s~~',
+ 'Class:lnkFunctionalCIToOSPatch/Name' => '%1$s / %2$s',
'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'Patch OS',
'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '',
'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'Nom Patch OS',
@@ -1233,7 +1233,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkDocumentToSoftware' => 'Lien Document / Logiciel',
'Class:lnkDocumentToSoftware+' => '',
- 'Class:lnkDocumentToSoftware/Name' => '%1$s / %2$s~~',
+ 'Class:lnkDocumentToSoftware/Name' => '%1$s / %2$s',
'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Logiciel',
'Class:lnkDocumentToSoftware/Attribute:software_id+' => '',
'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Nom logiciel',
@@ -1251,12 +1251,12 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:Subnet' => 'Subnet',
'Class:Subnet+' => '',
- 'Class:Subnet/Name' => '%1$s/%2$s~~',
- 'Class:Subnet/ComplementaryName' => '%1$s - %2$s~~',
+ 'Class:Subnet/Name' => '%1$s/%2$s',
+ 'Class:Subnet/ComplementaryName' => '%1$s - %2$s',
'Class:Subnet/Attribute:description' => 'Description',
'Class:Subnet/Attribute:description+' => '',
'Class:Subnet/Attribute:subnet_name' => 'Nom de subnet',
- 'Class:Subnet/Attribute:subnet_name+' => '~~',
+ 'Class:Subnet/Attribute:subnet_name+' => '',
'Class:Subnet/Attribute:org_id' => 'Organisation',
'Class:Subnet/Attribute:org_id+' => '',
'Class:Subnet/Attribute:org_name' => 'Nom organisation',
@@ -1297,7 +1297,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkSubnetToVLAN' => 'Lien Subnet / VLAN',
'Class:lnkSubnetToVLAN+' => '',
- 'Class:lnkSubnetToVLAN/Name' => '%1$s / %2$s~~',
+ 'Class:lnkSubnetToVLAN/Name' => '%1$s / %2$s',
'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Subnet',
'Class:lnkSubnetToVLAN/Attribute:subnet_id+' => '',
'Class:lnkSubnetToVLAN/Attribute:subnet_ip' => 'Subnet IP',
@@ -1351,7 +1351,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:PhysicalInterface' => 'Interface physique',
'Class:PhysicalInterface+' => '',
- 'Class:PhysicalInterface/Name' => '%2$s %1$s~~',
+ 'Class:PhysicalInterface/Name' => '%2$s %1$s',
'Class:PhysicalInterface/Attribute:connectableci_id' => 'Matériel',
'Class:PhysicalInterface/Attribute:connectableci_id+' => '',
'Class:PhysicalInterface/Attribute:connectableci_name' => 'Nom matériel',
@@ -1367,7 +1367,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkPhysicalInterfaceToVLAN' => 'Lien Interface réseau / VLAN',
'Class:lnkPhysicalInterfaceToVLAN+' => '',
- 'Class:lnkPhysicalInterfaceToVLAN/Name' => '%1$s %2$s / %3$s~~',
+ 'Class:lnkPhysicalInterfaceToVLAN/Name' => '%1$s %2$s / %3$s',
'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Interface réseau',
'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id+' => '',
'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name' => 'Nom interface réseau',
@@ -1422,7 +1422,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkConnectableCIToNetworkDevice' => 'Lien Device / Equipement réseau',
'Class:lnkConnectableCIToNetworkDevice+' => '',
- 'Class:lnkConnectableCIToNetworkDevice/Name' => '%1$s / %2$s~~',
+ 'Class:lnkConnectableCIToNetworkDevice/Name' => '%1$s / %2$s',
'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Equipement réseau',
'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '',
'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Nom Equipement réseau',
@@ -1450,7 +1450,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkApplicationSolutionToFunctionalCI' => 'Lien Solution Applicative / CI Fonctionel',
'Class:lnkApplicationSolutionToFunctionalCI+' => '',
- 'Class:lnkApplicationSolutionToFunctionalCI/Name' => '%1$s / %2$s~~',
+ 'Class:lnkApplicationSolutionToFunctionalCI/Name' => '%1$s / %2$s',
'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Solution applicative',
'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id+' => '',
'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Nom Solution applicative',
@@ -1468,7 +1468,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkApplicationSolutionToBusinessProcess' => 'Lien Solution Applicative / Processus métier',
'Class:lnkApplicationSolutionToBusinessProcess+' => '',
- 'Class:lnkApplicationSolutionToBusinessProcess/Name' => '%1$s / %2$s~~',
+ 'Class:lnkApplicationSolutionToBusinessProcess/Name' => '%1$s / %2$s',
'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Processus métier',
'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id+' => '',
'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'Nom Processus métier',
@@ -1486,7 +1486,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:Group' => 'Groupe',
'Class:Group+' => '',
- 'Class:Group/ComplementaryName' => '%1$s - %2$s~~',
+ 'Class:Group/ComplementaryName' => '%1$s - %2$s',
'Class:Group/Attribute:name' => 'Nom',
'Class:Group/Attribute:name+' => '',
'Class:Group/Attribute:status' => 'Etat',
@@ -1522,7 +1522,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkGroupToCI' => 'Lien Groupe / CI',
'Class:lnkGroupToCI+' => '',
- 'Class:lnkGroupToCI/Name' => '%1$s / %2$s~~',
+ 'Class:lnkGroupToCI/Name' => '%1$s / %2$s',
'Class:lnkGroupToCI/Attribute:group_id' => 'Groupe',
'Class:lnkGroupToCI/Attribute:group_id+' => '',
'Class:lnkGroupToCI/Attribute:group_name' => 'Nom du groupe',
@@ -1560,7 +1560,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkDocumentToFunctionalCI' => 'Lien Document / CI Fonctionel',
'Class:lnkDocumentToFunctionalCI+' => '',
- 'Class:lnkDocumentToFunctionalCI/Name' => '%1$s / %2$s~~',
+ 'Class:lnkDocumentToFunctionalCI/Name' => '%1$s / %2$s',
'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'CI',
'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '',
'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'Nom CI',
diff --git a/datamodels/2.x/itop-core-update/dictionaries/fr.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/fr.dict.itop-core-update.php
index 09f0a086d2..29e3087ce6 100644
--- a/datamodels/2.x/itop-core-update/dictionaries/fr.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/dictionaries/fr.dict.itop-core-update.php
@@ -51,7 +51,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
'iTopUpdate:UI:WarningReadOnlyDuringUpdate' => 'Pendant toute la durée de la mise à jour, l\'application sera en lecture seule.',
'iTopUpdate:UI:Status' => 'Versions installées',
'iTopUpdate:UI:Action' => 'Mettre à jour',
- 'iTopUpdate:UI:Setup' => ITOP_APPLICATION_SHORT.' Setup~~',
+ 'iTopUpdate:UI:Setup' => ITOP_APPLICATION_SHORT.' Setup',
'iTopUpdate:UI:History' => 'Historique des versions',
'iTopUpdate:UI:Progress' => 'Progression de la mise à jour',
'iTopUpdate:UI:DoBackup:Label' => 'Sauvegarde de la base de données',
@@ -71,8 +71,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Attention : la mise à jour de l\'application peut échouer : %1$s',
'iTopUpdate:UI:CannotUpdateUseSetup' => 'Des fichiers modifiés ont été détectés, une mise à jour partielle ne peut pas être effectuée.
Suivez la procedure pour mettre à jour manuellement votre iTop. Vous devez utiliser la page d\'installation pour mettre à jour l\'application.',
'iTopUpdate:UI:CheckInProgress' => 'Veuillez patienter pendant la vérification d\'intégrité',
- 'iTopUpdate:UI:SetupLaunch' => 'Launch '.ITOP_APPLICATION_SHORT.' Setup~~',
- 'iTopUpdate:UI:SetupLaunchConfirm' => 'This will launch '.ITOP_APPLICATION_SHORT.' setup, are you sure?~~',
+ 'iTopUpdate:UI:SetupLaunch' => 'Lancer le Setup',
+ 'iTopUpdate:UI:SetupLaunchConfirm' => 'This will launch '.ITOP_APPLICATION_SHORT.' setup, are you sure?',
// Setup Messages
'iTopUpdate:UI:SetupMessage:Ready' => 'Prêt pour l\\installation',
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/fr.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/fr.dict.itop-knownerror-mgmt.php
index 1dd603488b..00e1d4aee9 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/fr.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/fr.dict.itop-knownerror-mgmt.php
@@ -74,7 +74,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkErrorToFunctionalCI' => 'Lien Erreur / CI',
'Class:lnkErrorToFunctionalCI+' => 'Lien entre une erreur et un ci',
- 'Class:lnkErrorToFunctionalCI/Name' => '%1$s / %2$s~~',
+ 'Class:lnkErrorToFunctionalCI/Name' => '%1$s / %2$s',
'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'CI',
'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id+' => '',
'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'Nom CI',
@@ -94,7 +94,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkDocumentToError' => 'Lien Documents / Errors',
'Class:lnkDocumentToError+' => 'Lien entre un document et une erreur',
- 'Class:lnkDocumentToError/Name' => '%1$s / %2$s~~',
+ 'Class:lnkDocumentToError/Name' => '%1$s / %2$s',
'Class:lnkDocumentToError/Attribute:document_id' => 'Document',
'Class:lnkDocumentToError/Attribute:document_id+' => '',
'Class:lnkDocumentToError/Attribute:document_name' => 'Nom Document',
diff --git a/datamodels/2.x/itop-oauth-client/fr.dict.itop-oauth-client.php b/datamodels/2.x/itop-oauth-client/fr.dict.itop-oauth-client.php
index a968483628..518ab87a85 100644
--- a/datamodels/2.x/itop-oauth-client/fr.dict.itop-oauth-client.php
+++ b/datamodels/2.x/itop-oauth-client/fr.dict.itop-oauth-client.php
@@ -109,7 +109,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:OAuthClientGoogle/Attribute:used_scope' => 'Niveaux d\'accès utilisés',
'Class:OAuthClientGoogle/Attribute:used_scope+' => '',
'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple' => 'Simple',
- 'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple+' => '~~',
+ 'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple+' => '',
'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced' => 'Avancé',
'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced+' => '',
'Class:OAuthClientGoogle/Attribute:used_for_smtp' => 'Utilisé pour SMTP',
diff --git a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/fr.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/fr.dict.itop-service-mgmt-provider.php
index a8a0a67546..b1247c6dbf 100644
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/fr.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/fr.dict.itop-service-mgmt-provider.php
@@ -177,7 +177,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkContactToContract' => 'Lien Contact / Contrat',
'Class:lnkContactToContract+' => '',
- 'Class:lnkContactToContract/Name' => '%1$s / %2$s~~',
+ 'Class:lnkContactToContract/Name' => '%1$s / %2$s',
'Class:lnkContactToContract/Attribute:contract_id' => 'Contrat',
'Class:lnkContactToContract/Attribute:contract_id+' => '',
'Class:lnkContactToContract/Attribute:contract_name' => 'Nom contrat',
@@ -195,7 +195,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkContractToDocument' => 'Lien Contract / Document',
'Class:lnkContractToDocument+' => '',
- 'Class:lnkContractToDocument/Name' => '%1$s / %2$s~~',
+ 'Class:lnkContractToDocument/Name' => '%1$s / %2$s',
'Class:lnkContractToDocument/Attribute:contract_id' => 'Contrat',
'Class:lnkContractToDocument/Attribute:contract_id+' => '',
'Class:lnkContractToDocument/Attribute:contract_name' => 'Nom contrat',
@@ -213,7 +213,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkFunctionalCIToProviderContract' => 'Lien CI / Contrat fournisseur',
'Class:lnkFunctionalCIToProviderContract+' => '',
- 'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s~~',
+ 'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s',
'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Contrat fournisseur',
'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Nom contrat fournisseur',
@@ -246,7 +246,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:Service' => 'Service',
'Class:Service+' => '',
- 'Class:Service/ComplementaryName' => '%1$s - %2$s~~',
+ 'Class:Service/ComplementaryName' => '%1$s - %2$s',
'Class:Service/Attribute:name' => 'Nom',
'Class:Service/Attribute:name+' => '',
'Class:Service/Attribute:org_id' => 'Fournisseur',
@@ -286,7 +286,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkDocumentToService' => 'Lien Document / Service',
'Class:lnkDocumentToService+' => '',
- 'Class:lnkDocumentToService/Name' => '%1$s / %2$s~~',
+ 'Class:lnkDocumentToService/Name' => '%1$s / %2$s',
'Class:lnkDocumentToService/Attribute:service_id' => 'Service',
'Class:lnkDocumentToService/Attribute:service_id+' => '',
'Class:lnkDocumentToService/Attribute:service_name' => 'Nom service',
@@ -304,7 +304,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkContactToService' => 'Lien Contact / Service',
'Class:lnkContactToService+' => '',
- 'Class:lnkContactToService/Name' => '%1$s / %2$s~~',
+ 'Class:lnkContactToService/Name' => '%1$s / %2$s',
'Class:lnkContactToService/Attribute:service_id' => 'Service',
'Class:lnkContactToService/Attribute:service_id+' => '',
'Class:lnkContactToService/Attribute:service_name' => 'Nom service',
@@ -322,7 +322,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:ServiceSubcategory' => 'Sous catégorie de service',
'Class:ServiceSubcategory+' => '',
- 'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s~~',
+ 'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s',
'Class:ServiceSubcategory/Attribute:name' => 'Nom',
'Class:ServiceSubcategory/Attribute:name+' => '',
'Class:ServiceSubcategory/Attribute:description' => 'Description',
@@ -419,7 +419,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkSLAToSLT' => 'Lien SLA / SLT',
'Class:lnkSLAToSLT+' => '',
- 'Class:lnkSLAToSLT/Name' => '%1$s / %2$s~~',
+ 'Class:lnkSLAToSLT/Name' => '%1$s / %2$s',
'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
'Class:lnkSLAToSLT/Attribute:sla_name' => 'Nom SLA',
@@ -447,7 +447,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkCustomerContractToService' => 'Lien Contrat client / Service',
'Class:lnkCustomerContractToService+' => '',
- 'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s~~',
+ 'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s',
'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Contrat client',
'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Nom contrat client',
@@ -469,7 +469,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkCustomerContractToProviderContract' => 'Lien Contrat client / Contrat fournisseur',
'Class:lnkCustomerContractToProviderContract+' => '',
- 'Class:lnkCustomerContractToProviderContract/Name' => '%1$s / %2$s~~',
+ 'Class:lnkCustomerContractToProviderContract/Name' => '%1$s / %2$s',
'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id' => 'Contrat client',
'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id+' => '',
'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_name' => 'Contrat client',
@@ -487,7 +487,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkCustomerContractToFunctionalCI' => 'Lien Contrat client / CI',
'Class:lnkCustomerContractToFunctionalCI+' => '',
- 'Class:lnkCustomerContractToFunctionalCI/Name' => '%1$s / %2$s~~',
+ 'Class:lnkCustomerContractToFunctionalCI/Name' => '%1$s / %2$s',
'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id' => 'Contrat client',
'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id+' => '',
'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_name' => 'Contrat client',
@@ -526,7 +526,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkDeliveryModelToContact' => 'Lien Modèle de support / Contact',
'Class:lnkDeliveryModelToContact+' => '',
- 'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s~~',
+ 'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s',
'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Modèle de support',
'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Nom Modèle de support',
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/fr.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/fr.dict.itop-service-mgmt.php
index 5d8657e0ce..37ad423d65 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/fr.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/fr.dict.itop-service-mgmt.php
@@ -166,7 +166,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkContactToContract' => 'Lien Contact / Contrat',
'Class:lnkContactToContract+' => '',
- 'Class:lnkContactToContract/Name' => '%1$s / %2$s~~',
+ 'Class:lnkContactToContract/Name' => '%1$s / %2$s',
'Class:lnkContactToContract/Attribute:contract_id' => 'Contrat',
'Class:lnkContactToContract/Attribute:contract_id+' => '',
'Class:lnkContactToContract/Attribute:contract_name' => 'Nom contrat',
@@ -184,7 +184,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkContractToDocument' => 'Lien Contrat / Document',
'Class:lnkContractToDocument+' => '',
- 'Class:lnkContractToDocument/Name' => '%1$s / %2$s~~',
+ 'Class:lnkContractToDocument/Name' => '%1$s / %2$s',
'Class:lnkContractToDocument/Attribute:contract_id' => 'Contrat',
'Class:lnkContractToDocument/Attribute:contract_id+' => '',
'Class:lnkContractToDocument/Attribute:contract_name' => 'Nom contrat',
@@ -217,7 +217,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:Service' => 'Service',
'Class:Service+' => '',
- 'Class:Service/ComplementaryName' => '%1$s - %2$s~~',
+ 'Class:Service/ComplementaryName' => '%1$s - %2$s',
'Class:Service/Attribute:name' => 'Nom',
'Class:Service/Attribute:name+' => '',
'Class:Service/Attribute:org_id' => 'Fournisseur',
@@ -261,7 +261,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkDocumentToService' => 'Lien Document / Service',
'Class:lnkDocumentToService+' => '',
- 'Class:lnkDocumentToService/Name' => '%1$s / %2$s~~',
+ 'Class:lnkDocumentToService/Name' => '%1$s / %2$s',
'Class:lnkDocumentToService/Attribute:service_id' => 'Service',
'Class:lnkDocumentToService/Attribute:service_id+' => '',
'Class:lnkDocumentToService/Attribute:service_name' => 'Nom service',
@@ -279,7 +279,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkContactToService' => 'Lien Contact / Service',
'Class:lnkContactToService+' => '',
- 'Class:lnkContactToService/Name' => '%1$s / %2$s~~',
+ 'Class:lnkContactToService/Name' => '%1$s / %2$s',
'Class:lnkContactToService/Attribute:service_id' => 'Service',
'Class:lnkContactToService/Attribute:service_id+' => '',
'Class:lnkContactToService/Attribute:service_name' => 'Nom service',
@@ -297,7 +297,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:ServiceSubcategory' => 'Sous catégorie de service',
'Class:ServiceSubcategory+' => '',
- 'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s~~',
+ 'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s',
'Class:ServiceSubcategory/Attribute:name' => 'Nom',
'Class:ServiceSubcategory/Attribute:name+' => '',
'Class:ServiceSubcategory/Attribute:description' => 'Description',
@@ -394,7 +394,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkSLAToSLT' => 'Lien SLA / SLT',
'Class:lnkSLAToSLT+' => '',
- 'Class:lnkSLAToSLT/Name' => '%1$s / %2$s~~',
+ 'Class:lnkSLAToSLT/Name' => '%1$s / %2$s',
'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
'Class:lnkSLAToSLT/Attribute:sla_name' => 'Nom SLA',
@@ -422,7 +422,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkCustomerContractToService' => 'Lien Contrat client / Service',
'Class:lnkCustomerContractToService+' => '',
- 'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s~~',
+ 'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s',
'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Contrat client',
'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Nom contrat client',
@@ -444,7 +444,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkProviderContractToService' => 'Lien Contrat fournisseur / Service',
'Class:lnkProviderContractToService+' => '',
- 'Class:lnkProviderContractToService/Name' => '%1$s / %2$s~~',
+ 'Class:lnkProviderContractToService/Name' => '%1$s / %2$s',
'Class:lnkProviderContractToService/Attribute:service_id' => 'Service',
'Class:lnkProviderContractToService/Attribute:service_id+' => '',
'Class:lnkProviderContractToService/Attribute:service_name' => 'Nom service',
@@ -483,7 +483,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkDeliveryModelToContact' => 'Lien Modèle de support / Contact',
'Class:lnkDeliveryModelToContact+' => '',
- 'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s~~',
+ 'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s',
'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Modèle de support',
'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Nom Modèle de support',
diff --git a/datamodels/2.x/itop-structure/dictionaries/fr.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/fr.dict.itop-structure.php
index 7e9aceb3b2..66c3667234 100644
--- a/datamodels/2.x/itop-structure/dictionaries/fr.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/dictionaries/fr.dict.itop-structure.php
@@ -77,9 +77,9 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:Organization/Attribute:parent_name' => 'Nom du parent',
'Class:Organization/Attribute:parent_name+' => 'Nom de l\'organisation parente',
'Class:Organization/Attribute:deliverymodel_id' => 'Modèle de support',
- 'Class:Organization/Attribute:deliverymodel_id+' => '~~',
+ 'Class:Organization/Attribute:deliverymodel_id+' => '',
'Class:Organization/Attribute:deliverymodel_name' => 'Nom modèle de support',
- 'Class:Organization/Attribute:deliverymodel_name+' => '~~',
+ 'Class:Organization/Attribute:deliverymodel_name+' => '',
'Class:Organization/Attribute:parent_id_friendlyname' => 'Nom commun',
'Class:Organization/Attribute:parent_id_friendlyname+' => '',
'Class:Organization/Attribute:overview' => 'Tableau de bord',
@@ -128,7 +128,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:Contact' => 'Contact',
'Class:Contact+' => '',
- 'Class:Contact/ComplementaryName' => '%1$s - %2$s~~',
+ 'Class:Contact/ComplementaryName' => '%1$s - %2$s',
'Class:Contact/Attribute:name' => 'Nom',
'Class:Contact/Attribute:name+' => '',
'Class:Contact/Attribute:status' => 'Etat',
@@ -166,9 +166,9 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:Person' => 'Personne',
'Class:Person+' => '',
- 'Class:Person/ComplementaryName' => '%1$s - %2$s~~',
+ 'Class:Person/ComplementaryName' => '%1$s - %2$s',
'Class:Person/Attribute:name' => 'Nom',
- 'Class:Person/Attribute:name+' => '~~',
+ 'Class:Person/Attribute:name+' => '',
'Class:Person/Attribute:first_name' => 'Prénom',
'Class:Person/Attribute:first_name+' => '',
'Class:Person/Attribute:employee_number' => 'Numéro d\'employé',
@@ -208,7 +208,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:Team' => 'Equipe',
'Class:Team+' => '',
- 'Class:Team/ComplementaryName' => '%1$s - %2$s~~',
+ 'Class:Team/ComplementaryName' => '%1$s - %2$s',
'Class:Team/Attribute:persons_list' => 'Membres',
'Class:Team/Attribute:persons_list+' => 'Toutes les personnes appartenant à cette équipe',
'Class:Team/Attribute:tickets_list' => 'Tickets',
@@ -222,7 +222,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:Document' => 'Document',
'Class:Document+' => '',
- 'Class:Document/ComplementaryName' => '%1$s - %2$s - %3$s~~',
+ 'Class:Document/ComplementaryName' => '%1$s - %2$s - %3$s',
'Class:Document/Attribute:name' => 'Nom',
'Class:Document/Attribute:name+' => '',
'Class:Document/Attribute:org_id' => 'Organisation',
@@ -322,8 +322,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkPersonToTeam' => 'Lien Personne / Equipe',
'Class:lnkPersonToTeam+' => '',
- 'Class:lnkPersonToTeam/Name' => '%1$s / %2$s~~',
- 'Class:lnkPersonToTeam/Name+' => '~~',
+ 'Class:lnkPersonToTeam/Name' => '%1$s / %2$s',
+ 'Class:lnkPersonToTeam/Name+' => '',
'Class:lnkPersonToTeam/Attribute:team_id' => 'Equipe',
'Class:lnkPersonToTeam/Attribute:team_id+' => 'Une équipe à laquelle appartient la personne',
'Class:lnkPersonToTeam/Attribute:team_name' => 'Nom Equipe',
diff --git a/datamodels/2.x/itop-tickets/dictionaries/fr.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/fr.dict.itop-tickets.php
index 5a0828d6bc..6f765ba7b1 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/fr.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/fr.dict.itop-tickets.php
@@ -84,7 +84,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', array(
'Class:lnkContactToTicket' => 'Lien Contact / Ticket',
'Class:lnkContactToTicket+' => '',
- 'Class:lnkContactToTicket/Name' => '%1$s / %2$s~~',
+ 'Class:lnkContactToTicket/Name' => '%1$s / %2$s',
'Class:lnkContactToTicket/Attribute:ticket_id' => 'Ticket',
'Class:lnkContactToTicket/Attribute:ticket_id+' => '',
'Class:lnkContactToTicket/Attribute:ticket_ref' => 'Référence',