mirror of
https://github.com/Combodo/iTop.git
synced 2026-05-19 15:22:17 +02:00
Merge remote-tracking branch 'origin/support/2.7' into develop
# Conflicts: # datamodels/2.x/authent-local/dictionaries/es_cr.dict.authent-local.php # datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php # datamodels/2.x/itop-knownerror-mgmt/dictionaries/es_cr.dict.itop-knownerror-mgmt.php # datamodels/2.x/itop-service-mgmt/dictionaries/es_cr.dict.itop-service-mgmt.php # datamodels/2.x/itop-tickets/dictionaries/es_cr.dict.itop-tickets.php # datamodels/2.x/itop-welcome-itil/es_cr.dict.itop-welcome-itil.php # dictionaries/es_cr.dictionary.itop.ui.php # test/integration/DictionariesConsistencyTest.php
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
* @license http://opensource.org/licenses/AGPL-3.0
|
||||
* @traductor Miguel Turrubiates <miguel_tf@yahoo.com>
|
||||
*/
|
||||
Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
|
||||
Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
|
||||
'Menu:RequestManagement' => 'Administración de Requerimientos',
|
||||
'Menu:RequestManagement+' => 'Administración de Requerimientos',
|
||||
'Menu:RequestManagementProvider' => 'Proveedor de Mesa de Ayuda',
|
||||
@@ -51,7 +51,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
|
||||
// Class: UserRequest
|
||||
//
|
||||
|
||||
Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
|
||||
Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
|
||||
'Class:UserRequest' => 'Requerimiento',
|
||||
'Class:UserRequest+' => 'Requerimiento',
|
||||
'Class:UserRequest/Attribute:status' => 'Estatus',
|
||||
@@ -249,7 +249,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
|
||||
));
|
||||
|
||||
|
||||
Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
|
||||
Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
|
||||
'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',
|
||||
|
||||
Reference in New Issue
Block a user