composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 23:32:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/2.7' into develop

Browse Source 
# Conflicts:
#	application/dashboard.class.inc.php
#	core/action.class.inc.php
#	datamodels/2.x/combodo-db-tools/dictionaries/es_cr.dict.combodo-db-tools.php
#	datamodels/2.x/itop-attachments/dictionaries/es_cr.dict.itop-attachments.php
#	datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php
#	datamodels/2.x/itop-core-update/dictionaries/es_cr.dict.itop-core-update.php
#	datamodels/2.x/itop-hub-connector/dictionaries/es_cr.dict.itop-hub-connector.php
#	datamodels/2.x/itop-knownerror-mgmt/dictionaries/es_cr.dict.itop-knownerror-mgmt.php
#	datamodels/2.x/itop-portal-base/dictionaries/es_cr.dict.itop-portal-base.php
#	datamodels/2.x/itop-request-mgmt-itil/dictionaries/es_cr.dict.itop-request-mgmt-itil.php
#	datamodels/2.x/itop-request-mgmt/dictionaries/es_cr.dict.itop-request-mgmt.php
#	datamodels/2.x/itop-sla-computation/dictionaries/es_cr.dict.itop-sla-computation.php
#	datamodels/2.x/itop-storage-mgmt/dictionaries/es_cr.dict.itop-storage-mgmt.php
#	datamodels/2.x/itop-tickets/dictionaries/es_cr.dict.itop-tickets.php
#	datamodels/2.x/itop-virtualization-mgmt/dictionaries/es_cr.dict.itop-virtualization-mgmt.php
#	datamodels/2.x/itop-welcome-itil/es_cr.dict.itop-welcome-itil.php
#	dictionaries/es_cr.dictionary.itop.core.php
#	dictionaries/es_cr.dictionary.itop.ui.php
#	pages/ajax.render.php
#	setup/wizardsteps.class.inc.php
#	synchro/synchro_import.php
This commit is contained in:
Pierre Goiffon
2021-11-19 10:28:46 +01:00
parent db8462ccc9 9437e689fd
commit 67fa156c0e
42 changed files with 793 additions and 713 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
datamodels/2.x/itop-structure/dictionaries/es_cr.dict.itop-structure.php
View File

@@ -55,16 +55,15 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Class:Organization/Attribute:deliverymodel_name+' => 'Nombre del Modelo de Entrega',
'Class:Organization/Attribute:parent_id_friendlyname' => 'Organización Padre',
'Class:Organization/Attribute:parent_id_friendlyname+' => 'Organización Padre',
'Class:Organization/Attribute:overview' => 'Overview~~',
'Organization:Overview:FunctionalCIs' => 'Configuration items of this organization~~',
'Organization:Overview:FunctionalCIs:subtitle' => 'by type~~',
'Organization:Overview:Users' => ITOP_APPLICATION_SHORT.' Users within this organization~~',
'Class:Organization/Attribute:overview' => 'Resumen',
'Organization:Overview:FunctionalCIs' => 'Elementos de configuración en esta Organización',
'Organization:Overview:FunctionalCIs:subtitle' => 'por tipo',
'Organization:Overview:Users' => 'Usuarios de iTop en la Organización',
));
//
// Class: Location
//
Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Class:Location' => 'Localidad',
'Class:Location+' => 'Cualquier Tipo de Localidad: Región, País, Ciudad, Sitio, Edificio, Piso, Cuarto, Rack,...',
@@ -97,7 +96,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
//
// Class: Contact
//
Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Class:Contact' => 'Contacto',
'Class:Contact+' => 'Contacto',
@@ -134,7 +132,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
//
// Class: Person
//
Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Class:Person' => 'Persona',
'Class:Person+' => 'Persona',
@@ -162,16 +159,15 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Class:Person/Attribute:manager_id_friendlyname+' => 'Nombre del Jefe',
'Class:Person/Attribute:picture' => 'Fotografía',
'Class:Person/Attribute:picture+' => 'Fotografía',
'Class:Person/UniquenessRule:employee_number+' => 'The employee number must be unique in the organization~~',
'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
'Class:Person/UniquenessRule:employee_number+' => 'El número de empleado debe ser único en la Organización',
'Class:Person/UniquenessRule:employee_number' => 'Ya existe una persona en la organiación \'$this->org_name$\', con el mismo número de empleado',
'Class:Person/UniquenessRule:name+' => 'El nombre del empleado debe ser único dentro de su Organización',
'Class:Person/UniquenessRule:name' => 'Ya existe una persona en la organiación \'$this->org_name$\', con el mismo nombre',
));
//
// Class: Team
//
Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Class:Team' => 'Grupo de Trabajo',
'Class:Team+' => 'Grupo de Trabajo',
@@ -184,7 +180,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
//
// Class: Document
//
Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Class:Document' => 'Documento',
'Class:Document+' => 'Documento',
@@ -219,10 +214,9 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
//
// Class: DocumentFile
//
Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Class:DocumentFile' => 'Documento de Archivo',
'Class:DocumentFile+' => '~~',
'Class:DocumentFile+' => '',
'Class:DocumentFile/Attribute:file' => 'Archivo',
'Class:DocumentFile/Attribute:file+' => 'Archivo',
));
@@ -230,7 +224,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
//
// Class: DocumentNote
//
Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Class:DocumentNote' => 'Nota',
'Class:DocumentNote+' => 'Nota',
@@ -241,7 +234,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
//
// Class: DocumentWeb
//
Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Class:DocumentWeb' => 'Documento Web',
'Class:DocumentWeb+' => 'Documento disponible en otro servidor Web',