mirror of
https://github.com/Combodo/iTop.git
synced 2026-05-20 07:42:17 +02:00
Merge remote-tracking branch 'origin/support/2.7' into develop
# 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:
@@ -4,6 +4,7 @@
|
||||
*
|
||||
* @copyright Copyright (C) 2010-2021 Combodo SARL
|
||||
* @license http://opensource.org/licenses/AGPL-3.0
|
||||
* @traductor Miguel Turrubiates <miguel_tf@yahoo.com>
|
||||
*
|
||||
* This file is part of iTop.
|
||||
*
|
||||
@@ -47,7 +48,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
|
||||
'iTopHub:Landing:Install' => 'Instalando extensiones...',
|
||||
'iTopHub:CompiledOK' => 'Compilación éxitosa.',
|
||||
'iTopHub:ConfigurationSafelyReverted' => 'Error detectado durante la instalación!<br/>La configuración de '.ITOP_APPLICATION_SHORT.' NO fue modificada.',
|
||||
'iTopHub:FailAuthent' => 'Authentication failed for this action.~~',
|
||||
'iTopHub:FailAuthent' => 'Autenticación fallida para esta acciónn.',
|
||||
|
||||
'iTopHub:InstalledExtensions' => 'Extensiones instaladas en esta instancia',
|
||||
'iTopHub:ExtensionCategory:Manual' => 'Extensiones instaladas manualmente',
|
||||
@@ -76,11 +77,11 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
|
||||
'iTopHub:InstallationProgress:ExtensionsInstallation' => 'Instalación de extensiones',
|
||||
'iTopHub:InstallationEffect:MissingDependencies' => 'Esta extensión no puede ser instalad porque no cumple con las dependencias.',
|
||||
'iTopHub:InstallationEffect:MissingDependencies_Details' => 'La extensión require el/los módulo(s): %1$s',
|
||||
'iTopHub:InstallationProgress:InstallationSuccessful' => 'Instalación éxitosa!',
|
||||
'iTopHub:InstallationProgress:InstallationSuccessful' => '¡Instalación éxitosa!',
|
||||
|
||||
'iTopHub:InstallationStatus:Installed_Version' => '%1$s version: %2$s.',
|
||||
'iTopHub:InstallationStatus:Installed_Version' => '%1$s versión: %2$s.',
|
||||
'iTopHub:InstallationStatus:Installed' => 'Instalada',
|
||||
'iTopHub:InstallationStatus:Version_NotInstalled' => 'Version %1$s <b>NO</b> está instalada.',
|
||||
'iTopHub:InstallationStatus:Version_NotInstalled' => 'Versión %1$s <b>NO</b> está instalada.',
|
||||
));
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user