Renamed classes/attributes and enums, for the latest dictionaries (based on names from 2.0 beta 1)

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

datamodels/2.x/itop-config-mgmt/de.dict.itop-config-mgmt.php

@@ -153,14 +153,14 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Middleware+' => '',
 	'Class:Middleware/Attribute:middlewareinstance_list' => 'Middleware-Instanzen',
 	'Class:Middleware/Attribute:middlewareinstance_list+' => '',
-	'Class:DBserver' => 'DB Server',
-	'Class:DBserver+' => '',
-	'Class:DBserver/Attribute:dbschema_list' => 'DB Schemata',
-	'Class:DBserver/Attribute:dbschema_list+' => '',
-	'Class:Webserver' => 'Web Server',
-	'Class:Webserver+' => '',
-	'Class:Webserver/Attribute:webapp_list' => 'Webapplikationen',
-	'Class:Webserver/Attribute:webapp_list+' => '',
+	'Class:DBServer' => 'DB Server',
+	'Class:DBServer+' => '',
+	'Class:DBServer/Attribute:dbschema_list' => 'DB Schemata',
+	'Class:DBServer/Attribute:dbschema_list+' => '',
+	'Class:WebServer' => 'Web Server',
+	'Class:WebServer+' => '',
+	'Class:WebServer/Attribute:webapp_list' => 'Webapplikationen',
+	'Class:WebServer/Attribute:webapp_list+' => '',
 	'Class:PCSoftware' => 'PC-Software',
 	'Class:PCSoftware+' => '',
 	'Class:OtherSoftware' => 'Andere Software',
@@ -191,40 +191,40 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Software/Attribute:documents_list+' => '',
 	'Class:Software/Attribute:type' => 'Typ',
 	'Class:Software/Attribute:type+' => '',
-	'Class:Software/Attribute:type/Value:DBserver' => 'DB-Server',
-	'Class:Software/Attribute:type/Value:DBserver+' => '',
+	'Class:Software/Attribute:type/Value:DBServer' => 'DB-Server',
+	'Class:Software/Attribute:type/Value:DBServer+' => '',
 	'Class:Software/Attribute:type/Value:Middleware' => 'Middleware',
 	'Class:Software/Attribute:type/Value:Middleware+' => '',
 	'Class:Software/Attribute:type/Value:OtherSoftware' => 'Andere Software',
 	'Class:Software/Attribute:type/Value:OtherSoftware+' => '',
 	'Class:Software/Attribute:type/Value:PCSoftware' => 'PC-Software',
 	'Class:Software/Attribute:type/Value:PCSoftware+' => '',
-	'Class:Software/Attribute:type/Value:Webserver' => 'Webserver',
-	'Class:Software/Attribute:type/Value:Webserver+' => '',
+	'Class:Software/Attribute:type/Value:WebServer' => 'Webserver',
+	'Class:Software/Attribute:type/Value:WebServer+' => '',
 	'Class:Software/Attribute:softwareinstance_list' => 'Software-Instanzen',
 	'Class:Software/Attribute:softwareinstance_list+' => '',
 	'Class:Software/Attribute:softwarepatch_list' => 'Software-Patches',
 	'Class:Software/Attribute:softwarepatch_list+' => '',
 	'Class:Software/Attribute:softwarelicence_list' => 'Softwarelizenzen',
 	'Class:Software/Attribute:softwarelicence_list+' => '',
-	'Class:OSpatch' => 'OS-Patch',
-	'Class:OSpatch+' => '',
-	'Class:OSpatch/Attribute:functionalcis_list' => 'Geräte',
-	'Class:OSpatch/Attribute:functionalcis_list+' => '',
-	'Class:OSpatch/Attribute:osversion_id' => 'OS Version',
-	'Class:OSpatch/Attribute:osversion_id+' => '',
+	'Class:OSPatch' => 'OS-Patch',
+	'Class:OSPatch+' => '',
+	'Class:OSPatch/Attribute:functionalcis_list' => 'Geräte',
+	'Class:OSPatch/Attribute:functionalcis_list+' => '',
+	'Class:OSPatch/Attribute:osversion_id' => 'OS Version',
+	'Class:OSPatch/Attribute:osversion_id+' => '',
 	'Class:SoftwarePatch' => 'Software-Patch',
 	'Class:SoftwarePatch+' => '',
 	'Class:SoftwarePatch/Attribute:software_id' => 'Software',
 	'Class:SoftwarePatch/Attribute:software_id+' => '',
 	'Class:SoftwarePatch/Attribute:softwareinstances_list' => 'Software-Instanzen',
 	'Class:SoftwarePatch/Attribute:softwareinstances_list+' => '',
-	'Class:OsLicence' => 'OS-Lizenz',
-	'Class:OsLicence+' => '',
-	'Class:OsLicence/Attribute:osversion_id' => 'OS-Version',
-	'Class:OsLicence/Attribute:osversion_id+' => '',
-	'Class:OsLicence/Attribute:servers_list' => 'Server',
-	'Class:OsLicence/Attribute:servers_list+' => '',
+	'Class:OSLicence' => 'OS-Lizenz',
+	'Class:OSLicence+' => '',
+	'Class:OSLicence/Attribute:osversion_id' => 'OS-Version',
+	'Class:OSLicence/Attribute:osversion_id+' => '',
+	'Class:OSLicence/Attribute:servers_list' => 'Server',
+	'Class:OSLicence/Attribute:servers_list+' => '',
 	'Class:SoftwareLicence' => 'Software-Lizenz',
 	'Class:SoftwareLicence+' => '',
 	'Class:SoftwareLicence/Attribute:software_id' => 'Software',
@@ -237,12 +237,12 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '',
 	'Class:lnkDocumentToLicence/Attribute:document_id' => 'Dokument',
 	'Class:lnkDocumentToLicence/Attribute:document_id+' => '',
-	'Class:OSversion' => 'OS-Version',
-	'Class:OSversion+' => '',
-	'Class:OSversion/Attribute:osfamily_id' => 'OS-Familie',
-	'Class:OSversion/Attribute:osfamily_id+' => '',
-	'Class:OSfamily' => 'OS-Familie',
-	'Class:OSfamily+' => '',
+	'Class:OSVersion' => 'OS-Version',
+	'Class:OSVersion+' => '',
+	'Class:OSVersion/Attribute:osfamily_id' => 'OS-Familie',
+	'Class:OSVersion/Attribute:osfamily_id+' => '',
+	'Class:OSFamily' => 'OS-Familie',
+	'Class:OSFamily+' => '',
 	'Class:DocumentType' => 'Dokumentyp',
 	'Class:DocumentType+' => '',
 	'Class:ContactType' => 'Kontakttyp',
@@ -255,54 +255,54 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Model+' => '',
 	'Class:Model/Attribute:brand_id' => 'Marke',
 	'Class:Model/Attribute:brand_id+' => '',
-	'Class:Model/Attribute:Type' => 'Gerätetyp',
-	'Class:Model/Attribute:Type+' => '',
-	'Class:Model/Attribute:Type/Value:DiskArray' => 'Plattenarray',
-	'Class:Model/Attribute:Type/Value:DiskArray+' => '',
-	'Class:Model/Attribute:Type/Value:Enclosure' => 'Enclosure',
-	'Class:Model/Attribute:Type/Value:Enclosure+' => '',
-	'Class:Model/Attribute:Type/Value:IpPhone' => 'IP-Telefon',
-	'Class:Model/Attribute:Type/Value:IpPhone+' => '',
-	'Class:Model/Attribute:Type/Value:MobilePhone' => 'Mobiltelefon',
-	'Class:Model/Attribute:Type/Value:MobilePhone+' => '',
-	'Class:Model/Attribute:Type/Value:NAS' => 'NAS',
-	'Class:Model/Attribute:Type/Value:NAS+' => '',
-	'Class:Model/Attribute:Type/Value:NetworkDevice' => 'Netzwerkgerät',
-	'Class:Model/Attribute:Type/Value:NetworkDevice+' => '',
-	'Class:Model/Attribute:Type/Value:PC' => 'PC',
-	'Class:Model/Attribute:Type/Value:PC+' => '',
-	'Class:Model/Attribute:Type/Value:PDU' => 'PDU',
-	'Class:Model/Attribute:Type/Value:PDU+' => '',
-	'Class:Model/Attribute:Type/Value:Peripheral' => 'Peripheriegeräte',
-	'Class:Model/Attribute:Type/Value:Peripheral+' => '',
-	'Class:Model/Attribute:Type/Value:PowerSource' => 'Stromquelle',
-	'Class:Model/Attribute:Type/Value:PowerSource+' => '',
-	'Class:Model/Attribute:Type/Value:Printer' => 'Drucker',
-	'Class:Model/Attribute:Type/Value:Printer+' => '',
-	'Class:Model/Attribute:Type/Value:Rack' => 'Rack',
-	'Class:Model/Attribute:Type/Value:Rack+' => '',
-	'Class:Model/Attribute:Type/Value:SANswitch' => 'SAN-Switch',
-	'Class:Model/Attribute:Type/Value:SANswitch+' => '',
-	'Class:Model/Attribute:Type/Value:Server' => 'Server',
-	'Class:Model/Attribute:Type/Value:Server+' => '',
-	'Class:Model/Attribute:Type/Value:StorageSystem' => 'Storage-System',
-	'Class:Model/Attribute:Type/Value:StorageSystem+' => '',
-	'Class:Model/Attribute:Type/Value:Tablet' => 'Tablet',
-	'Class:Model/Attribute:Type/Value:Tablet+' => '',
-	'Class:Model/Attribute:Type/Value:TapeLibrary' => 'Tape-Library',
-	'Class:Model/Attribute:Type/Value:TapeLibrary+' => '',
-	'Class:Model/Attribute:Type/Value:Telephone' => 'Telefon',
-	'Class:Model/Attribute:Type/Value:Telephone+' => '',
+	'Class:Model/Attribute:type' => 'Gerätetyp',
+	'Class:Model/Attribute:type+' => '',
+	'Class:Model/Attribute:type/Value:DiskArray' => 'Plattenarray',
+	'Class:Model/Attribute:type/Value:DiskArray+' => '',
+	'Class:Model/Attribute:type/Value:Enclosure' => 'Enclosure',
+	'Class:Model/Attribute:type/Value:Enclosure+' => '',
+	'Class:Model/Attribute:type/Value:IPPhone' => 'IP-Telefon',
+	'Class:Model/Attribute:type/Value:IPPhone+' => '',
+	'Class:Model/Attribute:type/Value:MobilePhone' => 'Mobiltelefon',
+	'Class:Model/Attribute:type/Value:MobilePhone+' => '',
+	'Class:Model/Attribute:type/Value:NAS' => 'NAS',
+	'Class:Model/Attribute:type/Value:NAS+' => '',
+	'Class:Model/Attribute:type/Value:NetworkDevice' => 'Netzwerkgerät',
+	'Class:Model/Attribute:type/Value:NetworkDevice+' => '',
+	'Class:Model/Attribute:type/Value:PC' => 'PC',
+	'Class:Model/Attribute:type/Value:PC+' => '',
+	'Class:Model/Attribute:type/Value:PDU' => 'PDU',
+	'Class:Model/Attribute:type/Value:PDU+' => '',
+	'Class:Model/Attribute:type/Value:Peripheral' => 'Peripheriegeräte',
+	'Class:Model/Attribute:type/Value:Peripheral+' => '',
+	'Class:Model/Attribute:type/Value:PowerSource' => 'Stromquelle',
+	'Class:Model/Attribute:type/Value:PowerSource+' => '',
+	'Class:Model/Attribute:type/Value:Printer' => 'Drucker',
+	'Class:Model/Attribute:type/Value:Printer+' => '',
+	'Class:Model/Attribute:type/Value:Rack' => 'Rack',
+	'Class:Model/Attribute:type/Value:Rack+' => '',
+	'Class:Model/Attribute:type/Value:SANSwitch' => 'SAN-Switch',
+	'Class:Model/Attribute:type/Value:SANSwitch+' => '',
+	'Class:Model/Attribute:type/Value:Server' => 'Server',
+	'Class:Model/Attribute:type/Value:Server+' => '',
+	'Class:Model/Attribute:type/Value:StorageSystem' => 'Storage-System',
+	'Class:Model/Attribute:type/Value:StorageSystem+' => '',
+	'Class:Model/Attribute:type/Value:Tablet' => 'Tablet',
+	'Class:Model/Attribute:type/Value:Tablet+' => '',
+	'Class:Model/Attribute:type/Value:TapeLibrary' => 'Tape-Library',
+	'Class:Model/Attribute:type/Value:TapeLibrary+' => '',
+	'Class:Model/Attribute:type/Value:Telephone' => 'Telefon',
+	'Class:Model/Attribute:type/Value:Telephone+' => '',
 	'Class:Model/Attribute:physicaldevices_list' => 'Phyische Geräte',
 	'Class:Model/Attribute:physicaldevices_list+' => '',
 	'Class:NetworkDeviceType' => 'Netzerkgerätetyp',
 	'Class:NetworkDeviceType+' => '',
 	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list' => 'Netzwerkgeräte',
 	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => '',
-	'Class:IOSversion' => 'IOS-Version',
-	'Class:IOSversion+' => '',
-	'Class:IOSversion/Attribute:brand_id' => 'Marke',
-	'Class:IOSversion/Attribute:brand_id+' => '',
+	'Class:IOSVersion' => 'IOS-Version',
+	'Class:IOSVersion+' => '',
+	'Class:IOSVersion/Attribute:brand_id' => 'Marke',
+	'Class:IOSVersion/Attribute:brand_id+' => '',
 	'Class:lnkDocumentToPatch' => 'Verknüpfung Dokument/Patch',
 	'Class:lnkDocumentToPatch+' => '',
 	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Patch',
@@ -315,12 +315,12 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id' => 'Software-Instanz',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id+' => '',
-	'Class:lnkFunctionalCIToOSpatch' => 'Verknüpfung FunctionalCI/OS-Patch',
-	'Class:lnkFunctionalCIToOSpatch+' => '',
-	'Class:lnkFunctionalCIToOSpatch/Attribute:ospatch_id' => 'OS-Patch',
-	'Class:lnkFunctionalCIToOSpatch/Attribute:ospatch_id+' => '',
-	'Class:lnkFunctionalCIToOSpatch/Attribute:functionalci_id' => 'FunctionalCI',
-	'Class:lnkFunctionalCIToOSpatch/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToOSPatch' => 'Verknüpfung FunctionalCI/OS-Patch',
+	'Class:lnkFunctionalCIToOSPatch+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'OS-Patch',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id' => 'FunctionalCI',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id+' => '',
 	'Class:lnkDocumentToSoftware' => 'Verknüpfung Dokument/Software',
 	'Class:lnkDocumentToSoftware+' => '',
 	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Software',
@@ -593,8 +593,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:MobilePhone/Attribute:imei+' => '',
 	'Class:MobilePhone/Attribute:hw_pin' => 'Hardware-PIN',
 	'Class:MobilePhone/Attribute:hw_pin+' => '',
-	'Class:IpPhone' => 'IP-Telefon',
-	'Class:IpPhone+' => '',
+	'Class:IPPhone' => 'IP-Telefon',
+	'Class:IPPhone+' => '',
 	'Class:Tablet' => 'Tablet',
 	'Class:Tablet+' => '',
 	'Class:DatacenterDevice' => 'Datacenter-Gerät',
@@ -855,20 +855,20 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Tape/Attribute:tapelibrary_id+' => '',
 	'Class:Tape/Attribute:tapelibrary_name' => 'Tape-Library-Name',
 	'Class:Tape/Attribute:tapelibrary_name+' => '',
-	'Class:NasFileSystem' => 'NAS-Dateisystem',
-	'Class:NasFileSystem+' => '',
-	'Class:NasFileSystem/Attribute:name' => 'Name',
-	'Class:NasFileSystem/Attribute:name+' => '',
-	'Class:NasFileSystem/Attribute:description' => 'Beschreibung',
-	'Class:NasFileSystem/Attribute:description+' => '',
-	'Class:NasFileSystem/Attribute:raid_level' => 'Raid-Level',
-	'Class:NasFileSystem/Attribute:raid_level+' => '',
-	'Class:NasFileSystem/Attribute:size' => 'Größe',
-	'Class:NasFileSystem/Attribute:size+' => '',
-	'Class:NasFileSystem/Attribute:nas_id' => 'NAS',
-	'Class:NasFileSystem/Attribute:nas_id+' => '',
-	'Class:NasFileSystem/Attribute:nas_name' => 'NAS-Name',
-	'Class:NasFileSystem/Attribute:nas_name+' => '',
+	'Class:NASFileSystem' => 'NAS-Dateisystem',
+	'Class:NASFileSystem+' => '',
+	'Class:NASFileSystem/Attribute:name' => 'Name',
+	'Class:NASFileSystem/Attribute:name+' => '',
+	'Class:NASFileSystem/Attribute:description' => 'Beschreibung',
+	'Class:NASFileSystem/Attribute:description+' => '',
+	'Class:NASFileSystem/Attribute:raid_level' => 'Raid-Level',
+	'Class:NASFileSystem/Attribute:raid_level+' => '',
+	'Class:NASFileSystem/Attribute:size' => 'Größe',
+	'Class:NASFileSystem/Attribute:size+' => '',
+	'Class:NASFileSystem/Attribute:nas_id' => 'NAS',
+	'Class:NASFileSystem/Attribute:nas_id+' => '',
+	'Class:NASFileSystem/Attribute:nas_name' => 'NAS-Name',
+	'Class:NASFileSystem/Attribute:nas_name+' => '',
 	'Class:Patch' => 'Patch',
 	'Class:Patch+' => '',
 	'Class:Patch/Attribute:name' => 'Name',
@@ -879,8 +879,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Patch/Attribute:description+' => '',
 	'Class:Patch/Attribute:finalclass' => 'Typ',
 	'Class:Patch/Attribute:finalclass+' => '',
-	'Class:OSpatch/Attribute:osversion_name' => 'OS-Versionsname',
-	'Class:OSpatch/Attribute:osversion_name+' => '',
+	'Class:OSPatch/Attribute:osversion_name' => 'OS-Versionsname',
+	'Class:OSPatch/Attribute:osversion_name+' => '',
 	'Class:SoftwarePatch/Attribute:software_name' => 'Software-Name',
 	'Class:SoftwarePatch/Attribute:software_name+' => '',
 	'Class:Licence' => 'Lizenz',
@@ -905,10 +905,10 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Licence/Attribute:licence_key+' => '',
 	'Class:Licence/Attribute:finalclass' => 'Typ',
 	'Class:Licence/Attribute:finalclass+' => '',
-	'Class:OsLicence/Attribute:osversion_name' => 'OS-Versionsname',
-	'Class:OsLicence/Attribute:osversion_name+' => '',
-	'Class:OsLicence/Attribute:virtualmachines_list' => 'Virtuelle Maschinen',
-	'Class:OsLicence/Attribute:virtualmachines_list+' => '',
+	'Class:OSLicence/Attribute:osversion_name' => 'OS-Versionsname',
+	'Class:OSLicence/Attribute:osversion_name+' => '',
+	'Class:OSLicence/Attribute:virtualmachines_list' => 'Virtuelle Maschinen',
+	'Class:OSLicence/Attribute:virtualmachines_list+' => '',
 	'Class:SoftwareLicence/Attribute:software_name' => 'Software-Name',
 	'Class:SoftwareLicence/Attribute:software_name+' => '',
 	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Lizenz-Name',
@@ -921,12 +921,12 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Typology/Attribute:name+' => '',
 	'Class:Typology/Attribute:finalclass' => 'Typ',
 	'Class:Typology/Attribute:finalclass+' => '',
-	'Class:OSversion/Attribute:osfamily_name' => 'OS-Familienname',
-	'Class:OSversion/Attribute:osfamily_name+' => '',
+	'Class:OSVersion/Attribute:osfamily_name' => 'OS-Familienname',
+	'Class:OSVersion/Attribute:osfamily_name+' => '',
 	'Class:Model/Attribute:brand_name' => 'Markenname',
 	'Class:Model/Attribute:brand_name+' => '',
-	'Class:IOSversion/Attribute:brand_name' => 'Markenname',
-	'Class:IOSversion/Attribute:brand_name+' => '',
+	'Class:IOSVersion/Attribute:brand_name' => 'Markenname',
+	'Class:IOSVersion/Attribute:brand_name+' => '',
 	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Patch-Name',
 	'Class:lnkDocumentToPatch/Attribute:patch_name+' => '',
 	'Class:lnkDocumentToPatch/Attribute:document_name' => 'Dokument-Name',
@@ -935,10 +935,10 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name+' => '',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name' => 'Software-Instanz-Name',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name+' => '',
-	'Class:lnkFunctionalCIToOSpatch/Attribute:ospatch_name' => 'OS-Patch-Name',
-	'Class:lnkFunctionalCIToOSpatch/Attribute:ospatch_name+' => '',
-	'Class:lnkFunctionalCIToOSpatch/Attribute:functionalci_name' => 'FunctionalCI-Name',
-	'Class:lnkFunctionalCIToOSpatch/Attribute:functionalci_name+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'OS-Patch-Name',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name' => 'FunctionalCI-Name',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name+' => '',
 	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Software-Name',
 	'Class:lnkDocumentToSoftware/Attribute:software_name+' => '',
 	'Class:lnkDocumentToSoftware/Attribute:document_name' => 'Dokument-Name',
@@ -959,20 +959,20 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:NetworkInterface/Attribute:name+' => '',
 	'Class:NetworkInterface/Attribute:finalclass' => 'Typ',
 	'Class:NetworkInterface/Attribute:finalclass+' => '',
-	'Class:IPinterface' => 'IP-Interface',
-	'Class:IPinterface+' => '',
-	'Class:IPinterface/Attribute:ipaddress' => 'IP-Adresse',
-	'Class:IPinterface/Attribute:ipaddress+' => '',
-	'Class:IPinterface/Attribute:macaddress' => 'MAC-Adresse',
-	'Class:IPinterface/Attribute:macaddress+' => '',
-	'Class:IPinterface/Attribute:comment' => 'Kommentar',
-	'Class:IPinterface/Attribute:coment+' => '',
-	'Class:IPinterface/Attribute:ipgateway' => 'IP-Gateway',
-	'Class:IPinterface/Attribute:ipgateway+' => '',
-	'Class:IPinterface/Attribute:ipmask' => 'IP-Maske',
-	'Class:IPinterface/Attribute:ipmask+' => '',
-	'Class:IPinterface/Attribute:speed' => 'Geschwindigkeit',
-	'Class:IPinterface/Attribute:speed+' => '',
+	'Class:IPInterface' => 'IP-Interface',
+	'Class:IPInterface+' => '',
+	'Class:IPInterface/Attribute:ipaddress' => 'IP-Adresse',
+	'Class:IPInterface/Attribute:ipaddress+' => '',
+	'Class:IPInterface/Attribute:macaddress' => 'MAC-Adresse',
+	'Class:IPInterface/Attribute:macaddress+' => '',
+	'Class:IPInterface/Attribute:comment' => 'Kommentar',
+	'Class:IPInterface/Attribute:coment+' => '',
+	'Class:IPInterface/Attribute:ipgateway' => 'IP-Gateway',
+	'Class:IPInterface/Attribute:ipgateway+' => '',
+	'Class:IPInterface/Attribute:ipmask' => 'IP-Maske',
+	'Class:IPInterface/Attribute:ipmask+' => '',
+	'Class:IPInterface/Attribute:speed' => 'Geschwindigkeit',
+	'Class:IPInterface/Attribute:speed+' => '',
 	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Gerätename',
 	'Class:PhysicalInterface/Attribute:connectableci_name+' => '',
 	'Class:LogicalInterface' => 'Logisches Interface',

datamodels/2.x/itop-config-mgmt/es_cr.dict.itop-config-mgmt.php

@@ -419,8 +419,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 //
 
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
-	'Class:IpPhone' => 'Teléfono IP',
-	'Class:IpPhone+' => 'Teléfono IP',
+	'Class:IPPhone' => 'Teléfono IP',
+	'Class:IPPhone+' => 'Teléfono IP',
 ));
 
 //
@@ -754,10 +754,10 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 //
 
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
-	'Class:DBserver' => 'Servidor de Base de Datos',
-	'Class:DBserver+' => 'Servidor de Base de Datos',
-	'Class:DBserver/Attribute:dbschema_list' => 'Esquema de BD',
-	'Class:DBserver/Attribute:dbschema_list+' => 'Esquema de BD',
+	'Class:DBServer' => 'Servidor de Base de Datos',
+	'Class:DBServer+' => 'Servidor de Base de Datos',
+	'Class:DBServer/Attribute:dbschema_list' => 'Esquema de BD',
+	'Class:DBServer/Attribute:dbschema_list+' => 'Esquema de BD',
 ));
 
 //
@@ -765,10 +765,10 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 //
 
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
-	'Class:Webserver' => 'Servidor Web',
-	'Class:Webserver+' => 'Servidor Web',
-	'Class:Webserver/Attribute:webapp_list' => 'Aplicaciones Web',
-	'Class:Webserver/Attribute:webapp_list+' => 'Aplicaciones Web',
+	'Class:WebServer' => 'Servidor Web',
+	'Class:WebServer+' => 'Servidor Web',
+	'Class:WebServer/Attribute:webapp_list' => 'Aplicaciones Web',
+	'Class:WebServer/Attribute:webapp_list+' => 'Aplicaciones Web',
 ));
 
 //
@@ -1031,20 +1031,20 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 //
 
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
-	'Class:NasFileSystem' => 'Filesysten en NAS',
-	'Class:NasFileSystem+' => 'Filesysten en NAS',
-	'Class:NasFileSystem/Attribute:name' => 'Nombre',
-	'Class:NasFileSystem/Attribute:name+' => 'Nombre',
-	'Class:NasFileSystem/Attribute:description' => 'Descripción',
-	'Class:NasFileSystem/Attribute:description+' => 'Descripción',
-	'Class:NasFileSystem/Attribute:raid_level' => 'Nivel de RAID',
-	'Class:NasFileSystem/Attribute:raid_level+' => 'Nivel de RAID',
-	'Class:NasFileSystem/Attribute:size' => 'Tamaño',
-	'Class:NasFileSystem/Attribute:size+' => 'Tamaño',
-	'Class:NasFileSystem/Attribute:nas_id' => 'NAS',
-	'Class:NasFileSystem/Attribute:nas_id+' => 'NAS',
-	'Class:NasFileSystem/Attribute:nas_name' => 'NAS',
-	'Class:NasFileSystem/Attribute:nas_name+' => 'NAS',
+	'Class:NASFileSystem' => 'Filesysten en NAS',
+	'Class:NASFileSystem+' => 'Filesysten en NAS',
+	'Class:NASFileSystem/Attribute:name' => 'Nombre',
+	'Class:NASFileSystem/Attribute:name+' => 'Nombre',
+	'Class:NASFileSystem/Attribute:description' => 'Descripción',
+	'Class:NASFileSystem/Attribute:description+' => 'Descripción',
+	'Class:NASFileSystem/Attribute:raid_level' => 'Nivel de RAID',
+	'Class:NASFileSystem/Attribute:raid_level+' => 'Nivel de RAID',
+	'Class:NASFileSystem/Attribute:size' => 'Tamaño',
+	'Class:NASFileSystem/Attribute:size+' => 'Tamaño',
+	'Class:NASFileSystem/Attribute:nas_id' => 'NAS',
+	'Class:NASFileSystem/Attribute:nas_id+' => 'NAS',
+	'Class:NASFileSystem/Attribute:nas_name' => 'NAS',
+	'Class:NASFileSystem/Attribute:nas_name+' => 'NAS',
 ));
 
 //
@@ -1064,16 +1064,16 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Software/Attribute:documents_list+' => 'Documentos',
 	'Class:Software/Attribute:type' => 'Tipo',
 	'Class:Software/Attribute:type+' => 'Tipo',
-	'Class:Software/Attribute:type/Value:DBserver' => 'Servidor de BD',
-	'Class:Software/Attribute:type/Value:DBserver+' => 'Servidor de BD',
+	'Class:Software/Attribute:type/Value:DBServer' => 'Servidor de BD',
+	'Class:Software/Attribute:type/Value:DBServer+' => 'Servidor de BD',
 	'Class:Software/Attribute:type/Value:Middleware' => 'Middleware',
 	'Class:Software/Attribute:type/Value:Middleware+' => 'Middleware',
 	'Class:Software/Attribute:type/Value:OtherSoftware' => 'Otro Software',
 	'Class:Software/Attribute:type/Value:OtherSoftware+' => 'Otro Software',
 	'Class:Software/Attribute:type/Value:PCSoftware' => 'Software de PC',
 	'Class:Software/Attribute:type/Value:PCSoftware+' => 'Software de PC',
-	'Class:Software/Attribute:type/Value:Webserver' => 'Servidor Web',
-	'Class:Software/Attribute:type/Value:Webserver+' => 'Servidor Web',
+	'Class:Software/Attribute:type/Value:WebServer' => 'Servidor Web',
+	'Class:Software/Attribute:type/Value:WebServer+' => 'Servidor Web',
 	'Class:Software/Attribute:softwareinstance_list' => 'Instalaciones de Software',
 	'Class:Software/Attribute:softwareinstance_list+' => 'Instalaciones de Software',
 	'Class:Software/Attribute:softwarepatch_list' => 'Parches de Software',
@@ -1104,14 +1104,14 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 //
 
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
-	'Class:OSpatch' => 'Parche de SO',
-	'Class:OSpatch+' => 'Parche de SO',
-	'Class:OSpatch/Attribute:functionalcis_list' => 'Dispositivos',
-	'Class:OSpatch/Attribute:functionalcis_list+' => 'Dispositivos',
-	'Class:OSpatch/Attribute:osversion_id' => 'Versión de SO',
-	'Class:OSpatch/Attribute:osversion_id+' => 'Versión de SO',
-	'Class:OSpatch/Attribute:osversion_name' => 'Versión de SO',
-	'Class:OSpatch/Attribute:osversion_name+' => 'Versión de SO',
+	'Class:OSPatch' => 'Parche de SO',
+	'Class:OSPatch+' => 'Parche de SO',
+	'Class:OSPatch/Attribute:functionalcis_list' => 'Dispositivos',
+	'Class:OSPatch/Attribute:functionalcis_list+' => 'Dispositivos',
+	'Class:OSPatch/Attribute:osversion_id' => 'Versión de SO',
+	'Class:OSPatch/Attribute:osversion_id+' => 'Versión de SO',
+	'Class:OSPatch/Attribute:osversion_name' => 'Versión de SO',
+	'Class:OSPatch/Attribute:osversion_name+' => 'Versión de SO',
 ));
 
 //
@@ -1163,16 +1163,16 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 //
 
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
-	'Class:OsLicence' => 'Licencia de SO',
-	'Class:OsLicence+' => 'Licencia de SO',
-	'Class:OsLicence/Attribute:osversion_id' => 'Versión de SO',
-	'Class:OsLicence/Attribute:osversion_id+' => 'Versión de SO',
-	'Class:OsLicence/Attribute:osversion_name' => 'Versión de SO',
-	'Class:OsLicence/Attribute:osversion_name+' => 'Versión de SO',
-	'Class:OsLicence/Attribute:virtualmachines_list' => 'Máquinas Virtuales',
-	'Class:OsLicence/Attribute:virtualmachines_list+' => 'Máquinas Virtuales',
-	'Class:OsLicence/Attribute:servers_list' => 'Servidores',
-	'Class:OsLicence/Attribute:servers_list+' => 'Servidores',
+	'Class:OSLicence' => 'Licencia de SO',
+	'Class:OSLicence+' => 'Licencia de SO',
+	'Class:OSLicence/Attribute:osversion_id' => 'Versión de SO',
+	'Class:OSLicence/Attribute:osversion_id+' => 'Versión de SO',
+	'Class:OSLicence/Attribute:osversion_name' => 'Versión de SO',
+	'Class:OSLicence/Attribute:osversion_name+' => 'Versión de SO',
+	'Class:OSLicence/Attribute:virtualmachines_list' => 'Máquinas Virtuales',
+	'Class:OSLicence/Attribute:virtualmachines_list+' => 'Máquinas Virtuales',
+	'Class:OSLicence/Attribute:servers_list' => 'Servidores',
+	'Class:OSLicence/Attribute:servers_list+' => 'Servidores',
 ));
 
 //
@@ -1225,12 +1225,12 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 //
 
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
-	'Class:OSversion' => 'Versión de SO',
-	'Class:OSversion+' => 'Versión de SO',
-	'Class:OSversion/Attribute:osfamily_id' => 'Familia de SO',
-	'Class:OSversion/Attribute:osfamily_id+' => 'Familia de SO',
-	'Class:OSversion/Attribute:osfamily_name' => 'Familia de SO',
-	'Class:OSversion/Attribute:osfamily_name+' => 'Familia de SO',
+	'Class:OSVersion' => 'Versión de SO',
+	'Class:OSVersion+' => 'Versión de SO',
+	'Class:OSVersion/Attribute:osfamily_id' => 'Familia de SO',
+	'Class:OSVersion/Attribute:osfamily_id+' => 'Familia de SO',
+	'Class:OSVersion/Attribute:osfamily_name' => 'Familia de SO',
+	'Class:OSVersion/Attribute:osfamily_name+' => 'Familia de SO',
 ));
 
 //
@@ -1238,8 +1238,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 //
 
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
-	'Class:OSfamily' => 'Familia de SO',
-	'Class:OSfamily+' => 'Familia de SO',
+	'Class:OSFamily' => 'Familia de SO',
+	'Class:OSFamily+' => 'Familia de SO',
 ));
 
 //
@@ -1282,44 +1282,44 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Model/Attribute:brand_id+' => 'Marca',
 	'Class:Model/Attribute:brand_name' => 'Marca',
 	'Class:Model/Attribute:brand_name+' => 'Marca',
-	'Class:Model/Attribute:Type' => 'Tipo de Dispositivo',
-	'Class:Model/Attribute:Type+' => 'Tipo de Dispositivo',
-	'Class:Model/Attribute:Type/Value:PowerSource' => 'Fuente de Poder',
-	'Class:Model/Attribute:Type/Value:PowerSource+' => 'Fuente de Poder',
-	'Class:Model/Attribute:Type/Value:DiskArray' => 'Arreglo de Discos',
-	'Class:Model/Attribute:Type/Value:DiskArray+' => 'Arreglo de Discos',
-	'Class:Model/Attribute:Type/Value:Enclosure' => 'Enclosure',
-	'Class:Model/Attribute:Type/Value:Enclosure+' => 'Enclosure',
-	'Class:Model/Attribute:Type/Value:IpPhone' => 'Teléfono IP',
-	'Class:Model/Attribute:Type/Value:IpPhone+' => 'Teléfono IP',
-	'Class:Model/Attribute:Type/Value:MobilePhone' => 'Teléfono Móvil',
-	'Class:Model/Attribute:Type/Value:MobilePhone+' => 'Teléfono Móvil',
-	'Class:Model/Attribute:Type/Value:NAS' => 'NAS',
-	'Class:Model/Attribute:Type/Value:NAS+' => 'NAS',
-	'Class:Model/Attribute:Type/Value:NetworkDevice' => 'Dispositivo de Red',
-	'Class:Model/Attribute:Type/Value:NetworkDevice+' => 'Dispositivo de Red',
-	'Class:Model/Attribute:Type/Value:PC' => 'PC/Laptop',
-	'Class:Model/Attribute:Type/Value:PC+' => 'PC/Laptor',
-	'Class:Model/Attribute:Type/Value:PDU' => 'PDU',
-	'Class:Model/Attribute:Type/Value:PDU+' => 'PDU',
-	'Class:Model/Attribute:Type/Value:Peripheral' => 'Periférico',
-	'Class:Model/Attribute:Type/Value:Peripheral+' => 'Periférico',
-	'Class:Model/Attribute:Type/Value:Printer' => 'Impresora',
-	'Class:Model/Attribute:Type/Value:Printer+' => 'Impresora',
-	'Class:Model/Attribute:Type/Value:Rack' => 'Rack',
-	'Class:Model/Attribute:Type/Value:Rack+' => 'Rack',
-	'Class:Model/Attribute:Type/Value:SANswitch' => 'Switch de SAN',
-	'Class:Model/Attribute:Type/Value:SANswitch+' => 'Switch de SAN',
-	'Class:Model/Attribute:Type/Value:Server' => 'Servidor',
-	'Class:Model/Attribute:Type/Value:Server+' => 'Servidor',
-	'Class:Model/Attribute:Type/Value:StorageSystem' => 'Sistema de Almacenamiento',
-	'Class:Model/Attribute:Type/Value:StorageSystem+' => 'Sistema de Almacenamiento',
-	'Class:Model/Attribute:Type/Value:Tablet' => 'Tableta',
-	'Class:Model/Attribute:Type/Value:Tablet+' => 'Tableta',
-	'Class:Model/Attribute:Type/Value:TapeLibrary' => 'Librería de Cinta',
-	'Class:Model/Attribute:Type/Value:TapeLibrary+' => 'Librería de Cinta',
-	'Class:Model/Attribute:Type/Value:Telephone' => 'Teléfono',
-	'Class:Model/Attribute:Type/Value:Telephone+' => 'Teléfono',
+	'Class:Model/Attribute:type' => 'Tipo de Dispositivo',
+	'Class:Model/Attribute:type+' => 'Tipo de Dispositivo',
+	'Class:Model/Attribute:type/Value:PowerSource' => 'Fuente de Poder',
+	'Class:Model/Attribute:type/Value:PowerSource+' => 'Fuente de Poder',
+	'Class:Model/Attribute:type/Value:DiskArray' => 'Arreglo de Discos',
+	'Class:Model/Attribute:type/Value:DiskArray+' => 'Arreglo de Discos',
+	'Class:Model/Attribute:type/Value:Enclosure' => 'Enclosure',
+	'Class:Model/Attribute:type/Value:Enclosure+' => 'Enclosure',
+	'Class:Model/Attribute:type/Value:IPPhone' => 'Teléfono IP',
+	'Class:Model/Attribute:type/Value:IPPhone+' => 'Teléfono IP',
+	'Class:Model/Attribute:type/Value:MobilePhone' => 'Teléfono Móvil',
+	'Class:Model/Attribute:type/Value:MobilePhone+' => 'Teléfono Móvil',
+	'Class:Model/Attribute:type/Value:NAS' => 'NAS',
+	'Class:Model/Attribute:type/Value:NAS+' => 'NAS',
+	'Class:Model/Attribute:type/Value:NetworkDevice' => 'Dispositivo de Red',
+	'Class:Model/Attribute:type/Value:NetworkDevice+' => 'Dispositivo de Red',
+	'Class:Model/Attribute:type/Value:PC' => 'PC/Laptop',
+	'Class:Model/Attribute:type/Value:PC+' => 'PC/Laptor',
+	'Class:Model/Attribute:type/Value:PDU' => 'PDU',
+	'Class:Model/Attribute:type/Value:PDU+' => 'PDU',
+	'Class:Model/Attribute:type/Value:Peripheral' => 'Periférico',
+	'Class:Model/Attribute:type/Value:Peripheral+' => 'Periférico',
+	'Class:Model/Attribute:type/Value:Printer' => 'Impresora',
+	'Class:Model/Attribute:type/Value:Printer+' => 'Impresora',
+	'Class:Model/Attribute:type/Value:Rack' => 'Rack',
+	'Class:Model/Attribute:type/Value:Rack+' => 'Rack',
+	'Class:Model/Attribute:type/Value:SANSwitch' => 'Switch de SAN',
+	'Class:Model/Attribute:type/Value:SANSwitch+' => 'Switch de SAN',
+	'Class:Model/Attribute:type/Value:Server' => 'Servidor',
+	'Class:Model/Attribute:type/Value:Server+' => 'Servidor',
+	'Class:Model/Attribute:type/Value:StorageSystem' => 'Sistema de Almacenamiento',
+	'Class:Model/Attribute:type/Value:StorageSystem+' => 'Sistema de Almacenamiento',
+	'Class:Model/Attribute:type/Value:Tablet' => 'Tableta',
+	'Class:Model/Attribute:type/Value:Tablet+' => 'Tableta',
+	'Class:Model/Attribute:type/Value:TapeLibrary' => 'Librería de Cinta',
+	'Class:Model/Attribute:type/Value:TapeLibrary+' => 'Librería de Cinta',
+	'Class:Model/Attribute:type/Value:Telephone' => 'Teléfono',
+	'Class:Model/Attribute:type/Value:Telephone+' => 'Teléfono',
 	'Class:Model/Attribute:physicaldevices_list' => 'Dispositivo Físico',
 	'Class:Model/Attribute:physicaldevices_list+' => 'Dispositivo Físico',
 ));
@@ -1340,12 +1340,12 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 //
 
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
-	'Class:IOSversion' => 'Versión de IOS',
-	'Class:IOSversion+' => 'Versión de IOS',
-	'Class:IOSversion/Attribute:brand_id' => 'Marca',
-	'Class:IOSversion/Attribute:brand_id+' => 'Marca',
-	'Class:IOSversion/Attribute:brand_name' => 'Marca',
-	'Class:IOSversion/Attribute:brand_name+' => 'Marca',
+	'Class:IOSVersion' => 'Versión de IOS',
+	'Class:IOSVersion+' => 'Versión de IOS',
+	'Class:IOSVersion/Attribute:brand_id' => 'Marca',
+	'Class:IOSVersion/Attribute:brand_id+' => 'Marca',
+	'Class:IOSVersion/Attribute:brand_name' => 'Marca',
+	'Class:IOSVersion/Attribute:brand_name+' => 'Marca',
 ));
 
 //
@@ -1387,16 +1387,16 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 //
 
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
-	'Class:lnkFunctionalCIToOSpatch' => 'Relación EC Funcional y Parche de SO',
-	'Class:lnkFunctionalCIToOSpatch+' => 'Relación EC Funcional y Parche de SO',
-	'Class:lnkFunctionalCIToOSpatch/Attribute:ospatch_id' => 'Parche de SO',
-	'Class:lnkFunctionalCIToOSpatch/Attribute:ospatch_id+' => 'Parche de SO',
-	'Class:lnkFunctionalCIToOSpatch/Attribute:ospatch_name' => 'Parche de SO',
-	'Class:lnkFunctionalCIToOSpatch/Attribute:ospatch_name+' => 'Parche de SO',
-	'Class:lnkFunctionalCIToOSpatch/Attribute:functionalci_id' => 'EC Funcional',
-	'Class:lnkFunctionalCIToOSpatch/Attribute:functionalci_id+' => 'EC Funcional',
-	'Class:lnkFunctionalCIToOSpatch/Attribute:functionalci_name' => 'EC Funcional',
-	'Class:lnkFunctionalCIToOSpatch/Attribute:functionalci_name+' => 'EC Funcional',
+	'Class:lnkFunctionalCIToOSPatch' => 'Relación EC Funcional y Parche de SO',
+	'Class:lnkFunctionalCIToOSPatch+' => 'Relación EC Funcional y Parche de SO',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'Parche de SO',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => 'Parche de SO',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'Parche de SO',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name+' => 'Parche de SO',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id' => 'EC Funcional',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id+' => 'EC Funcional',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name' => 'EC Funcional',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name+' => 'EC Funcional',
 ));
 
 //
@@ -1487,20 +1487,20 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 //
 
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
-	'Class:IPinterface' => 'Interfaz IP',
-	'Class:IPinterface+' => 'Interfaz IP',
-	'Class:IPinterface/Attribute:ipaddress' => 'Dirección IP',
-	'Class:IPinterface/Attribute:ipaddress+' => 'Dirección IP',
-	'Class:IPinterface/Attribute:macaddress' => 'Dirección MAC',
-	'Class:IPinterface/Attribute:macaddress+' => 'Dirección MAC',
-	'Class:IPinterface/Attribute:comment' => 'Comentario',
-	'Class:IPinterface/Attribute:coment+' => 'Comentario',
-	'Class:IPinterface/Attribute:ipgateway' => 'Gateway IP',
-	'Class:IPinterface/Attribute:ipgateway+' => 'Gateway IP',
-	'Class:IPinterface/Attribute:ipmask' => 'Máscara de Red',
-	'Class:IPinterface/Attribute:ipmask+' => 'Máscara de Red',
-	'Class:IPinterface/Attribute:speed' => 'Velocidad',
-	'Class:IPinterface/Attribute:speed+' => 'Velocidad',
+	'Class:IPInterface' => 'Interfaz IP',
+	'Class:IPInterface+' => 'Interfaz IP',
+	'Class:IPInterface/Attribute:ipaddress' => 'Dirección IP',
+	'Class:IPInterface/Attribute:ipaddress+' => 'Dirección IP',
+	'Class:IPInterface/Attribute:macaddress' => 'Dirección MAC',
+	'Class:IPInterface/Attribute:macaddress+' => 'Dirección MAC',
+	'Class:IPInterface/Attribute:comment' => 'Comentario',
+	'Class:IPInterface/Attribute:coment+' => 'Comentario',
+	'Class:IPInterface/Attribute:ipgateway' => 'Gateway IP',
+	'Class:IPInterface/Attribute:ipgateway+' => 'Gateway IP',
+	'Class:IPInterface/Attribute:ipmask' => 'Máscara de Red',
+	'Class:IPInterface/Attribute:ipmask+' => 'Máscara de Red',
+	'Class:IPInterface/Attribute:speed' => 'Velocidad',
+	'Class:IPInterface/Attribute:speed+' => 'Velocidad',
 ));
 
 //

datamodels/2.x/itop-config-mgmt/ja.dict.itop-config-mgmt.php

@@ -419,8 +419,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 //
 
 Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:IpPhone' => 'IP電話',
-	'Class:IpPhone+' => '',
+	'Class:IPPhone' => 'IP電話',
+	'Class:IPPhone+' => '',
 ));
 
 //
@@ -750,10 +750,10 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 //
 
 Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:DBserver' => 'DBサーバ',
-	'Class:DBserver+' => '',
-	'Class:DBserver/Attribute:dbschema_list' => 'DBスキーマ',
-	'Class:DBserver/Attribute:dbschema_list+' => '',
+	'Class:DBServer' => 'DBサーバ',
+	'Class:DBServer+' => '',
+	'Class:DBServer/Attribute:dbschema_list' => 'DBスキーマ',
+	'Class:DBServer/Attribute:dbschema_list+' => '',
 ));
 
 //
@@ -761,10 +761,10 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 //
 
 Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:Webserver' => 'Webサーバ',
-	'Class:Webserver+' => '',
-	'Class:Webserver/Attribute:webapp_list' => 'Webアプリケーション',
-	'Class:Webserver/Attribute:webapp_list+' => '',
+	'Class:WebServer' => 'Webサーバ',
+	'Class:WebServer+' => '',
+	'Class:WebServer/Attribute:webapp_list' => 'Webアプリケーション',
+	'Class:WebServer/Attribute:webapp_list+' => '',
 ));
 
 //
@@ -1027,20 +1027,20 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 //
 
 Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:NasFileSystem' => 'NASファイルシステム',
-	'Class:NasFileSystem+' => '',
-	'Class:NasFileSystem/Attribute:name' => '名前',
-	'Class:NasFileSystem/Attribute:name+' => '',
-	'Class:NasFileSystem/Attribute:description' => '説明',
-	'Class:NasFileSystem/Attribute:description+' => '',
-	'Class:NasFileSystem/Attribute:raid_level' => 'Raidレベル',
-	'Class:NasFileSystem/Attribute:raid_level+' => '',
-	'Class:NasFileSystem/Attribute:size' => 'サイズ',
-	'Class:NasFileSystem/Attribute:size+' => '',
-	'Class:NasFileSystem/Attribute:nas_id' => 'NAS',
-	'Class:NasFileSystem/Attribute:nas_id+' => '',
-	'Class:NasFileSystem/Attribute:nas_name' => 'NAS名',
-	'Class:NasFileSystem/Attribute:nas_name+' => '',
+	'Class:NASFileSystem' => 'NASファイルシステム',
+	'Class:NASFileSystem+' => '',
+	'Class:NASFileSystem/Attribute:name' => '名前',
+	'Class:NASFileSystem/Attribute:name+' => '',
+	'Class:NASFileSystem/Attribute:description' => '説明',
+	'Class:NASFileSystem/Attribute:description+' => '',
+	'Class:NASFileSystem/Attribute:raid_level' => 'Raidレベル',
+	'Class:NASFileSystem/Attribute:raid_level+' => '',
+	'Class:NASFileSystem/Attribute:size' => 'サイズ',
+	'Class:NASFileSystem/Attribute:size+' => '',
+	'Class:NASFileSystem/Attribute:nas_id' => 'NAS',
+	'Class:NASFileSystem/Attribute:nas_id+' => '',
+	'Class:NASFileSystem/Attribute:nas_name' => 'NAS名',
+	'Class:NASFileSystem/Attribute:nas_name+' => '',
 ));
 
 //
@@ -1060,16 +1060,16 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:Software/Attribute:documents_list+' => '',
 	'Class:Software/Attribute:type' => 'タイプ',
 	'Class:Software/Attribute:type+' => '',
-	'Class:Software/Attribute:type/Value:DBserver' => 'DBサーバ',
-	'Class:Software/Attribute:type/Value:DBserver+' => 'DBサーバ',
+	'Class:Software/Attribute:type/Value:DBServer' => 'DBサーバ',
+	'Class:Software/Attribute:type/Value:DBServer+' => 'DBサーバ',
 	'Class:Software/Attribute:type/Value:Middleware' => 'ミドルウエア',
 	'Class:Software/Attribute:type/Value:Middleware+' => 'ミドルウエア',
 	'Class:Software/Attribute:type/Value:OtherSoftware' => '他のソフトウエア',
 	'Class:Software/Attribute:type/Value:OtherSoftware+' => '他のソフトウエア',
 	'Class:Software/Attribute:type/Value:PCSoftware' => 'PCソフトウエア',
 	'Class:Software/Attribute:type/Value:PCSoftware+' => 'PCソフトウエア',
-	'Class:Software/Attribute:type/Value:Webserver' => 'Webサーバ',
-	'Class:Software/Attribute:type/Value:Webserver+' => 'Webサーバ',
+	'Class:Software/Attribute:type/Value:WebServer' => 'Webサーバ',
+	'Class:Software/Attribute:type/Value:WebServer+' => 'Webサーバ',
 	'Class:Software/Attribute:softwareinstance_list' => 'ソフトウエアインスタンス',
 	'Class:Software/Attribute:softwareinstance_list+' => '',
 	'Class:Software/Attribute:softwarepatch_list' => 'ソフトウエアパッチ',
@@ -1100,14 +1100,14 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 //
 
 Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:OSpatch' => 'OSパッチ',
-	'Class:OSpatch+' => '',
-	'Class:OSpatch/Attribute:functionalcis_list' => 'デバイス',
-	'Class:OSpatch/Attribute:functionalcis_list+' => '',
-	'Class:OSpatch/Attribute:osversion_id' => 'OSバージョン',
-	'Class:OSpatch/Attribute:osversion_id+' => '',
-	'Class:OSpatch/Attribute:osversion_name' => 'OSバージョン名',
-	'Class:OSpatch/Attribute:osversion_name+' => '',
+	'Class:OSPatch' => 'OSパッチ',
+	'Class:OSPatch+' => '',
+	'Class:OSPatch/Attribute:functionalcis_list' => 'デバイス',
+	'Class:OSPatch/Attribute:functionalcis_list+' => '',
+	'Class:OSPatch/Attribute:osversion_id' => 'OSバージョン',
+	'Class:OSPatch/Attribute:osversion_id+' => '',
+	'Class:OSPatch/Attribute:osversion_name' => 'OSバージョン名',
+	'Class:OSPatch/Attribute:osversion_name+' => '',
 ));
 
 //
@@ -1159,16 +1159,16 @@ Dict::Add('JA JP', 'Japanese', '日本語', array (
 //
 
 Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:OsLicence' => 'OSライセンス',
-	'Class:OsLicence+' => '',
-	'Class:OsLicence/Attribute:osversion_id' => 'OSバージョン',
-	'Class:OsLicence/Attribute:osversion_id+' => '',
-	'Class:OsLicence/Attribute:osversion_name' => 'OSバージョン名',
-	'Class:OsLicence/Attribute:osversion_name+' => '',
-	'Class:OsLicence/Attribute:virtualmachines_list' => '仮想マシン',
-	'Class:OsLicence/Attribute:virtualmachines_list+' => '',
-	'Class:OsLicence/Attribute:servers_list' => 'サーバ',
-	'Class:OsLicence/Attribute:servers_list+' => '',
+	'Class:OSLicence' => 'OSライセンス',
+	'Class:OSLicence+' => '',
+	'Class:OSLicence/Attribute:osversion_id' => 'OSバージョン',
+	'Class:OSLicence/Attribute:osversion_id+' => '',
+	'Class:OSLicence/Attribute:osversion_name' => 'OSバージョン名',
+	'Class:OSLicence/Attribute:osversion_name+' => '',
+	'Class:OSLicence/Attribute:virtualmachines_list' => '仮想マシン',
+	'Class:OSLicence/Attribute:virtualmachines_list+' => '',
+	'Class:OSLicence/Attribute:servers_list' => 'サーバ',
+	'Class:OSLicence/Attribute:servers_list+' => '',
 ));
 
 //
@@ -1221,12 +1221,12 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 //
 
 Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:OSversion' => 'OSバージョン',
-	'Class:OSversion+' => '',
-	'Class:OSversion/Attribute:osfamily_id' => 'OSファミリ',
-	'Class:OSversion/Attribute:osfamily_id+' => '',
-	'Class:OSversion/Attribute:osfamily_name' => 'OSファミリ名',
-	'Class:OSversion/Attribute:osfamily_name+' => '',
+	'Class:OSVersion' => 'OSバージョン',
+	'Class:OSVersion+' => '',
+	'Class:OSVersion/Attribute:osfamily_id' => 'OSファミリ',
+	'Class:OSVersion/Attribute:osfamily_id+' => '',
+	'Class:OSVersion/Attribute:osfamily_name' => 'OSファミリ名',
+	'Class:OSVersion/Attribute:osfamily_name+' => '',
 ));
 
 //
@@ -1234,8 +1234,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 //
 
 Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:OSfamily' => 'OSファミリ',
-	'Class:OSfamily+' => '',
+	'Class:OSFamily' => 'OSファミリ',
+	'Class:OSFamily+' => '',
 ));
 
 //
@@ -1278,44 +1278,44 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:Model/Attribute:brand_id+' => '',
 	'Class:Model/Attribute:brand_name' => 'ブランド名',
 	'Class:Model/Attribute:brand_name+' => '',
-	'Class:Model/Attribute:Type' => 'デバイスタイプ',
-	'Class:Model/Attribute:Type+' => '',
-	'Class:Model/Attribute:Type/Value:PowerSource' => '電源',
-	'Class:Model/Attribute:Type/Value:PowerSource+' => '電源',
-	'Class:Model/Attribute:Type/Value:DiskArray' => 'ディスクアレー',
-	'Class:Model/Attribute:Type/Value:DiskArray+' => 'ディスクアレー',
-	'Class:Model/Attribute:Type/Value:Enclosure' => 'エンクロージャ',
-	'Class:Model/Attribute:Type/Value:Enclosure+' => 'エンクロージャ',
-	'Class:Model/Attribute:Type/Value:IpPhone' => 'Ip電話',
-	'Class:Model/Attribute:Type/Value:IpPhone+' => 'Ip電話',
-	'Class:Model/Attribute:Type/Value:MobilePhone' => '携帯電話',
-	'Class:Model/Attribute:Type/Value:MobilePhone+' => '携帯電話',
-	'Class:Model/Attribute:Type/Value:NAS' => 'NAS',
-	'Class:Model/Attribute:Type/Value:NAS+' => 'NAS',
-	'Class:Model/Attribute:Type/Value:NetworkDevice' => 'ネットワークデバイス',
-	'Class:Model/Attribute:Type/Value:NetworkDevice+' => 'ネットワークデバイス',
-	'Class:Model/Attribute:Type/Value:PC' => 'PC',
-	'Class:Model/Attribute:Type/Value:PC+' => 'PC',
-	'Class:Model/Attribute:Type/Value:PDU' => 'PDU',
-	'Class:Model/Attribute:Type/Value:PDU+' => 'PDU',
-	'Class:Model/Attribute:Type/Value:Peripheral' => '周辺',
-	'Class:Model/Attribute:Type/Value:Peripheral+' => '周辺',
-	'Class:Model/Attribute:Type/Value:Printer' => 'プリンタ',
-	'Class:Model/Attribute:Type/Value:Printer+' => 'プリンタ',
-	'Class:Model/Attribute:Type/Value:Rack' => 'ラック',
-	'Class:Model/Attribute:Type/Value:Rack+' => 'ラック',
-	'Class:Model/Attribute:Type/Value:SANswitch' => 'SANスイッチ',
-	'Class:Model/Attribute:Type/Value:SANswitch+' => 'SANスイッチ',
-	'Class:Model/Attribute:Type/Value:Server' => 'サーバ',
-	'Class:Model/Attribute:Type/Value:Server+' => 'サーバ',
-	'Class:Model/Attribute:Type/Value:StorageSystem' => 'ストレージシステム',
-	'Class:Model/Attribute:Type/Value:StorageSystem+' => 'ストレージシステム',
-	'Class:Model/Attribute:Type/Value:Tablet' => 'タブレット',
-	'Class:Model/Attribute:Type/Value:Tablet+' => 'タブレット',
-	'Class:Model/Attribute:Type/Value:TapeLibrary' => 'テープライブラリ',
-	'Class:Model/Attribute:Type/Value:TapeLibrary+' => 'テープライブラリ',
-	'Class:Model/Attribute:Type/Value:Telephone' => '電話',
-	'Class:Model/Attribute:Type/Value:Telephone+' => '電話',
+	'Class:Model/Attribute:type' => 'デバイスタイプ',
+	'Class:Model/Attribute:type+' => '',
+	'Class:Model/Attribute:type/Value:PowerSource' => '電源',
+	'Class:Model/Attribute:type/Value:PowerSource+' => '電源',
+	'Class:Model/Attribute:type/Value:DiskArray' => 'ディスクアレー',
+	'Class:Model/Attribute:type/Value:DiskArray+' => 'ディスクアレー',
+	'Class:Model/Attribute:type/Value:Enclosure' => 'エンクロージャ',
+	'Class:Model/Attribute:type/Value:Enclosure+' => 'エンクロージャ',
+	'Class:Model/Attribute:type/Value:IPPhone' => 'Ip電話',
+	'Class:Model/Attribute:type/Value:IPPhone+' => 'Ip電話',
+	'Class:Model/Attribute:type/Value:MobilePhone' => '携帯電話',
+	'Class:Model/Attribute:type/Value:MobilePhone+' => '携帯電話',
+	'Class:Model/Attribute:type/Value:NAS' => 'NAS',
+	'Class:Model/Attribute:type/Value:NAS+' => 'NAS',
+	'Class:Model/Attribute:type/Value:NetworkDevice' => 'ネットワークデバイス',
+	'Class:Model/Attribute:type/Value:NetworkDevice+' => 'ネットワークデバイス',
+	'Class:Model/Attribute:type/Value:PC' => 'PC',
+	'Class:Model/Attribute:type/Value:PC+' => 'PC',
+	'Class:Model/Attribute:type/Value:PDU' => 'PDU',
+	'Class:Model/Attribute:type/Value:PDU+' => 'PDU',
+	'Class:Model/Attribute:type/Value:Peripheral' => '周辺',
+	'Class:Model/Attribute:type/Value:Peripheral+' => '周辺',
+	'Class:Model/Attribute:type/Value:Printer' => 'プリンタ',
+	'Class:Model/Attribute:type/Value:Printer+' => 'プリンタ',
+	'Class:Model/Attribute:type/Value:Rack' => 'ラック',
+	'Class:Model/Attribute:type/Value:Rack+' => 'ラック',
+	'Class:Model/Attribute:type/Value:SANSwitch' => 'SANスイッチ',
+	'Class:Model/Attribute:type/Value:SANSwitch+' => 'SANスイッチ',
+	'Class:Model/Attribute:type/Value:Server' => 'サーバ',
+	'Class:Model/Attribute:type/Value:Server+' => 'サーバ',
+	'Class:Model/Attribute:type/Value:StorageSystem' => 'ストレージシステム',
+	'Class:Model/Attribute:type/Value:StorageSystem+' => 'ストレージシステム',
+	'Class:Model/Attribute:type/Value:Tablet' => 'タブレット',
+	'Class:Model/Attribute:type/Value:Tablet+' => 'タブレット',
+	'Class:Model/Attribute:type/Value:TapeLibrary' => 'テープライブラリ',
+	'Class:Model/Attribute:type/Value:TapeLibrary+' => 'テープライブラリ',
+	'Class:Model/Attribute:type/Value:Telephone' => '電話',
+	'Class:Model/Attribute:type/Value:Telephone+' => '電話',
 	'Class:Model/Attribute:physicaldevices_list' => '物理デバイス',
 	'Class:Model/Attribute:physicaldevices_list+' => '',
 ));
@@ -1336,12 +1336,12 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 //
 
 Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:IOSversion' => 'IOSバージョン',
-	'Class:IOSversion+' => '',
-	'Class:IOSversion/Attribute:brand_id' => 'ブランド',
-	'Class:IOSversion/Attribute:brand_id+' => '',
-	'Class:IOSversion/Attribute:brand_name' => 'ブランド名',
-	'Class:IOSversion/Attribute:brand_name+' => '',
+	'Class:IOSVersion' => 'IOSバージョン',
+	'Class:IOSVersion+' => '',
+	'Class:IOSVersion/Attribute:brand_id' => 'ブランド',
+	'Class:IOSVersion/Attribute:brand_id+' => '',
+	'Class:IOSVersion/Attribute:brand_name' => 'ブランド名',
+	'Class:IOSVersion/Attribute:brand_name+' => '',
 ));
 
 //
@@ -1383,16 +1383,16 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 //
 
 Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:lnkFunctionalCIToOSpatch' => 'リンク 機能的CI/OSパッチ',
-	'Class:lnkFunctionalCIToOSpatch+' => '',
-	'Class:lnkFunctionalCIToOSpatch/Attribute:ospatch_id' => 'OSパッチ',
-	'Class:lnkFunctionalCIToOSpatch/Attribute:ospatch_id+' => '',
-	'Class:lnkFunctionalCIToOSpatch/Attribute:ospatch_name' => 'OSパッチ名',
-	'Class:lnkFunctionalCIToOSpatch/Attribute:ospatch_name+' => '',
-	'Class:lnkFunctionalCIToOSpatch/Attribute:functionalci_id' => '機能的ci',
-	'Class:lnkFunctionalCIToOSpatch/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToOSpatch/Attribute:functionalci_name' => '機能的ci名',
-	'Class:lnkFunctionalCIToOSpatch/Attribute:functionalci_name+' => '',
+	'Class:lnkFunctionalCIToOSPatch' => 'リンク 機能的CI/OSパッチ',
+	'Class:lnkFunctionalCIToOSPatch+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'OSパッチ',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'OSパッチ名',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id' => '機能的ci',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name' => '機能的ci名',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name+' => '',
 ));
 
 //
@@ -1483,20 +1483,20 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 //
 
 Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:IPinterface' => 'IPインターフェース',
-	'Class:IPinterface+' => '',
-	'Class:IPinterface/Attribute:ipaddress' => 'IPアドレス',
-	'Class:IPinterface/Attribute:ipaddress+' => '',
-	'Class:IPinterface/Attribute:macaddress' => 'MACアドレス',
-	'Class:IPinterface/Attribute:macaddress+' => '',
-	'Class:IPinterface/Attribute:comment' => 'コメント',
-	'Class:IPinterface/Attribute:coment+' => '',
-	'Class:IPinterface/Attribute:ipgateway' => 'IPゲートウエイ',
-	'Class:IPinterface/Attribute:ipgateway+' => '',
-	'Class:IPinterface/Attribute:ipmask' => 'IPマスク',
-	'Class:IPinterface/Attribute:ipmask+' => '',
-	'Class:IPinterface/Attribute:speed' => '速度',
-	'Class:IPinterface/Attribute:speed+' => '',
+	'Class:IPInterface' => 'IPインターフェース',
+	'Class:IPInterface+' => '',
+	'Class:IPInterface/Attribute:ipaddress' => 'IPアドレス',
+	'Class:IPInterface/Attribute:ipaddress+' => '',
+	'Class:IPInterface/Attribute:macaddress' => 'MACアドレス',
+	'Class:IPInterface/Attribute:macaddress+' => '',
+	'Class:IPInterface/Attribute:comment' => 'コメント',
+	'Class:IPInterface/Attribute:coment+' => '',
+	'Class:IPInterface/Attribute:ipgateway' => 'IPゲートウエイ',
+	'Class:IPInterface/Attribute:ipgateway+' => '',
+	'Class:IPInterface/Attribute:ipmask' => 'IPマスク',
+	'Class:IPInterface/Attribute:ipmask+' => '',
+	'Class:IPInterface/Attribute:speed' => '速度',
+	'Class:IPInterface/Attribute:speed+' => '',
 ));
 
 //

datamodels/2.x/itop-config-mgmt/ru.dict.itop-config-mgmt.php

@@ -152,14 +152,14 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Middleware+' => '',
 	'Class:Middleware/Attribute:middlewareinstance_list' => 'Middleware instances~~',
 	'Class:Middleware/Attribute:middlewareinstance_list+' => '',
-	'Class:DBserver' => 'Сервер БД~~',
-	'Class:DBserver+' => '',
-	'Class:DBserver/Attribute:dbschema_list' => 'Схемы БД~~',
-	'Class:DBserver/Attribute:dbschema_list+' => '',
-	'Class:Webserver' => 'Web сервер~~',
-	'Class:Webserver+' => '',
-	'Class:Webserver/Attribute:webapp_list' => 'Web приложения~~',
-	'Class:Webserver/Attribute:webapp_list+' => '',
+	'Class:DBServer' => 'Сервер БД~~',
+	'Class:DBServer+' => '',
+	'Class:DBServer/Attribute:dbschema_list' => 'Схемы БД~~',
+	'Class:DBServer/Attribute:dbschema_list+' => '',
+	'Class:WebServer' => 'Web сервер~~',
+	'Class:WebServer+' => '',
+	'Class:WebServer/Attribute:webapp_list' => 'Web приложения~~',
+	'Class:WebServer/Attribute:webapp_list+' => '',
 	'Class:PCSoftware' => 'Программы PC~~',
 	'Class:PCSoftware+' => '',
 	'Class:OtherSoftware' => 'Прочие программы~~',
@@ -190,40 +190,40 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Software/Attribute:documents_list+' => '',
 	'Class:Software/Attribute:type' => 'Тип~~',
 	'Class:Software/Attribute:type+' => '',
-	'Class:Software/Attribute:type/Value:DBserver' => 'Сервер БД~~',
-	'Class:Software/Attribute:type/Value:DBserver+' => '',
+	'Class:Software/Attribute:type/Value:DBServer' => 'Сервер БД~~',
+	'Class:Software/Attribute:type/Value:DBServer+' => '',
 	'Class:Software/Attribute:type/Value:Middleware' => 'Middleware~~',
 	'Class:Software/Attribute:type/Value:Middleware+' => '',
 	'Class:Software/Attribute:type/Value:OtherSoftware' => 'Прочие программы~~',
 	'Class:Software/Attribute:type/Value:OtherSoftware+' => '',
 	'Class:Software/Attribute:type/Value:PCSoftware' => 'Программы PC~~',
 	'Class:Software/Attribute:type/Value:PCSoftware+' => '',
-	'Class:Software/Attribute:type/Value:Webserver' => 'Web сервер~~',
-	'Class:Software/Attribute:type/Value:Webserver+' => '',
+	'Class:Software/Attribute:type/Value:WebServer' => 'Web сервер~~',
+	'Class:Software/Attribute:type/Value:WebServer+' => '',
 	'Class:Software/Attribute:softwareinstance_list' => 'Software instances~~',
 	'Class:Software/Attribute:softwareinstance_list+' => '',
 	'Class:Software/Attribute:softwarepatch_list' => 'Software patches~~',
 	'Class:Software/Attribute:softwarepatch_list+' => '',
 	'Class:Software/Attribute:softwarelicence_list' => 'Лиценизий программ~~',
 	'Class:Software/Attribute:softwarelicence_list+' => '',
-	'Class:OSpatch' => 'OS patch~~',
-	'Class:OSpatch+' => '',
-	'Class:OSpatch/Attribute:functionalcis_list' => 'Устройства~~',
-	'Class:OSpatch/Attribute:functionalcis_list+' => '',
-	'Class:OSpatch/Attribute:osversion_id' => 'Версия ОС~~',
-	'Class:OSpatch/Attribute:osversion_id+' => '',
+	'Class:OSPatch' => 'OS patch~~',
+	'Class:OSPatch+' => '',
+	'Class:OSPatch/Attribute:functionalcis_list' => 'Устройства~~',
+	'Class:OSPatch/Attribute:functionalcis_list+' => '',
+	'Class:OSPatch/Attribute:osversion_id' => 'Версия ОС~~',
+	'Class:OSPatch/Attribute:osversion_id+' => '',
 	'Class:SoftwarePatch' => 'Software Patch~~',
 	'Class:SoftwarePatch+' => '',
 	'Class:SoftwarePatch/Attribute:software_id' => 'Программы~~',
 	'Class:SoftwarePatch/Attribute:software_id+' => '',
 	'Class:SoftwarePatch/Attribute:softwareinstances_list' => 'Software instances~~',
 	'Class:SoftwarePatch/Attribute:softwareinstances_list+' => '',
-	'Class:OsLicence' => 'OS Licence~~',
-	'Class:OsLicence+' => '',
-	'Class:OsLicence/Attribute:osversion_id' => 'OS version~~',
-	'Class:OsLicence/Attribute:osversion_id+' => '',
-	'Class:OsLicence/Attribute:servers_list' => 'серверы~~',
-	'Class:OsLicence/Attribute:servers_list+' => '',
+	'Class:OSLicence' => 'OS Licence~~',
+	'Class:OSLicence+' => '',
+	'Class:OSLicence/Attribute:osversion_id' => 'OS version~~',
+	'Class:OSLicence/Attribute:osversion_id+' => '',
+	'Class:OSLicence/Attribute:servers_list' => 'серверы~~',
+	'Class:OSLicence/Attribute:servers_list+' => '',
 	'Class:SoftwareLicence' => 'Software Licence~~',
 	'Class:SoftwareLicence+' => '',
 	'Class:SoftwareLicence/Attribute:software_id' => 'Software~~',
@@ -236,12 +236,12 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '',
 	'Class:lnkDocumentToLicence/Attribute:document_id' => 'Документ~~',
 	'Class:lnkDocumentToLicence/Attribute:document_id+' => '',
-	'Class:OSversion' => 'Версия ОС~~',
-	'Class:OSversion+' => '',
-	'Class:OSversion/Attribute:osfamily_id' => 'Семейство ОС~~',
-	'Class:OSversion/Attribute:osfamily_id+' => '',
-	'Class:OSfamily' => 'Семейство ОС~~',
-	'Class:OSfamily+' => '',
+	'Class:OSVersion' => 'Версия ОС~~',
+	'Class:OSVersion+' => '',
+	'Class:OSVersion/Attribute:osfamily_id' => 'Семейство ОС~~',
+	'Class:OSVersion/Attribute:osfamily_id+' => '',
+	'Class:OSFamily' => 'Семейство ОС~~',
+	'Class:OSFamily+' => '',
 	'Class:DocumentType' => 'Тип документа~~',
 	'Class:DocumentType+' => '',
 	'Class:ContactType' => 'Contact Type~~',
@@ -254,54 +254,54 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Model+' => '',
 	'Class:Model/Attribute:brand_id' => 'Бренд~~',
 	'Class:Model/Attribute:brand_id+' => '',
-	'Class:Model/Attribute:Type' => 'Тип устройства~~',
-	'Class:Model/Attribute:Type+' => '',
-	'Class:Model/Attribute:Type/Value:DiskArray' => 'Disk Array~~',
-	'Class:Model/Attribute:Type/Value:DiskArray+' => '',
-	'Class:Model/Attribute:Type/Value:Enclosure' => 'Enclosure~~',
-	'Class:Model/Attribute:Type/Value:Enclosure+' => '',
-	'Class:Model/Attribute:Type/Value:IpPhone' => 'Ip телефон~~',
-	'Class:Model/Attribute:Type/Value:IpPhone+' => '',
-	'Class:Model/Attribute:Type/Value:MobilePhone' => 'Мобильный телефон~~',
-	'Class:Model/Attribute:Type/Value:MobilePhone+' => '',
-	'Class:Model/Attribute:Type/Value:NAS' => 'NAS~~',
-	'Class:Model/Attribute:Type/Value:NAS+' => '',
-	'Class:Model/Attribute:Type/Value:NetworkDevice' => 'Сетевое устройство~~',
-	'Class:Model/Attribute:Type/Value:NetworkDevice+' => '',
-	'Class:Model/Attribute:Type/Value:PC' => 'PC~~',
-	'Class:Model/Attribute:Type/Value:PC+' => '',
-	'Class:Model/Attribute:Type/Value:PDU' => 'PDU~~',
-	'Class:Model/Attribute:Type/Value:PDU+' => '',
-	'Class:Model/Attribute:Type/Value:Peripheral' => 'Peripheral~~',
-	'Class:Model/Attribute:Type/Value:Peripheral+' => '',
-	'Class:Model/Attribute:Type/Value:PowerSource' => 'Power Source~~',
-	'Class:Model/Attribute:Type/Value:PowerSource+' => '',
-	'Class:Model/Attribute:Type/Value:Printer' => 'Принтер~~',
-	'Class:Model/Attribute:Type/Value:Printer+' => '',
-	'Class:Model/Attribute:Type/Value:Rack' => 'Rack~~',
-	'Class:Model/Attribute:Type/Value:Rack+' => '',
-	'Class:Model/Attribute:Type/Value:SANswitch' => 'SAN switch~~',
-	'Class:Model/Attribute:Type/Value:SANswitch+' => '',
-	'Class:Model/Attribute:Type/Value:Server' => 'Сервер~~',
-	'Class:Model/Attribute:Type/Value:Server+' => '',
-	'Class:Model/Attribute:Type/Value:StorageSystem' => 'Storage System~~',
-	'Class:Model/Attribute:Type/Value:StorageSystem+' => '',
-	'Class:Model/Attribute:Type/Value:Tablet' => 'Планшет~~',
-	'Class:Model/Attribute:Type/Value:Tablet+' => '',
-	'Class:Model/Attribute:Type/Value:TapeLibrary' => 'Tape Library~~',
-	'Class:Model/Attribute:Type/Value:TapeLibrary+' => '',
-	'Class:Model/Attribute:Type/Value:Telephone' => 'Телефон~~',
-	'Class:Model/Attribute:Type/Value:Telephone+' => '',
+	'Class:Model/Attribute:type' => 'Тип устройства~~',
+	'Class:Model/Attribute:type+' => '',
+	'Class:Model/Attribute:type/Value:DiskArray' => 'Disk Array~~',
+	'Class:Model/Attribute:type/Value:DiskArray+' => '',
+	'Class:Model/Attribute:type/Value:Enclosure' => 'Enclosure~~',
+	'Class:Model/Attribute:type/Value:Enclosure+' => '',
+	'Class:Model/Attribute:type/Value:IPPhone' => 'Ip телефон~~',
+	'Class:Model/Attribute:type/Value:IPPhone+' => '',
+	'Class:Model/Attribute:type/Value:MobilePhone' => 'Мобильный телефон~~',
+	'Class:Model/Attribute:type/Value:MobilePhone+' => '',
+	'Class:Model/Attribute:type/Value:NAS' => 'NAS~~',
+	'Class:Model/Attribute:type/Value:NAS+' => '',
+	'Class:Model/Attribute:type/Value:NetworkDevice' => 'Сетевое устройство~~',
+	'Class:Model/Attribute:type/Value:NetworkDevice+' => '',
+	'Class:Model/Attribute:type/Value:PC' => 'PC~~',
+	'Class:Model/Attribute:type/Value:PC+' => '',
+	'Class:Model/Attribute:type/Value:PDU' => 'PDU~~',
+	'Class:Model/Attribute:type/Value:PDU+' => '',
+	'Class:Model/Attribute:type/Value:Peripheral' => 'Peripheral~~',
+	'Class:Model/Attribute:type/Value:Peripheral+' => '',
+	'Class:Model/Attribute:type/Value:PowerSource' => 'Power Source~~',
+	'Class:Model/Attribute:type/Value:PowerSource+' => '',
+	'Class:Model/Attribute:type/Value:Printer' => 'Принтер~~',
+	'Class:Model/Attribute:type/Value:Printer+' => '',
+	'Class:Model/Attribute:type/Value:Rack' => 'Rack~~',
+	'Class:Model/Attribute:type/Value:Rack+' => '',
+	'Class:Model/Attribute:type/Value:SANSwitch' => 'SAN switch~~',
+	'Class:Model/Attribute:type/Value:SANSwitch+' => '',
+	'Class:Model/Attribute:type/Value:Server' => 'Сервер~~',
+	'Class:Model/Attribute:type/Value:Server+' => '',
+	'Class:Model/Attribute:type/Value:StorageSystem' => 'Storage System~~',
+	'Class:Model/Attribute:type/Value:StorageSystem+' => '',
+	'Class:Model/Attribute:type/Value:Tablet' => 'Планшет~~',
+	'Class:Model/Attribute:type/Value:Tablet+' => '',
+	'Class:Model/Attribute:type/Value:TapeLibrary' => 'Tape Library~~',
+	'Class:Model/Attribute:type/Value:TapeLibrary+' => '',
+	'Class:Model/Attribute:type/Value:Telephone' => 'Телефон~~',
+	'Class:Model/Attribute:type/Value:Telephone+' => '',
 	'Class:Model/Attribute:physicaldevices_list' => 'Physical devices~~',
 	'Class:Model/Attribute:physicaldevices_list+' => '',
 	'Class:NetworkDeviceType' => 'Типы сетевых устройств~~',
 	'Class:NetworkDeviceType+' => '',
 	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list' => 'Сетевые устройства~~',
 	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => '',
-	'Class:IOSversion' => 'Версия IOS~~',
-	'Class:IOSversion+' => '',
-	'Class:IOSversion/Attribute:brand_id' => 'Бренд~~',
-	'Class:IOSversion/Attribute:brand_id+' => '',
+	'Class:IOSVersion' => 'Версия IOS~~',
+	'Class:IOSVersion+' => '',
+	'Class:IOSVersion/Attribute:brand_id' => 'Бренд~~',
+	'Class:IOSVersion/Attribute:brand_id+' => '',
 	'Class:lnkDocumentToPatch' => 'Link Document / Patch~~',
 	'Class:lnkDocumentToPatch+' => '',
 	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Patch~~',
@@ -314,12 +314,12 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id' => 'Software instance~~',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id+' => '',
-	'Class:lnkFunctionalCIToOSpatch' => 'Link FunctionalCI / OS patch~~',
-	'Class:lnkFunctionalCIToOSpatch+' => '',
-	'Class:lnkFunctionalCIToOSpatch/Attribute:ospatch_id' => 'OS patch~~',
-	'Class:lnkFunctionalCIToOSpatch/Attribute:ospatch_id+' => '',
-	'Class:lnkFunctionalCIToOSpatch/Attribute:functionalci_id' => 'Functionalci~~',
-	'Class:lnkFunctionalCIToOSpatch/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToOSPatch' => 'Link FunctionalCI / OS patch~~',
+	'Class:lnkFunctionalCIToOSPatch+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'OS patch~~',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id' => 'Functionalci~~',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id+' => '',
 	'Class:lnkDocumentToSoftware' => 'Link Document / Software~~',
 	'Class:lnkDocumentToSoftware+' => '',
 	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Software~~',
@@ -592,8 +592,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:MobilePhone/Attribute:imei+' => '',
 	'Class:MobilePhone/Attribute:hw_pin' => 'Аппаратный PIN',
 	'Class:MobilePhone/Attribute:hw_pin+' => '',
-	'Class:IpPhone' => 'IP Телефон~~',
-	'Class:IpPhone+' => '',
+	'Class:IPPhone' => 'IP Телефон~~',
+	'Class:IPPhone+' => '',
 	'Class:Tablet' => 'Планшет~~',
 	'Class:Tablet+' => '',
 	'Class:DatacenterDevice' => 'Datacenter Device~~',
@@ -854,20 +854,20 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Tape/Attribute:tapelibrary_id+' => '',
 	'Class:Tape/Attribute:tapelibrary_name' => 'Tape library name~~',
 	'Class:Tape/Attribute:tapelibrary_name+' => '',
-	'Class:NasFileSystem' => 'NAS FileSystem~~',
-	'Class:NasFileSystem+' => '',
-	'Class:NasFileSystem/Attribute:name' => 'Название~~',
-	'Class:NasFileSystem/Attribute:name+' => '',
-	'Class:NasFileSystem/Attribute:description' => 'Description~~',
-	'Class:NasFileSystem/Attribute:description+' => '',
-	'Class:NasFileSystem/Attribute:raid_level' => 'Raid уровень~~',
-	'Class:NasFileSystem/Attribute:raid_level+' => '',
-	'Class:NasFileSystem/Attribute:size' => 'Размер~~',
-	'Class:NasFileSystem/Attribute:size+' => '',
-	'Class:NasFileSystem/Attribute:nas_id' => 'NAS~~',
-	'Class:NasFileSystem/Attribute:nas_id+' => '',
-	'Class:NasFileSystem/Attribute:nas_name' => 'NAS имя~~',
-	'Class:NasFileSystem/Attribute:nas_name+' => '',
+	'Class:NASFileSystem' => 'NAS FileSystem~~',
+	'Class:NASFileSystem+' => '',
+	'Class:NASFileSystem/Attribute:name' => 'Название~~',
+	'Class:NASFileSystem/Attribute:name+' => '',
+	'Class:NASFileSystem/Attribute:description' => 'Description~~',
+	'Class:NASFileSystem/Attribute:description+' => '',
+	'Class:NASFileSystem/Attribute:raid_level' => 'Raid уровень~~',
+	'Class:NASFileSystem/Attribute:raid_level+' => '',
+	'Class:NASFileSystem/Attribute:size' => 'Размер~~',
+	'Class:NASFileSystem/Attribute:size+' => '',
+	'Class:NASFileSystem/Attribute:nas_id' => 'NAS~~',
+	'Class:NASFileSystem/Attribute:nas_id+' => '',
+	'Class:NASFileSystem/Attribute:nas_name' => 'NAS имя~~',
+	'Class:NASFileSystem/Attribute:nas_name+' => '',
 	'Class:Patch' => 'Патч',
 	'Class:Patch+' => '',
 	'Class:Patch/Attribute:name' => 'Название',
@@ -878,8 +878,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Patch/Attribute:description+' => '',
 	'Class:Patch/Attribute:finalclass' => 'Тип~~',
 	'Class:Patch/Attribute:finalclass+' => '',
-	'Class:OSpatch/Attribute:osversion_name' => 'OS version name~~',
-	'Class:OSpatch/Attribute:osversion_name+' => '',
+	'Class:OSPatch/Attribute:osversion_name' => 'OS version name~~',
+	'Class:OSPatch/Attribute:osversion_name+' => '',
 	'Class:SoftwarePatch/Attribute:software_name' => 'Software name~~',
 	'Class:SoftwarePatch/Attribute:software_name+' => '',
 	'Class:Licence' => 'Лицензия',
@@ -904,10 +904,10 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Licence/Attribute:licence_key+' => '',
 	'Class:Licence/Attribute:finalclass' => 'Тип~~',
 	'Class:Licence/Attribute:finalclass+' => '',
-	'Class:OsLicence/Attribute:osversion_name' => 'OS version name~~',
-	'Class:OsLicence/Attribute:osversion_name+' => '',
-	'Class:OsLicence/Attribute:virtualmachines_list' => 'Виртуальные машины~~',
-	'Class:OsLicence/Attribute:virtualmachines_list+' => '',
+	'Class:OSLicence/Attribute:osversion_name' => 'OS version name~~',
+	'Class:OSLicence/Attribute:osversion_name+' => '',
+	'Class:OSLicence/Attribute:virtualmachines_list' => 'Виртуальные машины~~',
+	'Class:OSLicence/Attribute:virtualmachines_list+' => '',
 	'Class:SoftwareLicence/Attribute:software_name' => 'Название прграммы~~',
 	'Class:SoftwareLicence/Attribute:software_name+' => '',
 	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Название лицензий~~',
@@ -920,12 +920,12 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Typology/Attribute:name+' => '',
 	'Class:Typology/Attribute:finalclass' => 'Тип~~',
 	'Class:Typology/Attribute:finalclass+' => '',
-	'Class:OSversion/Attribute:osfamily_name' => 'OS family name~~',
-	'Class:OSversion/Attribute:osfamily_name+' => '',
+	'Class:OSVersion/Attribute:osfamily_name' => 'OS family name~~',
+	'Class:OSVersion/Attribute:osfamily_name+' => '',
 	'Class:Model/Attribute:brand_name' => 'Brand name~~',
 	'Class:Model/Attribute:brand_name+' => '',
-	'Class:IOSversion/Attribute:brand_name' => 'Brand name~~',
-	'Class:IOSversion/Attribute:brand_name+' => '',
+	'Class:IOSVersion/Attribute:brand_name' => 'Brand name~~',
+	'Class:IOSVersion/Attribute:brand_name+' => '',
 	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Patch name~~',
 	'Class:lnkDocumentToPatch/Attribute:patch_name+' => '',
 	'Class:lnkDocumentToPatch/Attribute:document_name' => 'Document name~~',
@@ -934,10 +934,10 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name+' => '',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name' => 'Software instance name~~',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name+' => '',
-	'Class:lnkFunctionalCIToOSpatch/Attribute:ospatch_name' => 'OS patch name~~',
-	'Class:lnkFunctionalCIToOSpatch/Attribute:ospatch_name+' => '',
-	'Class:lnkFunctionalCIToOSpatch/Attribute:functionalci_name' => 'Functionalci name~~',
-	'Class:lnkFunctionalCIToOSpatch/Attribute:functionalci_name+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'OS patch name~~',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name' => 'Functionalci name~~',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name+' => '',
 	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Название программы~~',
 	'Class:lnkDocumentToSoftware/Attribute:software_name+' => '',
 	'Class:lnkDocumentToSoftware/Attribute:document_name' => 'Название документа~~',
@@ -958,20 +958,20 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:NetworkInterface/Attribute:name+' => '',
 	'Class:NetworkInterface/Attribute:finalclass' => 'Тип~~',
 	'Class:NetworkInterface/Attribute:finalclass+' => '',
-	'Class:IPinterface' => 'IP интерфейс~~',
-	'Class:IPinterface+' => '',
-	'Class:IPinterface/Attribute:ipaddress' => 'IP адрес~~',
-	'Class:IPinterface/Attribute:ipaddress+' => '',
-	'Class:IPinterface/Attribute:macaddress' => 'MAC адрес~~',
-	'Class:IPinterface/Attribute:macaddress+' => '',
-	'Class:IPinterface/Attribute:comment' => 'Комментарии~~',
-	'Class:IPinterface/Attribute:coment+' => '',
-	'Class:IPinterface/Attribute:ipgateway' => 'Шлюз~~',
-	'Class:IPinterface/Attribute:ipgateway+' => '',
-	'Class:IPinterface/Attribute:ipmask' => 'Маска~~',
-	'Class:IPinterface/Attribute:ipmask+' => '',
-	'Class:IPinterface/Attribute:speed' => 'Скорость~~',
-	'Class:IPinterface/Attribute:speed+' => '',
+	'Class:IPInterface' => 'IP интерфейс~~',
+	'Class:IPInterface+' => '',
+	'Class:IPInterface/Attribute:ipaddress' => 'IP адрес~~',
+	'Class:IPInterface/Attribute:ipaddress+' => '',
+	'Class:IPInterface/Attribute:macaddress' => 'MAC адрес~~',
+	'Class:IPInterface/Attribute:macaddress+' => '',
+	'Class:IPInterface/Attribute:comment' => 'Комментарии~~',
+	'Class:IPInterface/Attribute:coment+' => '',
+	'Class:IPInterface/Attribute:ipgateway' => 'Шлюз~~',
+	'Class:IPInterface/Attribute:ipgateway+' => '',
+	'Class:IPInterface/Attribute:ipmask' => 'Маска~~',
+	'Class:IPInterface/Attribute:ipmask+' => '',
+	'Class:IPInterface/Attribute:speed' => 'Скорость~~',
+	'Class:IPInterface/Attribute:speed+' => '',
 	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Имя устройства~~',
 	'Class:PhysicalInterface/Attribute:connectableci_name+' => '',
 	'Class:LogicalInterface' => 'Логический интерфейс~~',

datamodels/2.x/itop-knownerror-mgmt/de.dict.itop-knownerror-mgmt.php

@@ -92,12 +92,12 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:FAQ/Attribute:error_code+' => '',
 	'Class:FAQ/Attribute:key_words' => 'Schlüsselwörter',
 	'Class:FAQ/Attribute:key_words+' => '',
-	'Class:FAQcategory' => 'FAQ-Kategorie',
-	'Class:FAQcategory+' => '',
-	'Class:FAQcategory/Attribute:name' => 'Name',
-	'Class:FAQcategory/Attribute:name+' => '',
-	'Class:FAQcategory/Attribute:faq_list' => 'FAQs',
-	'Class:FAQcategory/Attribute:faq_list+' => '',
+	'Class:FAQCategory' => 'FAQ-Kategorie',
+	'Class:FAQCategory+' => '',
+	'Class:FAQCategory/Attribute:name' => 'Name',
+	'Class:FAQCategory/Attribute:name+' => '',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
+	'Class:FAQCategory/Attribute:faq_list+' => '',
 	'Menu:NewError' => 'Neuer bekannter Fehler',
 	'Menu:NewError+' => '',
 	'Menu:SearchError' => 'Nach bekannten Fehler suchen',

datamodels/2.x/itop-knownerror-mgmt/es_cr.dict.itop-knownerror-mgmt.php

@@ -164,12 +164,12 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 //
 
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
-	'Class:FAQcategory' => 'Categoría de Preguntas y Respusta Frecuentes',
-	'Class:FAQcategory+' => 'Categoría de Preguntas y Respusta Frecuentes',
-	'Class:FAQcategory/Attribute:name' => 'Nombre',
-	'Class:FAQcategory/Attribute:name+' => 'Nombre',
-	'Class:FAQcategory/Attribute:faq_list' => 'FAQs',
-	'Class:FAQcategory/Attribute:faq_list+' => 'FAQs',
+	'Class:FAQCategory' => 'Categoría de Preguntas y Respusta Frecuentes',
+	'Class:FAQCategory+' => 'Categoría de Preguntas y Respusta Frecuentes',
+	'Class:FAQCategory/Attribute:name' => 'Nombre',
+	'Class:FAQCategory/Attribute:name+' => 'Nombre',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
+	'Class:FAQCategory/Attribute:faq_list+' => 'FAQs',
 ));
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Menu:NewError' => 'Nuevo Error Conocido',

datamodels/2.x/itop-knownerror-mgmt/ja.dict.itop-knownerror-mgmt.php

@@ -49,55 +49,55 @@
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
 
-//
-// Class: KnownError
-//
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:KnownError' => '既知のエラー',
-	'Class:KnownError+' => '既知の課題として文書化されたエラー',
-	'Class:KnownError/Attribute:name' => '名前',
-	'Class:KnownError/Attribute:name+' => '',
-	'Class:KnownError/Attribute:org_id' => '顧客',
-	'Class:KnownError/Attribute:org_id+' => '',
-	'Class:KnownError/Attribute:cust_name' => '顧客名',
-	'Class:KnownError/Attribute:cust_name+' => '',
-	'Class:KnownError/Attribute:problem_id' => '関連する問題',
-	'Class:KnownError/Attribute:problem_id+' => '',
-	'Class:KnownError/Attribute:problem_ref' => '参照',
-	'Class:KnownError/Attribute:problem_ref+' => '',
-	'Class:KnownError/Attribute:symptom' => '現象',
-	'Class:KnownError/Attribute:symptom+' => '',
-	'Class:KnownError/Attribute:root_cause' => '根本的な原因',
-	'Class:KnownError/Attribute:root_cause+' => '',
-	'Class:KnownError/Attribute:workaround' => '回避策',
-	'Class:KnownError/Attribute:workaround+' => '',
-	'Class:KnownError/Attribute:solution' => '解決策',
-	'Class:KnownError/Attribute:solution+' => '',
-	'Class:KnownError/Attribute:error_code' => 'エラーコード',
-	'Class:KnownError/Attribute:error_code+' => '',
-	'Class:KnownError/Attribute:domain' => 'ドメイン',
-	'Class:KnownError/Attribute:domain+' => '',
-	'Class:KnownError/Attribute:domain/Value:Application' => 'アプリケーション',
-	'Class:KnownError/Attribute:domain/Value:Application+' => 'アプリケーション',
-	'Class:KnownError/Attribute:domain/Value:Desktop' => 'デスクトップ',
-	'Class:KnownError/Attribute:domain/Value:Desktop+' => 'デスクトップ',
-	'Class:KnownError/Attribute:domain/Value:Network' => 'ネットワーク',
-	'Class:KnownError/Attribute:domain/Value:Network+' => 'ネットワーク',
-	'Class:KnownError/Attribute:domain/Value:Server' => 'サーバ',
-	'Class:KnownError/Attribute:domain/Value:Server+' => 'サーバ',
-	'Class:KnownError/Attribute:vendor' => 'ベンダー',
-	'Class:KnownError/Attribute:vendor+' => '',
-	'Class:KnownError/Attribute:model' => 'モデル',
-	'Class:KnownError/Attribute:model+' => '',
-	'Class:KnownError/Attribute:version' => 'バージョン',
-	'Class:KnownError/Attribute:version+' => '',
-	'Class:KnownError/Attribute:ci_list' => 'CI',
-	'Class:KnownError/Attribute:ci_list+' => '',
-	'Class:KnownError/Attribute:document_list' => '文書',
-	'Class:KnownError/Attribute:document_list+' => '',
-));
-
+//
+// Class: KnownError
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:KnownError' => '既知のエラー',
+	'Class:KnownError+' => '既知の課題として文書化されたエラー',
+	'Class:KnownError/Attribute:name' => '名前',
+	'Class:KnownError/Attribute:name+' => '',
+	'Class:KnownError/Attribute:org_id' => '顧客',
+	'Class:KnownError/Attribute:org_id+' => '',
+	'Class:KnownError/Attribute:cust_name' => '顧客名',
+	'Class:KnownError/Attribute:cust_name+' => '',
+	'Class:KnownError/Attribute:problem_id' => '関連する問題',
+	'Class:KnownError/Attribute:problem_id+' => '',
+	'Class:KnownError/Attribute:problem_ref' => '参照',
+	'Class:KnownError/Attribute:problem_ref+' => '',
+	'Class:KnownError/Attribute:symptom' => '現象',
+	'Class:KnownError/Attribute:symptom+' => '',
+	'Class:KnownError/Attribute:root_cause' => '根本的な原因',
+	'Class:KnownError/Attribute:root_cause+' => '',
+	'Class:KnownError/Attribute:workaround' => '回避策',
+	'Class:KnownError/Attribute:workaround+' => '',
+	'Class:KnownError/Attribute:solution' => '解決策',
+	'Class:KnownError/Attribute:solution+' => '',
+	'Class:KnownError/Attribute:error_code' => 'エラーコード',
+	'Class:KnownError/Attribute:error_code+' => '',
+	'Class:KnownError/Attribute:domain' => 'ドメイン',
+	'Class:KnownError/Attribute:domain+' => '',
+	'Class:KnownError/Attribute:domain/Value:Application' => 'アプリケーション',
+	'Class:KnownError/Attribute:domain/Value:Application+' => 'アプリケーション',
+	'Class:KnownError/Attribute:domain/Value:Desktop' => 'デスクトップ',
+	'Class:KnownError/Attribute:domain/Value:Desktop+' => 'デスクトップ',
+	'Class:KnownError/Attribute:domain/Value:Network' => 'ネットワーク',
+	'Class:KnownError/Attribute:domain/Value:Network+' => 'ネットワーク',
+	'Class:KnownError/Attribute:domain/Value:Server' => 'サーバ',
+	'Class:KnownError/Attribute:domain/Value:Server+' => 'サーバ',
+	'Class:KnownError/Attribute:vendor' => 'ベンダー',
+	'Class:KnownError/Attribute:vendor+' => '',
+	'Class:KnownError/Attribute:model' => 'モデル',
+	'Class:KnownError/Attribute:model+' => '',
+	'Class:KnownError/Attribute:version' => 'バージョン',
+	'Class:KnownError/Attribute:version+' => '',
+	'Class:KnownError/Attribute:ci_list' => 'CI',
+	'Class:KnownError/Attribute:ci_list+' => '',
+	'Class:KnownError/Attribute:document_list' => '文書',
+	'Class:KnownError/Attribute:document_list+' => '',
+));
+
 //
 // Class: lnkErrorToFunctionalCI
 //
@@ -116,7 +116,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkErrorToFunctionalCI/Attribute:reason' => '理由',
 	'Class:lnkErrorToFunctionalCI/Attribute:reason+' => '',
 ));
-
+
 //
 // Class: lnkDocumentToError
 //
@@ -164,12 +164,12 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 //
 
 Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:FAQcategory' => 'FAQカテゴリ',
-	'Class:FAQcategory+' => 'FAQのためのカテゴリ',
-	'Class:FAQcategory/Attribute:name' => '名前',
-	'Class:FAQcategory/Attribute:name+' => '',
-	'Class:FAQcategory/Attribute:faq_list' => 'FAQ',
-	'Class:FAQcategory/Attribute:faq_list+' => '',
+	'Class:FAQCategory' => 'FAQカテゴリ',
+	'Class:FAQCategory+' => 'FAQのためのカテゴリ',
+	'Class:FAQCategory/Attribute:name' => '名前',
+	'Class:FAQCategory/Attribute:name+' => '',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQ',
+	'Class:FAQCategory/Attribute:faq_list+' => '',
 ));
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Menu:NewError' => '新規既知のエラー',

datamodels/2.x/itop-knownerror-mgmt/ru.dict.itop-knownerror-mgmt.php

@@ -92,12 +92,12 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:FAQ/Attribute:error_code+' => '',
 	'Class:FAQ/Attribute:key_words' => 'Key words~~',
 	'Class:FAQ/Attribute:key_words+' => '',
-	'Class:FAQcategory' => 'FAQ Category~~',
-	'Class:FAQcategory+' => '',
-	'Class:FAQcategory/Attribute:name' => 'Name~~',
-	'Class:FAQcategory/Attribute:name+' => '',
-	'Class:FAQcategory/Attribute:faq_list' => 'FAQs~~',
-	'Class:FAQcategory/Attribute:faq_list+' => '',
+	'Class:FAQCategory' => 'FAQ Category~~',
+	'Class:FAQCategory+' => '',
+	'Class:FAQCategory/Attribute:name' => 'Name~~',
+	'Class:FAQCategory/Attribute:name+' => '',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQs~~',
+	'Class:FAQCategory/Attribute:faq_list+' => '',
 	'Menu:NewError' => 'Новая известная ошибка',
 	'Menu:NewError+' => 'Создание новой известной ошибки',
 	'Menu:SearchError' => 'Поиск известных ошибок',

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

@@ -59,10 +59,10 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
-	'Class:ServiceFamilly' => 'Service-Familie',
-	'Class:ServiceFamilly+' => '',
-	'Class:ServiceFamilly/Attribute:name' => 'Name',
-	'Class:ServiceFamilly/Attribute:name+' => '',
+	'Class:ServiceFamily' => 'Service-Familie',
+	'Class:ServiceFamily+' => '',
+	'Class:ServiceFamily/Attribute:name' => 'Name',
+	'Class:ServiceFamily/Attribute:name+' => '',
 	'Class:Service' => 'Service',
 	'Class:Service+' => '',
 	'Class:Service/Attribute:name' => 'Name',

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

@@ -58,10 +58,10 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
-	'Class:ServiceFamilly' => 'サービスファミリ',
-	'Class:ServiceFamilly+' => '',
-	'Class:ServiceFamilly/Attribute:name' => '名前',
-	'Class:ServiceFamilly/Attribute:name+' => '',
+	'Class:ServiceFamily' => 'サービスファミリ',
+	'Class:ServiceFamily+' => '',
+	'Class:ServiceFamily/Attribute:name' => '名前',
+	'Class:ServiceFamily/Attribute:name+' => '',
 	'Class:Service' => 'サービス',
 	'Class:Service+' => '',
 	'Class:Service/Attribute:name' => '名前',