mirror of
https://github.com/Combodo/iTop.git
synced 2026-05-20 07:42:17 +02:00
Merge branch 'support/3.2' into develop
# Conflicts: # datamodels/2.x/itop-attachments/dictionaries/cs.dict.itop-attachments.php # datamodels/2.x/itop-attachments/dictionaries/da.dict.itop-attachments.php # datamodels/2.x/itop-attachments/dictionaries/de.dict.itop-attachments.php # datamodels/2.x/itop-attachments/dictionaries/es_cr.dict.itop-attachments.php # datamodels/2.x/itop-attachments/dictionaries/fr.dict.itop-attachments.php # datamodels/2.x/itop-attachments/dictionaries/hu.dict.itop-attachments.php # datamodels/2.x/itop-attachments/dictionaries/it.dict.itop-attachments.php # datamodels/2.x/itop-attachments/dictionaries/ja.dict.itop-attachments.php # datamodels/2.x/itop-attachments/dictionaries/nl.dict.itop-attachments.php # datamodels/2.x/itop-attachments/dictionaries/pl.dict.itop-attachments.php # datamodels/2.x/itop-attachments/dictionaries/pt_br.dict.itop-attachments.php # datamodels/2.x/itop-attachments/dictionaries/ru.dict.itop-attachments.php # datamodels/2.x/itop-attachments/dictionaries/sk.dict.itop-attachments.php # datamodels/2.x/itop-attachments/dictionaries/tr.dict.itop-attachments.php # datamodels/2.x/itop-attachments/dictionaries/zh_cn.dict.itop-attachments.php # datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php # datamodels/2.x/itop-config/dictionaries/it.dict.itop-config.php # datamodels/2.x/itop-incident-mgmt-itil/dictionaries/it.dict.itop-incident-mgmt-itil.php # datamodels/2.x/itop-knownerror-mgmt/dictionaries/it.dict.itop-knownerror-mgmt.php # datamodels/2.x/itop-portal/dictionaries/it.dict.itop-portal.php # datamodels/2.x/itop-problem-mgmt/dictionaries/it.dict.itop-problem-mgmt.php # datamodels/2.x/itop-request-mgmt-itil/dictionaries/it.dict.itop-request-mgmt-itil.php # datamodels/2.x/itop-request-mgmt/dictionaries/it.dict.itop-request-mgmt.php # dictionaries/cs.dictionary.itop.core.php # dictionaries/da.dictionary.itop.core.php # dictionaries/de.dictionary.itop.core.php # dictionaries/es_cr.dictionary.itop.core.php # dictionaries/fr.dictionary.itop.core.php # dictionaries/fr.dictionary.itop.ui.php # dictionaries/hu.dictionary.itop.core.php # dictionaries/it.dictionary.itop.core.php # dictionaries/it.dictionary.itop.ui.php # dictionaries/ja.dictionary.itop.core.php # dictionaries/nl.dictionary.itop.core.php # dictionaries/pl.dictionary.itop.core.php # dictionaries/pt_br.dictionary.itop.core.php # dictionaries/ru.dictionary.itop.core.php # dictionaries/sk.dictionary.itop.core.php # dictionaries/tr.dictionary.itop.core.php # dictionaries/ui/components/quick-create/cs.dictionary.itop.quick-create.php # dictionaries/ui/components/quick-create/da.dictionary.itop.quick-create.php # dictionaries/ui/components/quick-create/de.dictionary.itop.quick-create.php # dictionaries/ui/components/quick-create/es_cr.dictionary.itop.quick-create.php # dictionaries/ui/components/quick-create/fr.dictionary.itop.quick-create.php # dictionaries/ui/components/quick-create/hu.dictionary.itop.quick-create.php # dictionaries/ui/components/quick-create/it.dictionary.itop.quick-create.php # dictionaries/ui/components/quick-create/ja.dictionary.itop.quick-create.php # dictionaries/ui/components/quick-create/nl.dictionary.itop.quick-create.php # dictionaries/ui/components/quick-create/pl.dictionary.itop.quick-create.php # dictionaries/ui/components/quick-create/pt_br.dictionary.itop.quick-create.php # dictionaries/ui/components/quick-create/ru.dictionary.itop.quick-create.php # dictionaries/ui/components/quick-create/sk.dictionary.itop.quick-create.php # dictionaries/ui/components/quick-create/tr.dictionary.itop.quick-create.php
This commit is contained in:
Timothee
@@ -9,6 +9,6 @@
|
||||
/**
|
||||
*
|
||||
*/
|
||||
Dict::Add('CS CZ', 'Czech', 'Čeština', [
|
||||
Dict::Add('CS CZ', 'Czech', 'Čeština', array(
|
||||
'theme:light-grey' => 'Světle šedá (zastaralé)',
|
||||
]);
|
||||
));
|
||||
|
||||
@@ -9,6 +9,6 @@
|
||||
/**
|
||||
*
|
||||
*/
|
||||
Dict::Add('DA DA', 'Danish', 'Dansk', [
|
||||
Dict::Add('DA DA', 'Danish', 'Dansk', array(
|
||||
'theme:light-grey' => 'Light Grey (deprecated)~~',
|
||||
]);
|
||||
));
|
||||
|
||||
@@ -9,6 +9,6 @@
|
||||
/**
|
||||
*
|
||||
*/
|
||||
Dict::Add('DE DE', 'German', 'Deutsch', [
|
||||
Dict::Add('DE DE', 'German', 'Deutsch', array(
|
||||
'theme:light-grey' => 'Light Grey (veraltet)',
|
||||
]);
|
||||
));
|
||||
|
||||
@@ -9,6 +9,6 @@
|
||||
/**
|
||||
*
|
||||
*/
|
||||
Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
|
||||
Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
|
||||
'theme:light-grey' => 'Gris claro (obsoleto)',
|
||||
]);
|
||||
));
|
||||
|
||||
@@ -9,6 +9,6 @@
|
||||
/**
|
||||
*
|
||||
*/
|
||||
Dict::Add('FR FR', 'French', 'Français', [
|
||||
Dict::Add('FR FR', 'French', 'Français', array(
|
||||
'theme:light-grey' => 'Light Grey (obsolète)',
|
||||
]);
|
||||
));
|
||||
|
||||
@@ -9,6 +9,6 @@
|
||||
/**
|
||||
*
|
||||
*/
|
||||
Dict::Add('HU HU', 'Hungarian', 'Magyar', [
|
||||
Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
|
||||
'theme:light-grey' => 'Világosszürke (elavult)',
|
||||
]);
|
||||
));
|
||||
|
||||
@@ -9,6 +9,6 @@
|
||||
/**
|
||||
*
|
||||
*/
|
||||
Dict::Add('IT IT', 'Italian', 'Italiano', [
|
||||
Dict::Add('IT IT', 'Italian', 'Italiano', array(
|
||||
'theme:light-grey' => 'Light Grey (deprecated)~~',
|
||||
]);
|
||||
));
|
||||
|
||||
@@ -9,6 +9,6 @@
|
||||
/**
|
||||
*
|
||||
*/
|
||||
Dict::Add('JA JP', 'Japanese', '日本語', [
|
||||
Dict::Add('JA JP', 'Japanese', '日本語', array(
|
||||
'theme:light-grey' => 'Light Grey (deprecated)~~',
|
||||
]);
|
||||
));
|
||||
|
||||
@@ -6,10 +6,9 @@
|
||||
* @license https://opensource.org/licenses/AGPL-3.0
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
* @author Thomas Casteleyn <thomas.casteleyn@super-visions.com>
|
||||
*/
|
||||
Dict::Add('NL NL', 'Dutch', 'Nederlands', [
|
||||
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
|
||||
'theme:light-grey' => 'Lichtgrijs (verouderd)',
|
||||
]);
|
||||
));
|
||||
|
||||
@@ -9,6 +9,6 @@
|
||||
/**
|
||||
*
|
||||
*/
|
||||
Dict::Add('PL PL', 'Polish', 'Polski', [
|
||||
Dict::Add('PL PL', 'Polish', 'Polski', array(
|
||||
'theme:light-grey' => 'Jasnoszary (przestarzałe)',
|
||||
]);
|
||||
));
|
||||
|
||||
@@ -9,6 +9,6 @@
|
||||
/**
|
||||
*
|
||||
*/
|
||||
Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
|
||||
Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
|
||||
'theme:light-grey' => 'Light Grey (deprecated)~~',
|
||||
]);
|
||||
));
|
||||
|
||||
@@ -9,6 +9,6 @@
|
||||
/**
|
||||
*
|
||||
*/
|
||||
Dict::Add('RU RU', 'Russian', 'Русский', [
|
||||
Dict::Add('RU RU', 'Russian', 'Русский', array(
|
||||
'theme:light-grey' => 'Light Grey (deprecated)~~',
|
||||
]);
|
||||
));
|
||||
|
||||
@@ -9,6 +9,6 @@
|
||||
/**
|
||||
*
|
||||
*/
|
||||
Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
|
||||
Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
|
||||
'theme:light-grey' => 'Light Grey (deprecated)~~',
|
||||
]);
|
||||
));
|
||||
|
||||
@@ -9,6 +9,6 @@
|
||||
/**
|
||||
*
|
||||
*/
|
||||
Dict::Add('TR TR', 'Turkish', 'Türkçe', [
|
||||
Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
|
||||
'theme:light-grey' => 'Light Grey (deprecated)~~',
|
||||
]);
|
||||
));
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
* @copyright Copyright (C) 2010-2024 Combodo SAS
|
||||
* @license http://opensource.org/licenses/AGPL-3.0
|
||||
*/
|
||||
|
||||
Dict::Add('ZH CN', 'Chinese', '简体中文', [
|
||||
Dict::Add('ZH CN', 'Chinese', '简体中文', array(
|
||||
'theme:light-grey' => '淡灰 (废弃)',
|
||||
]);
|
||||
));
|
||||
|
||||
Reference in New Issue
Block a user