Remove an ambiguous naming when performing a CSV import of DBServerInstance objects.

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

modules/itop-config-mgmt-1.0.0/de.dict.itop-config-mgmt.php

@@ -585,7 +585,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:DBServerInstance+' => '',
 	'Class:DBServerInstance/Attribute:software_id' => 'Software',
 	'Class:DBServerInstance/Attribute:software_id+' => '',
-	'Class:DBServerInstance/Attribute:software_name' => 'Name',
+	'Class:DBServerInstance/Attribute:software_name' => 'Software Name',
 	'Class:DBServerInstance/Attribute:software_name+' => '',
 	'Class:DBServerInstance/Attribute:dbinstance_list' => 'Datenbanken',
 	'Class:DBServerInstance/Attribute:dbinstance_list+' => 'Datenbanken-Quellen',

modules/itop-config-mgmt-1.0.0/en.dict.itop-config-mgmt.php

@@ -585,7 +585,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:DBServerInstance+' => '',
 	'Class:DBServerInstance/Attribute:software_id' => 'Software',
 	'Class:DBServerInstance/Attribute:software_id+' => '',
-	'Class:DBServerInstance/Attribute:software_name' => 'Name',
+	'Class:DBServerInstance/Attribute:software_name' => 'Software Name',
 	'Class:DBServerInstance/Attribute:software_name+' => '',
 	'Class:DBServerInstance/Attribute:dbinstance_list' => 'Databases',
 	'Class:DBServerInstance/Attribute:dbinstance_list+' => 'Database sources',
@@ -1049,6 +1049,5 @@ Dict::Add('EN US', 'English', 'English', array(
 'Menu:Group+' => 'Groups of CIs',
 'Menu:ConfigManagement:Shortcuts' => 'Shortcuts',
 'Menu:ConfigManagement:AllContacts' => 'All contacts: %1$d',
-
 ));
 ?>

modules/itop-config-mgmt-1.0.0/fr.dict.itop-config-mgmt.php

@@ -572,8 +572,10 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:DBServerInstance' => 'Instance de serveur de base de données',
 	'Class:DBServerInstance+' => '',
+	'Class:DBServerInstance/Attribute:software_id' => 'Logiciel',
+	'Class:DBServerInstance/Attribute:software_name' => 'Logiciel Serveur',
 	'Class:DBServerInstance/Attribute:dbinstance_list' => 'Bases',
-	'Class:DBServerInstance/Attribute:dbinstance_list+' => 'Liste des sources de données',
+	'Class:DBServerInstance/Attribute:dbinstance_list+' => 'Liste des bases de données',
 ));
 
 //