Fix dictionnary for computer model. closes #2497
Fix dictionnary for computer model. closes #2497

Conflicts:
	inc/formatconvert.class.php

orthagh/fusioninventory-for-glpi,fusioninventory/fusioninventory-for-glpi,TECLIB/fusioninventory-for-glpi,dethegeek/fusioninventory-for-glpi,TECLIB/fusioninventory-for-glpi,orthagh/fusioninventory-for-glpi,mohierf/fusioninventory-for-glpi,TECLIB/fusioninventory-for-glpi,itinside/fusioninventory-for-glpi,fusioninventory/fusioninventory-for-glpi,fusioninventory/fusioninventory-for-glpi,mohierf/fusioninventory-for-glpi,fusioninventory/fusioninventory-for-glpi,TECLIB/fusioninventory-for-glpi,mohierf/fusioninventory-for-glpi,mohierf/fusioninventory-for-glpi,mohierf/fusioninventory-for-glpi,fusioninventory/fusioninventory-for-glpi,dethegeek/fusioninventory-for-glpi,mohierf/fusioninventory-for-glpi,itinside/fusioninventory-for-glpi,itinside/fusioninventory-for-glpi,itinside/fusioninventory-for-glpi,orthagh/fusioninventory-for-glpi,dethegeek/fusioninventory-for-glpi,fusioninventory/fusioninventory-for-glpi,TECLIB/fusioninventory-for-glpi,orthagh/fusioninventory-for-glpi,TECLIB/fusioninventory-for-glpi,orthagh/fusioninventory-for-glpi,itinside/fusioninventory-for-glpi,dethegeek/fusioninventory-for-glpi