composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-21 00:02: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

20
datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php
View File

@@ -15,8 +15,8 @@
//
// You should have received a copy of the GNU Affero General Public License
// along with iTop. If not, see <http://www.gnu.org/licenses/>
/**
* Localized data
/**
* Spanish Localized data
*
* @copyright Copyright (C) 2010-2021 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
@@ -1060,8 +1060,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Class:Brand+' => 'Marca',
'Class:Brand/Attribute:physicaldevices_list' => 'Dispositivo Físico',
'Class:Brand/Attribute:physicaldevices_list+' => 'Dispositivo Físico',
'Class:Brand/UniquenessRule:name+' => 'The name must be unique~~',
'Class:Brand/UniquenessRule:name' => 'This brand already exists~~',
'Class:Brand/UniquenessRule:name+' => 'El nombre debe ser único',
'Class:Brand/UniquenessRule:name' => 'Esta Marca ya existe',
));
//
@@ -1115,8 +1115,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Class:Model/Attribute:type/Value:Phone+' => 'Teléfono',
'Class:Model/Attribute:physicaldevices_list' => 'Dispositivo Físico',
'Class:Model/Attribute:physicaldevices_list+' => 'Dispositivo Físico',
'Class:Model/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
'Class:Model/UniquenessRule:name_brand' => 'this model already exists for this brand~~',
'Class:Model/UniquenessRule:name_brand+' => 'El nombre debe ser único dentro de la Marca',
'Class:Model/UniquenessRule:name_brand' => 'este modelo ya existe para esta Marca',
));
//
@@ -1220,8 +1220,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Class:Subnet+' => 'SubRed',
'Class:Subnet/Attribute:description' => 'Descripción',
'Class:Subnet/Attribute:description+' => 'Descripción',
'Class:Subnet/Attribute:subnet_name' => 'Subnet name~~',
'Class:Subnet/Attribute:subnet_name+' => '~~',
'Class:Subnet/Attribute:subnet_name' => 'Nombre de Subred',
'Class:Subnet/Attribute:subnet_name+' => 'Nombre de Subred',
'Class:Subnet/Attribute:org_id' => 'Organización',
'Class:Subnet/Attribute:org_id+' => 'Organización',
'Class:Subnet/Attribute:org_name' => 'Organización',
@@ -1574,8 +1574,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Menu:ConfigManagement:Misc' => 'Misceláneo',
'Menu:Group' => 'Grupos de ECs',
'Menu:Group+' => 'Grupos de ECs',
'Menu:OSVersion' => 'OS versions~~',
'Menu:OSVersion+' => '~~',
'Menu:OSVersion' => 'Versión de Sistema Operativo',
'Menu:OSVersion+' => '',
'Menu:Software' => 'Catálogo de Software',
'Menu:Software+' => 'Catálogo de Software',
));