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

5
datamodels/2.x/itop-backup/dictionaries/es_cr.dict.itop-backup.php
View File

@@ -4,6 +4,7 @@
*
* @copyright Copyright (C) 2010-2021 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
* @traductor Miguel Turrubiates <miguel_tf@yahoo.com>
*
* This file is part of iTop.
*
@@ -42,9 +43,9 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'bkp-table-file' => 'Archivo',
'bkp-table-file+' => 'Solo archivos con la extensión .zip son considerados como archivos de respaldos',
'bkp-table-size' => 'Tamaño',
'bkp-table-size+' => '',
'bkp-table-size+' => 'Tamaño',
'bkp-table-actions' => 'Acciones',
'bkp-table-actions+' => '',
'bkp-table-actions+' => 'Acciones',
'bkp-status-backups-auto' => 'Respaldos Programandos',
'bkp-status-backups-manual' => 'Respaldos Manuales',
'bkp-status-backups-none' => 'No hay respaldos',