#1038: dictionary cleanup to avoid misleading/duplicate names when importing Service Subcategories.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@3467 a333f486-631f-4898-b8df-5754b55c2be0

datamodels/2.x/itop-service-mgmt-provider/de.dict.itop-service-mgmt-provider.php

@@ -71,8 +71,10 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Service+' => '',
 	'Class:Service/Attribute:name' => 'Name',
 	'Class:Service/Attribute:name+' => '',
-	'Class:Service/Attribute:org_id' => 'Organisation',
+	'Class:Service/Attribute:org_id' => 'Provider',
 	'Class:Service/Attribute:org_id+' => '',
+	'Class:Service/Attribute:organization_name' => 'Provider Name',
+	'Class:Service/Attribute:organization_name+' => '',
 	'Class:Service/Attribute:description' => 'Beschreibung',
 	'Class:Service/Attribute:description+' => '',
 	'Class:Service/Attribute:documents_list' => 'Dokumente',
@@ -211,7 +213,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:DeliveryModel/Attribute:customers_list+' => '',
 	'Class:lnkDeliveryModelToContact' => 'Verknüpfung Delivery-Modell/Kontakt',
 	'Class:lnkDeliveryModelToContact+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Dellivery-Modell',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Delivery-Modell',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
 	'Class:lnkDeliveryModelToContact/Attribute:contact_id' => 'Kontakt',
 	'Class:lnkDeliveryModelToContact/Attribute:contact_id+' => '',

datamodels/2.x/itop-service-mgmt-provider/en.dict.itop-service-mgmt-provider.php

@@ -256,10 +256,10 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:Service+' => '',
 	'Class:Service/Attribute:name' => 'Name',
 	'Class:Service/Attribute:name+' => '',
-	'Class:Service/Attribute:org_id' => 'Organization',
+	'Class:Service/Attribute:org_id' => 'Provider',
 	'Class:Service/Attribute:org_id+' => '',
-	'Class:Service/Attribute:organization_name' => 'Name',
-	'Class:Service/Attribute:organization_name+' => 'Common name',
+	'Class:Service/Attribute:organization_name' => 'Provider Name',
+	'Class:Service/Attribute:organization_name+' => '',
 	'Class:Service/Attribute:description' => 'Description',
 	'Class:Service/Attribute:description+' => '',
 	'Class:Service/Attribute:documents_list' => 'Documents',
@@ -343,6 +343,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'incident',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'service request',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => 'service request',
+	'Class:ServiceSubcategory/Attribute:service_provider' => 'Provider Name',
+	'Class:ServiceSubcategory/Attribute:service_org_id' => 'Provider',
 ));
 
 //

datamodels/2.x/itop-service-mgmt-provider/fr.dict.itop-service-mgmt-provider.php

@@ -202,8 +202,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Service/Attribute:name+' => '',
 	'Class:Service/Attribute:org_id' => 'Fournisseur',
 	'Class:Service/Attribute:org_id+' => '',
-	'Class:Service/Attribute:organization_name' => 'Nom fournisseur',
-	'Class:Service/Attribute:organization_name+' => 'Nom commun',
+	'Class:Service/Attribute:organization_name' => 'Nom du fournisseur',
+	'Class:Service/Attribute:organization_name+' => '',
 	'Class:Service/Attribute:description' => 'Description',
 	'Class:Service/Attribute:description+' => '',
 	'Class:Service/Attribute:documents_list' => 'Documents',
@@ -287,6 +287,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'incident',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'demande de service',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => 'demande de service',
+	'Class:ServiceSubcategory/Attribute:service_provider' => 'Nom du fournisseur',
+	'Class:ServiceSubcategory/Attribute:service_org_id' => 'Fournisseur',
 ));
 
 //