mirror of
https://github.com/Combodo/iTop.git
synced 2026-05-01 22:48:45 +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:
@@ -22,7 +22,7 @@
|
||||
* along with iTop. If not, see <http://www.gnu.org/licenses/>
|
||||
*/
|
||||
// Database inconsistencies
|
||||
Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
|
||||
Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
|
||||
// Dictionary entries go here
|
||||
'Menu:DBToolsMenu' => 'Integridad de Base de Datos',
|
||||
'DBTools:Class' => 'Clase',
|
||||
@@ -61,14 +61,14 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
|
||||
));
|
||||
|
||||
// Database Info
|
||||
Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
|
||||
Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
|
||||
'DBTools:DatabaseInfo' => 'Información de Base de Datos',
|
||||
'DBTools:Base' => 'Base',
|
||||
'DBTools:Size' => 'Tamaño',
|
||||
));
|
||||
|
||||
// Lost attachments
|
||||
Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
|
||||
Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
|
||||
'DBTools:LostAttachments' => 'Adjuntos perdidos',
|
||||
'DBTools:LostAttachments:Disclaimer' => 'Aquí usted puede buscar anexos perdidos o fuera de lugar. Esta NO es una herramienta de recuperación de datos, no obtiene datos borrados.',
|
||||
|
||||
|
||||
Reference in New Issue
Block a user