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

12
datamodels/2.x/itop-request-mgmt/dictionaries/es_cr.dict.itop-request-mgmt.php
View File

@@ -2,9 +2,7 @@
/*
* @copyright Copyright (C) 2010-2021 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
/*
* @traductor Miguel Turrubiates <miguel_tf@yahoo.com>
* @traductor Miguel Turrubiates <miguel_tf@yahoo.com>
*/
Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Menu:RequestManagement' => 'Administración de Requerimientos',
@@ -265,7 +263,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Portal:UserRequest:MoreInfo' => 'Más Información',
'Portal:Details-Service-Element' => 'Elementos del Servicio',
'Portal:NoClosedTicket' => 'Requerimiento No Cerrado',
'Portal:NoService' => '',
'Portal:NoService' => 'Requerimiento Sin Servicio',
'Portal:ListOpenProblems' => 'Problemas Abiertos',
'Portal:ShowProblem' => 'Problemas',
'Portal:ShowFaqs' => 'Preguntas Frecuentes',
@@ -280,7 +278,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Organization:Overview:UserRequests' => 'User Requests from this organization~~',
'Organization:Overview:MyUserRequests' => 'My User Requests for this organization~~',
'Organization:Overview:Tickets' => 'Tickets for this organization~~',
'Organization:Overview:UserRequests' => 'Requerimientos para esta Organización',
'Organization:Overview:MyUserRequests' => 'Mis Requerimientos para esta Organización',
'Organization:Overview:Tickets' => 'Tickets para esta Organización',
));