mirror of
https://github.com/Combodo/iTop.git
synced 2026-05-20 07:42:17 +02:00
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
Most of the conflicts are caused by HU translations (N°7077 / #584) # Conflicts: # css/setup.css # datamodels/2.x/authent-cas/dictionaries/hu.dict.authent-cas.php # datamodels/2.x/authent-ldap/dictionaries/hu.dict.authent-ldap.php # datamodels/2.x/authent-local/dictionaries/hu.dict.authent-local.php # datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/hu.dict.combodo-backoffice-darkmoon-theme.php # datamodels/2.x/combodo-db-tools/dictionaries/hu.dict.combodo-db-tools.php # datamodels/2.x/itop-attachments/dictionaries/hu.dict.itop-attachments.php # datamodels/2.x/itop-backup/dictionaries/hu.dict.itop-backup.php # datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/hu.dict.itop-bridge-cmdb-ticket.php # datamodels/2.x/itop-change-mgmt-itil/dictionaries/hu.dict.itop-change-mgmt-itil.php # datamodels/2.x/itop-change-mgmt/dictionaries/hu.dict.itop-change-mgmt.php # datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php # datamodels/2.x/itop-config/dictionaries/hu.dict.itop-config.php # datamodels/2.x/itop-core-update/dictionaries/hu.dict.itop-core-update.php # datamodels/2.x/itop-faq-light/dictionaries/hu.dict.itop-faq-light.php # datamodels/2.x/itop-hub-connector/dictionaries/hu.dict.itop-hub-connector.php # datamodels/2.x/itop-incident-mgmt-itil/dictionaries/hu.dict.itop-incident-mgmt-itil.php # datamodels/2.x/itop-knownerror-mgmt/dictionaries/hu.dict.itop-knownerror-mgmt.php # datamodels/2.x/itop-oauth-client/hu.dict.itop-oauth-client.php # datamodels/2.x/itop-portal-base/dictionaries/hu.dict.itop-portal-base.php # datamodels/2.x/itop-portal/dictionaries/hu.dict.itop-portal.php # datamodels/2.x/itop-problem-mgmt/dictionaries/hu.dict.itop-problem-mgmt.php # datamodels/2.x/itop-request-mgmt-itil/dictionaries/hu.dict.itop-request-mgmt-itil.php # datamodels/2.x/itop-request-mgmt/dictionaries/hu.dict.itop-request-mgmt.php # datamodels/2.x/itop-service-mgmt-provider/dictionaries/hu.dict.itop-service-mgmt-provider.php # datamodels/2.x/itop-service-mgmt/dictionaries/hu.dict.itop-service-mgmt.php # datamodels/2.x/itop-structure/dictionaries/hu.dict.itop-structure.php # datamodels/2.x/itop-tickets/dictionaries/hu.dict.itop-tickets.php # dictionaries/hu.dictionary.itop.core.php # dictionaries/hu.dictionary.itop.ui.php # dictionaries/ui/components/breadcrumbs/hu.dictionary.itop.breadcrumbs.php # dictionaries/ui/components/datatable/hu.dictionary.itop.datatable.php # dictionaries/ui/components/field/hu.dictionary.itop.field.php # dictionaries/ui/components/global-search/hu.dictionary.itop.global-search.php # dictionaries/ui/components/input/hu.dictionary.itop.input.php # dictionaries/ui/components/quick-create/hu.dictionary.itop.quick-create.php # dictionaries/ui/layouts/activity-panel/hu.dictionary.itop.activity-panel.php # dictionaries/ui/layouts/navigation-menu/hu.dictionary.itop.navigation-menu.php # dictionaries/ui/layouts/object-details/hu.dictionary.itop.object-details.php # dictionaries/ui/layouts/page-content/hu.dictionary.itop.page-content.php # dictionaries/ui/layouts/tab-container/hu.dictionary.itop.tab-container.php # dictionaries/ui/pages/errorpage/hu.dictionary.itop.errorpage.php # dictionaries/ui/pages/preferences/hu.dictionary.itop.preferences.php # tests/php-unit-tests/unitary-tests/setup/DBBackupTest.php
This commit is contained in:
Pierre Goiffon
@@ -23,23 +23,23 @@
|
||||
// Class: FAQ
|
||||
//
|
||||
Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
|
||||
'Class:FAQ' => 'Tudástár',
|
||||
'Class:FAQ+' => 'Gyakran Ismételt Kérdések',
|
||||
'Class:FAQ/Attribute:title' => 'Cím',
|
||||
'Class:FAQ/Attribute:title+' => '~~',
|
||||
'Class:FAQ/Attribute:summary' => 'Összefoglaló',
|
||||
'Class:FAQ/Attribute:summary+' => '~~',
|
||||
'Class:FAQ/Attribute:description' => 'Leírás',
|
||||
'Class:FAQ/Attribute:description+' => '~~',
|
||||
'Class:FAQ/Attribute:category_id' => 'Kategória',
|
||||
'Class:FAQ/Attribute:category_id+' => '~~',
|
||||
'Class:FAQ/Attribute:category_name' => 'Kategória név',
|
||||
'Class:FAQ/Attribute:category_name+' => '~~',
|
||||
'Class:FAQ/Attribute:error_code' => 'Hibakód',
|
||||
'Class:FAQ/Attribute:error_code+' => '~~',
|
||||
'Class:FAQ/Attribute:key_words' => 'Kulcsszavak',
|
||||
'Class:FAQ/Attribute:key_words+' => '~~',
|
||||
'Class:FAQ/Attribute:domains' => 'Hibatartomány',
|
||||
'Class:FAQ' => 'Tudástár',
|
||||
'Class:FAQ+' => 'Gyakran Ismételt Kérdések',
|
||||
'Class:FAQ/Attribute:title' => 'Cím',
|
||||
'Class:FAQ/Attribute:title+' => 'A tudástár címe',
|
||||
'Class:FAQ/Attribute:summary' => 'Összefoglaló',
|
||||
'Class:FAQ/Attribute:summary+' => 'Egy rövid leírás a témáról',
|
||||
'Class:FAQ/Attribute:description' => 'Leírás',
|
||||
'Class:FAQ/Attribute:description+' => 'Maga a tudástár cikk',
|
||||
'Class:FAQ/Attribute:category_id' => 'Kategória',
|
||||
'Class:FAQ/Attribute:category_id+' => '~~',
|
||||
'Class:FAQ/Attribute:category_name' => 'Kategória név',
|
||||
'Class:FAQ/Attribute:category_name+' => '~~',
|
||||
'Class:FAQ/Attribute:error_code' => 'Hibakód',
|
||||
'Class:FAQ/Attribute:error_code+' => '~~',
|
||||
'Class:FAQ/Attribute:key_words' => 'Kulcsszavak',
|
||||
'Class:FAQ/Attribute:key_words+' => 'A keresést segítő kulcsszavak',
|
||||
'Class:FAQ/Attribute:domains' => 'Hibatartomány',
|
||||
));
|
||||
|
||||
//
|
||||
@@ -47,22 +47,22 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
|
||||
//
|
||||
|
||||
Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
|
||||
'Class:FAQCategory' => 'Tudástár kategória',
|
||||
'Class:FAQCategory+' => 'Category for FAQ~~',
|
||||
'Class:FAQCategory/Attribute:name' => 'Név',
|
||||
'Class:FAQCategory/Attribute:name+' => '~~',
|
||||
'Class:FAQCategory/Attribute:faq_list' => 'Tudástárak',
|
||||
'Class:FAQCategory/Attribute:faq_list+' => 'All the frequently asked questions related to this category~~',
|
||||
'Class:FAQCategory' => 'Tudástár kategória',
|
||||
'Class:FAQCategory+' => '',
|
||||
'Class:FAQCategory/Attribute:name' => 'Kategória név',
|
||||
'Class:FAQCategory/Attribute:name+' => '~~',
|
||||
'Class:FAQCategory/Attribute:faq_list' => 'Tudástárak',
|
||||
'Class:FAQCategory/Attribute:faq_list+' => 'Gyakori kérdések ehhez a kategóriához kapcsolódóan',
|
||||
));
|
||||
Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
|
||||
'Menu:ProblemManagement' => 'Problémakezelés',
|
||||
'Menu:ProblemManagement+' => '',
|
||||
'Menu:Problem:Shortcuts' => 'Gyorsgombok',
|
||||
'Menu:FAQCategory' => 'Tudástár kategória',
|
||||
'Menu:FAQCategory+' => 'Összes tudástár kategória',
|
||||
'Menu:FAQ' => 'Tudástár',
|
||||
'Menu:FAQ+' => 'Összes tudástár',
|
||||
'Brick:Portal:FAQ:Menu' => 'Tudástár',
|
||||
'Brick:Portal:FAQ:Title' => 'Tudástárak',
|
||||
'Brick:Portal:FAQ:Title+' => '<p>Siet?</p><p>Nézze át a leggyakoribb kérdések listáját, és (talán) azonnal megtalálja a keresett választ.</p>',
|
||||
'Menu:ProblemManagement' => 'Problémakezelés',
|
||||
'Menu:ProblemManagement+' => '',
|
||||
'Menu:Problem:Shortcuts' => 'Gyorsgombok',
|
||||
'Menu:FAQCategory' => 'Tudástár kategória',
|
||||
'Menu:FAQCategory+' => 'Tudástár kategóriák',
|
||||
'Menu:FAQ' => 'Tudástár',
|
||||
'Menu:FAQ+' => 'Meglévő tudástárak',
|
||||
'Brick:Portal:FAQ:Menu' => 'Tudástár',
|
||||
'Brick:Portal:FAQ:Title' => 'Tudástárak',
|
||||
'Brick:Portal:FAQ:Title+' => '<p>Siet?</p><p>Nézze át a leggyakoribb kérdések listáját, és (talán) azonnal megtalálja a keresett választ.</p>',
|
||||
));
|
||||
|
||||
Reference in New Issue
Block a user