mirror of
https://github.com/Combodo/iTop.git
synced 2026-10-24 09:18:59 +02:00
18f4ed1f3b
# Conflicts: # datamodels/2.x/authent-cas/dictionaries/en_gb.dict.authent-cas.php # datamodels/2.x/authent-ldap/dictionaries/en_gb.dict.authent-ldap.php # datamodels/2.x/authent-local/dictionaries/en_gb.dict.authent-local.php # datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/en_gb.dict.combodo-backoffice-darkmoon-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/dictionaries/da.dict.combodo-backoffice-fullmoon-high-contrast-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/dictionaries/de.dict.combodo-backoffice-fullmoon-high-contrast-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/dictionaries/en_gb.dict.combodo-backoffice-fullmoon-high-contrast-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/dictionaries/hu.dict.combodo-backoffice-fullmoon-high-contrast-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/dictionaries/it.dict.combodo-backoffice-fullmoon-high-contrast-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/dictionaries/ja.dict.combodo-backoffice-fullmoon-high-contrast-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/dictionaries/nl.dict.combodo-backoffice-fullmoon-high-contrast-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/dictionaries/pt_br.dict.combodo-backoffice-fullmoon-high-contrast-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/dictionaries/ru.dict.combodo-backoffice-fullmoon-high-contrast-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/dictionaries/sk.dict.combodo-backoffice-fullmoon-high-contrast-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/dictionaries/tr.dict.combodo-backoffice-fullmoon-high-contrast-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/dictionaries/da.dict.combodo-backoffice-fullmoon-protanopia-deuteranopia-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/dictionaries/de.dict.combodo-backoffice-fullmoon-protanopia-deuteranopia-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/dictionaries/en_gb.dict.combodo-backoffice-fullmoon-protanopia-deuteranopia-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/dictionaries/hu.dict.combodo-backoffice-fullmoon-protanopia-deuteranopia-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/dictionaries/it.dict.combodo-backoffice-fullmoon-protanopia-deuteranopia-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/dictionaries/ja.dict.combodo-backoffice-fullmoon-protanopia-deuteranopia-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/dictionaries/nl.dict.combodo-backoffice-fullmoon-protanopia-deuteranopia-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/dictionaries/pt_br.dict.combodo-backoffice-fullmoon-protanopia-deuteranopia-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/dictionaries/ru.dict.combodo-backoffice-fullmoon-protanopia-deuteranopia-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/dictionaries/sk.dict.combodo-backoffice-fullmoon-protanopia-deuteranopia-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/dictionaries/tr.dict.combodo-backoffice-fullmoon-protanopia-deuteranopia-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/dictionaries/da.dict.combodo-backoffice-fullmoon-tritanopia-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/dictionaries/de.dict.combodo-backoffice-fullmoon-tritanopia-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/dictionaries/en_gb.dict.combodo-backoffice-fullmoon-tritanopia-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/dictionaries/hu.dict.combodo-backoffice-fullmoon-tritanopia-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/dictionaries/it.dict.combodo-backoffice-fullmoon-tritanopia-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/dictionaries/ja.dict.combodo-backoffice-fullmoon-tritanopia-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/dictionaries/nl.dict.combodo-backoffice-fullmoon-tritanopia-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/dictionaries/pt_br.dict.combodo-backoffice-fullmoon-tritanopia-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/dictionaries/ru.dict.combodo-backoffice-fullmoon-tritanopia-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/dictionaries/sk.dict.combodo-backoffice-fullmoon-tritanopia-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/dictionaries/tr.dict.combodo-backoffice-fullmoon-tritanopia-theme.php # datamodels/2.x/combodo-db-tools/dictionaries/en_gb.dict.combodo-db-tools.php # datamodels/2.x/itop-backup/dictionaries/en_gb.dict.itop-backup.php # datamodels/2.x/itop-bridge-cmdb-services/dictionaries/en_gb.dict.itop-bridge-cmdb-services.php # datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/en_gb.dict.itop-bridge-cmdb-ticket.php # datamodels/2.x/itop-change-mgmt-itil/dictionaries/en_gb.dict.itop-change-mgmt-itil.php # datamodels/2.x/itop-change-mgmt/dictionaries/en_gb.dict.itop-change-mgmt.php # datamodels/2.x/itop-config-mgmt/dictionaries/en_gb.dict.itop-config-mgmt.php # datamodels/2.x/itop-config/dictionaries/en_gb.dict.itop-config.php # datamodels/2.x/itop-core-update/dictionaries/en_gb.dict.itop-core-update.php # datamodels/2.x/itop-datacenter-mgmt/dictionaries/cs.dict.itop-datacenter-mgmt.php # datamodels/2.x/itop-datacenter-mgmt/dictionaries/da.dict.itop-datacenter-mgmt.php # datamodels/2.x/itop-datacenter-mgmt/dictionaries/de.dict.itop-datacenter-mgmt.php # datamodels/2.x/itop-datacenter-mgmt/dictionaries/en_gb.dict.itop-datacenter-mgmt.php # datamodels/2.x/itop-datacenter-mgmt/dictionaries/fr.dict.itop-datacenter-mgmt.php # datamodels/2.x/itop-datacenter-mgmt/dictionaries/hu.dict.itop-datacenter-mgmt.php # datamodels/2.x/itop-datacenter-mgmt/dictionaries/it.dict.itop-datacenter-mgmt.php # datamodels/2.x/itop-datacenter-mgmt/dictionaries/ja.dict.itop-datacenter-mgmt.php # datamodels/2.x/itop-datacenter-mgmt/dictionaries/nl.dict.itop-datacenter-mgmt.php # datamodels/2.x/itop-datacenter-mgmt/dictionaries/pl.dict.itop-datacenter-mgmt.php # datamodels/2.x/itop-datacenter-mgmt/dictionaries/pt_br.dict.itop-datacenter-mgmt.php # datamodels/2.x/itop-datacenter-mgmt/dictionaries/sk.dict.itop-datacenter-mgmt.php # datamodels/2.x/itop-datacenter-mgmt/dictionaries/tr.dict.itop-datacenter-mgmt.php # datamodels/2.x/itop-endusers-devices/dictionaries/cs.dict.itop-endusers-devices.php # datamodels/2.x/itop-endusers-devices/dictionaries/da.dict.itop-endusers-devices.php # datamodels/2.x/itop-endusers-devices/dictionaries/de.dict.itop-endusers-devices.php # datamodels/2.x/itop-endusers-devices/dictionaries/en_gb.dict.itop-endusers-devices.php # datamodels/2.x/itop-endusers-devices/dictionaries/fr.dict.itop-endusers-devices.php # datamodels/2.x/itop-endusers-devices/dictionaries/hu.dict.itop-endusers-devices.php # datamodels/2.x/itop-endusers-devices/dictionaries/it.dict.itop-endusers-devices.php # datamodels/2.x/itop-endusers-devices/dictionaries/ja.dict.itop-endusers-devices.php # datamodels/2.x/itop-endusers-devices/dictionaries/nl.dict.itop-endusers-devices.php # datamodels/2.x/itop-endusers-devices/dictionaries/pl.dict.itop-endusers-devices.php # datamodels/2.x/itop-endusers-devices/dictionaries/pt_br.dict.itop-endusers-devices.php # datamodels/2.x/itop-endusers-devices/dictionaries/sk.dict.itop-endusers-devices.php # datamodels/2.x/itop-endusers-devices/dictionaries/tr.dict.itop-endusers-devices.php # datamodels/2.x/itop-faq-light/dictionaries/en_gb.dict.itop-faq-light.php # datamodels/2.x/itop-files-information/dictionaries/en_gb.dict.itop-files-information.php # datamodels/2.x/itop-hub-connector/dictionaries/en_gb.dict.itop-hub-connector.php # datamodels/2.x/itop-incident-mgmt-itil/dictionaries/en_gb.dict.itop-incident-mgmt-itil.php # datamodels/2.x/itop-knownerror-mgmt/dictionaries/en_gb.dict.itop-knownerror-mgmt.php # datamodels/2.x/itop-portal-base/portal/public/js/user_preferences.js # datamodels/2.x/itop-portal/dictionaries/en_gb.dict.itop-portal.php # datamodels/2.x/itop-problem-mgmt/dictionaries/en_gb.dict.itop-problem-mgmt.php # datamodels/2.x/itop-request-mgmt-itil/dictionaries/en_gb.dict.itop-request-mgmt-itil.php # datamodels/2.x/itop-request-mgmt/dictionaries/en_gb.dict.itop-request-mgmt.php # datamodels/2.x/itop-service-mgmt-provider/dictionaries/en_gb.dict.itop-service-mgmt-provider.php # datamodels/2.x/itop-service-mgmt/dictionaries/en_gb.dict.itop-service-mgmt.php # datamodels/2.x/itop-sla-computation/dictionaries/cs.dict.itop-sla-computation.php # datamodels/2.x/itop-sla-computation/dictionaries/fr.dict.itop-sla-computation.php # datamodels/2.x/itop-sla-computation/dictionaries/hu.dict.itop-sla-computation.php # datamodels/2.x/itop-sla-computation/dictionaries/it.dict.itop-sla-computation.php # datamodels/2.x/itop-sla-computation/dictionaries/ja.dict.itop-sla-computation.php # datamodels/2.x/itop-sla-computation/dictionaries/nl.dict.itop-sla-computation.php # datamodels/2.x/itop-sla-computation/dictionaries/pl.dict.itop-sla-computation.php # datamodels/2.x/itop-sla-computation/dictionaries/pt_br.dict.itop-sla-computation.php # datamodels/2.x/itop-sla-computation/dictionaries/sk.dict.itop-sla-computation.php # datamodels/2.x/itop-sla-computation/dictionaries/tr.dict.itop-sla-computation.php # datamodels/2.x/itop-storage-mgmt/dictionaries/cs.dict.itop-storage-mgmt.php # datamodels/2.x/itop-storage-mgmt/dictionaries/da.dict.itop-storage-mgmt.php # datamodels/2.x/itop-storage-mgmt/dictionaries/de.dict.itop-storage-mgmt.php # datamodels/2.x/itop-storage-mgmt/dictionaries/en_gb.dict.itop-storage-mgmt.php # datamodels/2.x/itop-storage-mgmt/dictionaries/fr.dict.itop-storage-mgmt.php # datamodels/2.x/itop-storage-mgmt/dictionaries/hu.dict.itop-storage-mgmt.php # datamodels/2.x/itop-storage-mgmt/dictionaries/it.dict.itop-storage-mgmt.php # datamodels/2.x/itop-storage-mgmt/dictionaries/ja.dict.itop-storage-mgmt.php # datamodels/2.x/itop-storage-mgmt/dictionaries/nl.dict.itop-storage-mgmt.php # datamodels/2.x/itop-storage-mgmt/dictionaries/pl.dict.itop-storage-mgmt.php # datamodels/2.x/itop-storage-mgmt/dictionaries/pt_br.dict.itop-storage-mgmt.php # datamodels/2.x/itop-storage-mgmt/dictionaries/sk.dict.itop-storage-mgmt.php # datamodels/2.x/itop-storage-mgmt/dictionaries/tr.dict.itop-storage-mgmt.php # datamodels/2.x/itop-structure/dictionaries/en_gb.dict.itop-structure.php # datamodels/2.x/itop-tickets/dictionaries/en_gb.dict.itop-tickets.php # datamodels/2.x/itop-virtualization-mgmt/dictionaries/cs.dict.itop-virtualization-mgmt.php # datamodels/2.x/itop-virtualization-mgmt/dictionaries/da.dict.itop-virtualization-mgmt.php # datamodels/2.x/itop-virtualization-mgmt/dictionaries/de.dict.itop-virtualization-mgmt.php # datamodels/2.x/itop-virtualization-mgmt/dictionaries/en_gb.dict.itop-virtualization-mgmt.php # datamodels/2.x/itop-virtualization-mgmt/dictionaries/fr.dict.itop-virtualization-mgmt.php # datamodels/2.x/itop-virtualization-mgmt/dictionaries/hu.dict.itop-virtualization-mgmt.php # datamodels/2.x/itop-virtualization-mgmt/dictionaries/it.dict.itop-virtualization-mgmt.php # datamodels/2.x/itop-virtualization-mgmt/dictionaries/ja.dict.itop-virtualization-mgmt.php # datamodels/2.x/itop-virtualization-mgmt/dictionaries/pl.dict.itop-virtualization-mgmt.php # datamodels/2.x/itop-virtualization-mgmt/dictionaries/pt_br.dict.itop-virtualization-mgmt.php # datamodels/2.x/itop-virtualization-mgmt/dictionaries/sk.dict.itop-virtualization-mgmt.php # datamodels/2.x/itop-virtualization-mgmt/dictionaries/tr.dict.itop-virtualization-mgmt.php # datamodels/2.x/itop-welcome-itil/dictionaries/en_gb.dict.itop-welcome-itil.php # dictionaries/core/orm-value/orm-document/en_gb.dictionary.itop.orm-document.php # dictionaries/de.dictionary.itop.core.php # dictionaries/en_gb.dictionary.itop.core.php # dictionaries/en_gb.dictionary.itop.ui.php # dictionaries/ui/application/welcome-popup/cs.dictionary.itop.welcome-popup.php # dictionaries/ui/application/welcome-popup/da.dictionary.itop.welcome-popup.php # dictionaries/ui/application/welcome-popup/de.dictionary.itop.welcome-popup.php # dictionaries/ui/application/welcome-popup/en_gb.dictionary.itop.welcome-popup.php # dictionaries/ui/application/welcome-popup/hu.dictionary.itop.welcome-popup.php # dictionaries/ui/application/welcome-popup/it.dictionary.itop.welcome-popup.php # dictionaries/ui/application/welcome-popup/ja.dictionary.itop.welcome-popup.php # dictionaries/ui/application/welcome-popup/nl.dictionary.itop.welcome-popup.php # dictionaries/ui/application/welcome-popup/pl.dictionary.itop.welcome-popup.php # dictionaries/ui/application/welcome-popup/pt_br.dictionary.itop.welcome-popup.php # dictionaries/ui/application/welcome-popup/ru.dictionary.itop.welcome-popup.php # dictionaries/ui/application/welcome-popup/sk.dictionary.itop.welcome-popup.php # dictionaries/ui/application/welcome-popup/tr.dictionary.itop.welcome-popup.php # dictionaries/ui/layouts/object-details/en_gb.dictionary.itop.object-details.php # dictionaries/ui/layouts/page-content/en_gb.dictionary.itop.page-content.php # dictionaries/ui/layouts/tab-container/en_gb.dictionary.itop.tab-container.php # dictionaries/ui/layouts/ui-content-block/en_gb.dictionary.itop.ui-content-block.php # dictionaries/ui/pages/login/en_gb.dictionary.itop.login.php # dictionaries/ui/pages/login/es_cr.dictionary.itop.login.php # dictionaries/ui/pages/login/fr.dictionary.itop.login.php # dictionaries/ui/pages/login/hu.dictionary.itop.login.php # dictionaries/ui/pages/login/it.dictionary.itop.login.php # dictionaries/ui/pages/login/ja.dictionary.itop.login.php # dictionaries/ui/pages/login/nl.dictionary.itop.login.php # dictionaries/ui/pages/login/pl.dictionary.itop.login.php # dictionaries/ui/pages/login/pt_br.dictionary.itop.login.php # dictionaries/ui/pages/login/ru.dictionary.itop.login.php # dictionaries/ui/pages/login/sk.dictionary.itop.login.php # dictionaries/ui/pages/login/tr.dictionary.itop.login.php # setup/wizardsteps/WizStepLicense2.php # sources/Application/UI/Base/Component/Button/ButtonSeparator.php # sources/Application/UI/Base/Layout/TopBar/TopBarQuickAction/TopBarQuickActionURL.php