mirror of
https://github.com/Combodo/iTop.git
synced 2026-05-19 15:22:17 +02:00
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
# Conflicts: # datamodels/2.x/combodo-db-tools/dictionaries/zh_cn.dict.combodo-db-tools.php # datamodels/2.x/itop-attachments/dictionaries/zh_cn.dict.itop-attachments.php # datamodels/2.x/itop-backup/dictionaries/da.dict.itop-backup.php # datamodels/2.x/itop-backup/dictionaries/it.dict.itop-backup.php # datamodels/2.x/itop-backup/dictionaries/ja.dict.itop-backup.php # datamodels/2.x/itop-backup/dictionaries/sk.dict.itop-backup.php # datamodels/2.x/itop-backup/dictionaries/tr.dict.itop-backup.php # datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php # datamodels/2.x/itop-config/dictionaries/da.dict.itop-config.php # datamodels/2.x/itop-config/dictionaries/it.dict.itop-config.php # datamodels/2.x/itop-config/dictionaries/ja.dict.itop-config.php # datamodels/2.x/itop-config/dictionaries/sk.dict.itop-config.php # datamodels/2.x/itop-config/dictionaries/tr.dict.itop-config.php # datamodels/2.x/itop-core-update/dictionaries/cs.dict.itop-core-update.php # datamodels/2.x/itop-core-update/dictionaries/da.dict.itop-core-update.php # datamodels/2.x/itop-core-update/dictionaries/it.dict.itop-core-update.php # datamodels/2.x/itop-core-update/dictionaries/ja.dict.itop-core-update.php # datamodels/2.x/itop-core-update/dictionaries/sk.dict.itop-core-update.php # datamodels/2.x/itop-core-update/dictionaries/tr.dict.itop-core-update.php # datamodels/2.x/itop-core-update/dictionaries/zh_cn.dict.itop-core-update.php # datamodels/2.x/itop-faq-light/dictionaries/zh_cn.dict.itop-faq-light.php # datamodels/2.x/itop-files-information/dictionaries/de.dict.itop-files-information.php # datamodels/2.x/itop-files-information/dictionaries/pl.dict.itop-files-information.php # datamodels/2.x/itop-files-information/dictionaries/zh_cn.dict.itop-files-information.php # datamodels/2.x/itop-hub-connector/dictionaries/pt_br.dict.itop-hub-connector.php # datamodels/2.x/itop-oauth-client/dictionaries/cs.dict.itop-oauth-client.php # datamodels/2.x/itop-oauth-client/dictionaries/da.dict.itop-oauth-client.php # datamodels/2.x/itop-oauth-client/dictionaries/es_cr.dict.itop-oauth-client.php # datamodels/2.x/itop-oauth-client/dictionaries/it.dict.itop-oauth-client.php # datamodels/2.x/itop-oauth-client/dictionaries/ja.dict.itop-oauth-client.php # datamodels/2.x/itop-oauth-client/dictionaries/nl.dict.itop-oauth-client.php # datamodels/2.x/itop-oauth-client/dictionaries/pt_br.dict.itop-oauth-client.php # datamodels/2.x/itop-oauth-client/dictionaries/ru.dict.itop-oauth-client.php # datamodels/2.x/itop-oauth-client/dictionaries/sk.dict.itop-oauth-client.php # datamodels/2.x/itop-oauth-client/dictionaries/tr.dict.itop-oauth-client.php # datamodels/2.x/itop-oauth-client/dictionaries/zh_cn.dict.itop-oauth-client.php # datamodels/2.x/itop-service-mgmt-provider/dictionaries/de.dict.itop-service-mgmt-provider.php # datamodels/2.x/itop-tickets/dictionaries/da.dict.itop-tickets.php # datamodels/2.x/itop-tickets/dictionaries/hu.dict.itop-tickets.php # datamodels/2.x/itop-tickets/dictionaries/it.dict.itop-tickets.php # datamodels/2.x/itop-tickets/dictionaries/ja.dict.itop-tickets.php # dictionaries/cs.dictionary.itop.ui.php # dictionaries/da.dictionary.itop.core.php # dictionaries/da.dictionary.itop.ui.php # dictionaries/de.dictionary.itop.ui.php # dictionaries/en.dictionary.itop.ui.php # dictionaries/es_cr.dictionary.itop.ui.php # dictionaries/fr.dictionary.itop.ui.php # dictionaries/hu.dictionary.itop.ui.php # dictionaries/it.dictionary.itop.core.php # dictionaries/it.dictionary.itop.ui.php # dictionaries/ja.dictionary.itop.core.php # dictionaries/ja.dictionary.itop.ui.php # dictionaries/nl.dictionary.itop.ui.php # dictionaries/pl.dictionary.itop.core.php # dictionaries/pl.dictionary.itop.ui.php # dictionaries/pt_br.dictionary.itop.core.php # dictionaries/pt_br.dictionary.itop.ui.php # dictionaries/ru.dictionary.itop.core.php # dictionaries/ru.dictionary.itop.ui.php # dictionaries/sk.dictionary.itop.core.php # dictionaries/sk.dictionary.itop.ui.php # dictionaries/tr.dictionary.itop.core.php # dictionaries/tr.dictionary.itop.ui.php # dictionaries/zh_cn.dictionary.itop.core.php # dictionaries/zh_cn.dictionary.itop.ui.php # tests/php-unit-tests/integration-tests/DictionariesConsistencyTest.php
This commit is contained in:
@@ -5,13 +5,13 @@
|
||||
*/
|
||||
Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
|
||||
'Menu:RequestManagement' => 'Helpdesk~~',
|
||||
'Menu:RequestManagement+' => 'Helpdesk~~',
|
||||
'Menu:RequestManagement+' => '',
|
||||
'Menu:RequestManagementProvider' => 'Helpdesk provider~~',
|
||||
'Menu:RequestManagementProvider+' => 'Helpdesk provider~~',
|
||||
'Menu:RequestManagementProvider+' => '',
|
||||
'Menu:UserRequest:Provider' => 'Open request transfered to provider~~',
|
||||
'Menu:UserRequest:Provider+' => 'Open request transfered to provider~~',
|
||||
'Menu:UserRequest:Provider+' => '',
|
||||
'Menu:UserRequest:Overview' => 'Overview~~',
|
||||
'Menu:UserRequest:Overview+' => 'Overview~~',
|
||||
'Menu:UserRequest:Overview+' => '',
|
||||
'Menu:NewUserRequest' => 'New user request~~',
|
||||
'Menu:NewUserRequest+' => 'Create a new user request ticket~~',
|
||||
'Menu:SearchUserRequests' => 'Search for user requests~~',
|
||||
@@ -21,11 +21,11 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
|
||||
'Menu:UserRequest:MyRequests' => 'Requests assigned to me~~',
|
||||
'Menu:UserRequest:MyRequests+' => 'Requests assigned to me (as Agent)~~',
|
||||
'Menu:UserRequest:MySupportRequests' => 'My support calls~~',
|
||||
'Menu:UserRequest:MySupportRequests+' => 'My support calls~~',
|
||||
'Menu:UserRequest:MySupportRequests+' => '',
|
||||
'Menu:UserRequest:EscalatedRequests' => 'Hot Requests~~',
|
||||
'Menu:UserRequest:EscalatedRequests+' => 'Hot Requests~~',
|
||||
'Menu:UserRequest:EscalatedRequests+' => '',
|
||||
'Menu:UserRequest:OpenRequests' => 'All open requests~~',
|
||||
'Menu:UserRequest:OpenRequests+' => 'All open requests~~',
|
||||
'Menu:UserRequest:OpenRequests+' => '',
|
||||
'UI:WelcomeMenu:MyAssignedCalls' => 'Requests assigned to me~~',
|
||||
'UI-RequestManagementOverview-RequestByType-last-14-days' => 'Last 14 days request per type~~',
|
||||
'UI-RequestManagementOverview-Last-14-days' => 'Last 14 days number of requests~~',
|
||||
@@ -79,7 +79,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
|
||||
'Class:UserRequest/Attribute:request_type' => 'Request Type~~',
|
||||
'Class:UserRequest/Attribute:request_type+' => '~~',
|
||||
'Class:UserRequest/Attribute:request_type/Value:service_request' => 'Service request~~',
|
||||
'Class:UserRequest/Attribute:request_type/Value:service_request+' => 'Service request~~',
|
||||
'Class:UserRequest/Attribute:request_type/Value:service_request+' => '',
|
||||
'Class:UserRequest/Attribute:impact' => 'Impact~~',
|
||||
'Class:UserRequest/Attribute:impact+' => '~~',
|
||||
'Class:UserRequest/Attribute:impact/Value:1' => 'A department~~',
|
||||
@@ -90,38 +90,38 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
|
||||
'Class:UserRequest/Attribute:impact/Value:3+' => '~~',
|
||||
'Class:UserRequest/Attribute:priority' => 'Priority~~',
|
||||
'Class:UserRequest/Attribute:priority+' => '~~',
|
||||
'Class:UserRequest/Attribute:priority/Value:1' => 'critical~~',
|
||||
'Class:UserRequest/Attribute:priority/Value:1+' => 'critical~~',
|
||||
'Class:UserRequest/Attribute:priority/Value:2' => 'high~~',
|
||||
'Class:UserRequest/Attribute:priority/Value:2+' => 'high~~',
|
||||
'Class:UserRequest/Attribute:priority/Value:3' => 'medium~~',
|
||||
'Class:UserRequest/Attribute:priority/Value:3+' => 'medium~~',
|
||||
'Class:UserRequest/Attribute:priority/Value:4' => 'low~~',
|
||||
'Class:UserRequest/Attribute:priority/Value:4+' => 'low~~',
|
||||
'Class:UserRequest/Attribute:priority/Value:1' => 'Critical~~',
|
||||
'Class:UserRequest/Attribute:priority/Value:1+' => '',
|
||||
'Class:UserRequest/Attribute:priority/Value:2' => 'High~~',
|
||||
'Class:UserRequest/Attribute:priority/Value:2+' => '',
|
||||
'Class:UserRequest/Attribute:priority/Value:3' => 'Medium~~',
|
||||
'Class:UserRequest/Attribute:priority/Value:3+' => '',
|
||||
'Class:UserRequest/Attribute:priority/Value:4' => 'Low~~',
|
||||
'Class:UserRequest/Attribute:priority/Value:4+' => '',
|
||||
'Class:UserRequest/Attribute:urgency' => 'Urgency~~',
|
||||
'Class:UserRequest/Attribute:urgency+' => '~~',
|
||||
'Class:UserRequest/Attribute:urgency/Value:1' => 'critical~~',
|
||||
'Class:UserRequest/Attribute:urgency/Value:1+' => 'critical~~',
|
||||
'Class:UserRequest/Attribute:urgency/Value:2' => 'high~~',
|
||||
'Class:UserRequest/Attribute:urgency/Value:2+' => 'high~~',
|
||||
'Class:UserRequest/Attribute:urgency/Value:3' => 'medium~~',
|
||||
'Class:UserRequest/Attribute:urgency/Value:3+' => 'medium~~',
|
||||
'Class:UserRequest/Attribute:urgency/Value:4' => 'low~~',
|
||||
'Class:UserRequest/Attribute:urgency/Value:4+' => 'low~~',
|
||||
'Class:UserRequest/Attribute:urgency/Value:1' => 'Critical~~',
|
||||
'Class:UserRequest/Attribute:urgency/Value:1+' => '',
|
||||
'Class:UserRequest/Attribute:urgency/Value:2' => 'High~~',
|
||||
'Class:UserRequest/Attribute:urgency/Value:2+' => '',
|
||||
'Class:UserRequest/Attribute:urgency/Value:3' => 'Medium~~',
|
||||
'Class:UserRequest/Attribute:urgency/Value:3+' => '',
|
||||
'Class:UserRequest/Attribute:urgency/Value:4' => 'Low~~',
|
||||
'Class:UserRequest/Attribute:urgency/Value:4+' => '',
|
||||
'Class:UserRequest/Attribute:origin' => 'Origin~~',
|
||||
'Class:UserRequest/Attribute:origin+' => '~~',
|
||||
'Class:UserRequest/Attribute:origin/Value:in_person' => 'In-person~~',
|
||||
'Class:UserRequest/Attribute:origin/Value:in_person+' => 'Request created following a face-to-face discussion~~',
|
||||
'Class:UserRequest/Attribute:origin/Value:chat' => 'Chat~~',
|
||||
'Class:UserRequest/Attribute:origin/Value:chat+' => 'Request created following a chat discussion~~',
|
||||
'Class:UserRequest/Attribute:origin/Value:mail' => 'email~~',
|
||||
'Class:UserRequest/Attribute:origin/Value:mail+' => 'email~~',
|
||||
'Class:UserRequest/Attribute:origin/Value:monitoring' => 'monitoring~~',
|
||||
'Class:UserRequest/Attribute:origin/Value:monitoring+' => 'monitoring~~',
|
||||
'Class:UserRequest/Attribute:origin/Value:phone' => 'phone~~',
|
||||
'Class:UserRequest/Attribute:origin/Value:phone+' => 'phone~~',
|
||||
'Class:UserRequest/Attribute:origin/Value:portal' => 'portal~~',
|
||||
'Class:UserRequest/Attribute:origin/Value:portal+' => 'portal~~',
|
||||
'Class:UserRequest/Attribute:origin/Value:mail' => 'Email~~',
|
||||
'Class:UserRequest/Attribute:origin/Value:mail+' => 'Request created on an email reception~~',
|
||||
'Class:UserRequest/Attribute:origin/Value:monitoring' => 'Monitoring~~',
|
||||
'Class:UserRequest/Attribute:origin/Value:monitoring+' => 'Request created on a monitoring alert~~',
|
||||
'Class:UserRequest/Attribute:origin/Value:phone' => 'Phone~~',
|
||||
'Class:UserRequest/Attribute:origin/Value:phone+' => 'Request created following a phone call~~',
|
||||
'Class:UserRequest/Attribute:origin/Value:portal' => 'Portal~~',
|
||||
'Class:UserRequest/Attribute:origin/Value:portal+' => 'Request created on the user portal~~',
|
||||
'Class:UserRequest/Attribute:approver_id' => 'Approver~~',
|
||||
'Class:UserRequest/Attribute:approver_id+' => '~~',
|
||||
'Class:UserRequest/Attribute:approver_email' => 'Approver Email~~',
|
||||
@@ -137,9 +137,9 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
|
||||
'Class:UserRequest/Attribute:escalation_flag' => 'Hot Flag~~',
|
||||
'Class:UserRequest/Attribute:escalation_flag+' => '~~',
|
||||
'Class:UserRequest/Attribute:escalation_flag/Value:no' => 'No~~',
|
||||
'Class:UserRequest/Attribute:escalation_flag/Value:no+' => 'No~~',
|
||||
'Class:UserRequest/Attribute:escalation_flag/Value:no+' => '',
|
||||
'Class:UserRequest/Attribute:escalation_flag/Value:yes' => 'Yes~~',
|
||||
'Class:UserRequest/Attribute:escalation_flag/Value:yes+' => 'Yes~~',
|
||||
'Class:UserRequest/Attribute:escalation_flag/Value:yes+' => '',
|
||||
'Class:UserRequest/Attribute:escalation_reason' => 'Hot reason~~',
|
||||
'Class:UserRequest/Attribute:escalation_reason+' => '~~',
|
||||
'Class:UserRequest/Attribute:assignment_date' => 'Assignment date~~',
|
||||
@@ -170,20 +170,20 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
|
||||
'Class:UserRequest/Attribute:time_spent+' => '~~',
|
||||
'Class:UserRequest/Attribute:resolution_code' => 'Resolution code~~',
|
||||
'Class:UserRequest/Attribute:resolution_code+' => '~~',
|
||||
'Class:UserRequest/Attribute:resolution_code/Value:assistance' => 'assistance~~',
|
||||
'Class:UserRequest/Attribute:resolution_code/Value:assistance+' => 'assistance~~',
|
||||
'Class:UserRequest/Attribute:resolution_code/Value:bug fixed' => 'bug fixed~~',
|
||||
'Class:UserRequest/Attribute:resolution_code/Value:bug fixed+' => 'bug fixed~~',
|
||||
'Class:UserRequest/Attribute:resolution_code/Value:hardware repair' => 'hardware repair~~',
|
||||
'Class:UserRequest/Attribute:resolution_code/Value:hardware repair+' => 'hardware repair~~',
|
||||
'Class:UserRequest/Attribute:resolution_code/Value:other' => 'other~~',
|
||||
'Class:UserRequest/Attribute:resolution_code/Value:other+' => 'other~~',
|
||||
'Class:UserRequest/Attribute:resolution_code/Value:software patch' => 'software patch~~',
|
||||
'Class:UserRequest/Attribute:resolution_code/Value:software patch+' => 'software patch~~',
|
||||
'Class:UserRequest/Attribute:resolution_code/Value:system update' => 'system update~~',
|
||||
'Class:UserRequest/Attribute:resolution_code/Value:system update+' => 'system update~~',
|
||||
'Class:UserRequest/Attribute:resolution_code/Value:training' => 'training~~',
|
||||
'Class:UserRequest/Attribute:resolution_code/Value:training+' => 'training~~',
|
||||
'Class:UserRequest/Attribute:resolution_code/Value:assistance' => 'Assistance~~',
|
||||
'Class:UserRequest/Attribute:resolution_code/Value:assistance+' => '',
|
||||
'Class:UserRequest/Attribute:resolution_code/Value:bug fixed' => 'Bug fixed~~',
|
||||
'Class:UserRequest/Attribute:resolution_code/Value:bug fixed+' => '',
|
||||
'Class:UserRequest/Attribute:resolution_code/Value:hardware repair' => 'Hardware repair~~',
|
||||
'Class:UserRequest/Attribute:resolution_code/Value:hardware repair+' => '',
|
||||
'Class:UserRequest/Attribute:resolution_code/Value:other' => 'Other~~',
|
||||
'Class:UserRequest/Attribute:resolution_code/Value:other+' => '',
|
||||
'Class:UserRequest/Attribute:resolution_code/Value:software patch' => 'Software patch~~',
|
||||
'Class:UserRequest/Attribute:resolution_code/Value:software patch+' => '',
|
||||
'Class:UserRequest/Attribute:resolution_code/Value:system update' => 'System update~~',
|
||||
'Class:UserRequest/Attribute:resolution_code/Value:system update+' => '',
|
||||
'Class:UserRequest/Attribute:resolution_code/Value:training' => 'Training~~',
|
||||
'Class:UserRequest/Attribute:resolution_code/Value:training+' => '',
|
||||
'Class:UserRequest/Attribute:solution' => 'Solution~~',
|
||||
'Class:UserRequest/Attribute:solution+' => '~~',
|
||||
'Class:UserRequest/Attribute:pending_reason' => 'Pending reason~~',
|
||||
@@ -211,13 +211,13 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
|
||||
'Class:UserRequest/Attribute:user_satisfaction' => 'User satisfaction~~',
|
||||
'Class:UserRequest/Attribute:user_satisfaction+' => '~~',
|
||||
'Class:UserRequest/Attribute:user_satisfaction/Value:1' => 'Very satisfied~~',
|
||||
'Class:UserRequest/Attribute:user_satisfaction/Value:1+' => 'Very satisfied~~',
|
||||
'Class:UserRequest/Attribute:user_satisfaction/Value:2' => 'Fairly statisfied~~',
|
||||
'Class:UserRequest/Attribute:user_satisfaction/Value:2+' => 'Fairly statisfied~~',
|
||||
'Class:UserRequest/Attribute:user_satisfaction/Value:3' => 'Rather Dissatified~~',
|
||||
'Class:UserRequest/Attribute:user_satisfaction/Value:3+' => 'Rather Dissatified~~',
|
||||
'Class:UserRequest/Attribute:user_satisfaction/Value:4' => 'Very Dissatisfied~~',
|
||||
'Class:UserRequest/Attribute:user_satisfaction/Value:4+' => 'Very Dissatisfied~~',
|
||||
'Class:UserRequest/Attribute:user_satisfaction/Value:1+' => '',
|
||||
'Class:UserRequest/Attribute:user_satisfaction/Value:2' => 'Fairly satisfied~~',
|
||||
'Class:UserRequest/Attribute:user_satisfaction/Value:2+' => '',
|
||||
'Class:UserRequest/Attribute:user_satisfaction/Value:3' => 'Rather dissatified~~',
|
||||
'Class:UserRequest/Attribute:user_satisfaction/Value:3+' => '',
|
||||
'Class:UserRequest/Attribute:user_satisfaction/Value:4' => 'Very dissatified~~',
|
||||
'Class:UserRequest/Attribute:user_satisfaction/Value:4+' => '',
|
||||
'Class:UserRequest/Attribute:user_comment' => 'User comment~~',
|
||||
'Class:UserRequest/Attribute:user_comment+' => '~~',
|
||||
'Class:UserRequest/Attribute:parent_request_id_friendlyname' => 'parent_request_id_friendlyname~~',
|
||||
|
||||
Reference in New Issue
Block a user