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:
@@ -34,7 +34,7 @@
|
||||
//
|
||||
// Class: Ticket
|
||||
//
|
||||
Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
|
||||
Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
|
||||
'Class:Ticket' => 'Ticket',
|
||||
'Class:Ticket+' => 'Ticket',
|
||||
'Class:Ticket/Attribute:ref' => 'Ref',
|
||||
@@ -93,7 +93,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
|
||||
// Class: lnkContactToTicket
|
||||
//
|
||||
|
||||
Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
|
||||
Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
|
||||
'Class:lnkContactToTicket' => 'Relación Contacto y Ticket',
|
||||
'Class:lnkContactToTicket+' => 'Relación Contacto y Ticket',
|
||||
'Class:lnkContactToTicket/Attribute:ticket_id' => 'Ticket',
|
||||
@@ -116,7 +116,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
|
||||
// Class: WorkOrder
|
||||
//
|
||||
|
||||
Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
|
||||
Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
|
||||
'Class:WorkOrder' => 'Orden de Trabajo',
|
||||
'Class:WorkOrder+' => 'Orden de Trabajo',
|
||||
'Class:WorkOrder/Attribute:name' => 'Nombre',
|
||||
@@ -153,7 +153,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
|
||||
|
||||
|
||||
// Fieldset translation
|
||||
Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
|
||||
Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
|
||||
'Ticket:baseinfo' => 'Información General',
|
||||
'Ticket:date' => 'Fechas',
|
||||
'Ticket:contact' => 'Contactos',
|
||||
@@ -217,7 +217,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
|
||||
// Class: Document
|
||||
//
|
||||
|
||||
Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
|
||||
Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
|
||||
'Class:Document/Attribute:contracts_list' => 'Contratos',
|
||||
'Class:Document/Attribute:contracts_list+' => 'Contratos Referenciados con este Documento',
|
||||
'Class:Document/Attribute:services_list' => 'Servicios',
|
||||
|
||||
Reference in New Issue
Block a user