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:
@@ -47,7 +47,7 @@
|
||||
//
|
||||
// Class: KnownError
|
||||
//
|
||||
Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
|
||||
Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
|
||||
'Class:KnownError' => 'Error Conocido',
|
||||
'Class:KnownError+' => 'Documentación para un error conocido',
|
||||
'Class:KnownError/Attribute:name' => 'Nombre',
|
||||
@@ -96,7 +96,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
|
||||
// Class: lnkErrorToFunctionalCI
|
||||
//
|
||||
|
||||
Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
|
||||
Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
|
||||
'Class:lnkErrorToFunctionalCI' => 'Relación Error Conocido y EC Funcional',
|
||||
'Class:lnkErrorToFunctionalCI+' => 'Relación Error Conocido y EC Funcional',
|
||||
'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'EC',
|
||||
@@ -115,7 +115,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
|
||||
// Class: lnkDocumentToError
|
||||
//
|
||||
|
||||
Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
|
||||
Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
|
||||
'Class:lnkDocumentToError' => 'Relación Documento y Error Conocido',
|
||||
'Class:lnkDocumentToError+' => 'Relación Documento y Error Conocido',
|
||||
'Class:lnkDocumentToError/Attribute:document_id' => 'Documento',
|
||||
@@ -130,7 +130,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
|
||||
'Class:lnkDocumentToError/Attribute:link_type+' => 'Tipo',
|
||||
));
|
||||
|
||||
Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
|
||||
Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
|
||||
'Menu:ProblemManagement' => 'Gestión de problemas',
|
||||
'Menu:ProblemManagement+' => 'Gestión de problemas',
|
||||
'Menu:Problem:Shortcuts' => 'Acceso Rápido',
|
||||
|
||||
Reference in New Issue
Block a user