Merge remote-tracking branch 'origin/master' into develop

# Conflicts:
#	composer.json
This commit is contained in:
Pierre Goiffon
2019-03-19 11:18:18 +01:00
36 changed files with 592 additions and 36 deletions

View File

@@ -31,17 +31,17 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
Dict::Add('RU RU', 'Russian', 'Русский', array(
'Class:Attachment' => 'Attachment~~',
'Class:Attachment+' => '~~',
'Class:Attachment+' => '',
'Class:Attachment/Attribute:expire' => 'Expire~~',
'Class:Attachment/Attribute:expire+' => '~~',
'Class:Attachment/Attribute:temp_id' => 'Temporary id~~',
'Class:Attachment/Attribute:temp_id+' => '~~',
'Class:Attachment/Attribute:expire+' => '',
'Class:Attachment/Attribute:temp_id' => 'Temp id~~',
'Class:Attachment/Attribute:temp_id+' => '',
'Class:Attachment/Attribute:item_class' => 'Item class~~',
'Class:Attachment/Attribute:item_class+' => '~~',
'Class:Attachment/Attribute:item_id' => 'Item~~',
'Class:Attachment/Attribute:item_id+' => '~~',
'Class:Attachment/Attribute:item_org_id' => 'Item organization~~',
'Class:Attachment/Attribute:item_org_id+' => '~~',
'Class:Attachment/Attribute:item_class+' => '',
'Class:Attachment/Attribute:item_id' => 'Item id~~',
'Class:Attachment/Attribute:item_id+' => '',
'Class:Attachment/Attribute:item_org_id' => 'Item org id~~',
'Class:Attachment/Attribute:item_org_id+' => '',
'Class:Attachment/Attribute:contents' => 'Contents~~',
'Class:Attachment/Attribute:contents+' => '~~',
'Class:Attachment/Attribute:contents+' => '',
));

View File

@@ -241,3 +241,14 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
'Class:Incident/Method:ResolveChildTickets+' => 'Cascade the resolution to child ticket (ev_autoresolve), and align the following characteristics: service, team, agent, resolution info~~',
'Tickets:Related:OpenIncidents' => 'Otevřené incidenty',
));
//
// Class: Incident
//
Dict::Add('CS CZ', 'Czech', 'Čeština', array(
'Class:Incident/Attribute:parent_problem_id' => 'Nadřazený problém',
'Class:Incident/Attribute:parent_problem_id+' => '',
'Class:Incident/Attribute:parent_problem_ref' => 'Odkaz na nadřazený problém',
'Class:Incident/Attribute:parent_problem_ref+' => '',
));

View File

@@ -238,3 +238,14 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'Class:Incident/Method:ResolveChildTickets+' => 'Cascade the resolution to child ticket (ev_autoresolve), and align the following characteristics: service, team, agent, resolution info~~',
'Tickets:Related:OpenIncidents' => 'Open incidents~~',
));
//
// Class: Incident
//
Dict::Add('DA DA', 'Danish', 'Dansk', array(
'Class:Incident/Attribute:parent_problem_id' => 'Parent problem id~~',
'Class:Incident/Attribute:parent_problem_id+' => '~~',
'Class:Incident/Attribute:parent_problem_ref' => 'Parent problem ref~~',
'Class:Incident/Attribute:parent_problem_ref+' => '~~',
));

View File

@@ -240,3 +240,14 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
'Class:Incident/Method:ResolveChildTickets+' => 'Lösung auf Kind-Tickets übertragen (ev_autoresolve), und folgende Ticket-Eigenschaften angleichen: Service, Team, Agent, Lösungsinformationen',
'Tickets:Related:OpenIncidents' => 'Offene Incidents',
));
//
// Class: Incident
//
Dict::Add('DE DE', 'German', 'Deutsch', array(
'Class:Incident/Attribute:parent_problem_id' => 'Parent-Problem',
'Class:Incident/Attribute:parent_problem_id+' => '',
'Class:Incident/Attribute:parent_problem_ref' => 'Parent-Problem-Referenz',
'Class:Incident/Attribute:parent_problem_ref+' => '',
));

View File

@@ -239,3 +239,14 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:Incident/Method:ResolveChildTickets+' => 'Cascade the resolution to child ticket (ev_autoresolve), and align the following characteristics: service, team, agent, resolution info',
'Tickets:Related:OpenIncidents' => 'Open incidents',
));
//
// Class: Incident
//
Dict::Add('EN US', 'English', 'English', array(
'Class:Incident/Attribute:parent_problem_id' => 'Parent problem id',
'Class:Incident/Attribute:parent_problem_id+' => '',
'Class:Incident/Attribute:parent_problem_ref' => 'Parent problem ref',
'Class:Incident/Attribute:parent_problem_ref+' => '',
));

View File

@@ -240,3 +240,14 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Class:Incident/Method:ResolveChildTickets+' => 'Cascadear la solución a los tickets hijos (ev_autoresolve), y alinear las siguientes características: servicio, equipo, agente, información de solución',
'Tickets:Related:OpenIncidents' => 'Incidentes Abiertos',
));
//
// Class: Incident
//
Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Class:Incident/Attribute:parent_problem_id' => 'Problema Padre',
'Class:Incident/Attribute:parent_problem_id+' => 'Problema Padre',
'Class:Incident/Attribute:parent_problem_ref' => 'Parent problem ref~~',
'Class:Incident/Attribute:parent_problem_ref+' => '~~',
));

View File

@@ -194,8 +194,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:Incident/Attribute:parent_change_ref+' => '',
'Class:Incident/Attribute:parent_problem_id' => 'Problème lié',
'Class:Incident/Attribute:parent_problem_id+' => '',
'Class:Incident/Attribute:parent_problem_ref' => 'Référence Problème lié',
'Class:Incident/Attribute:parent_problem_ref+' => '',
'Class:Incident/Attribute:parent_problem_ref' => 'Parent problem ref~~',
'Class:Incident/Attribute:parent_problem_ref+' => '~~',
'Class:Incident/Attribute:related_request_list' => 'Requêtes filles',
'Class:Incident/Attribute:related_request_list+' => '',
'Class:Incident/Attribute:child_incidents_list' => 'Incidents fils',
@@ -240,3 +240,14 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:Incident/Method:ResolveChildTickets+' => 'Cascader l\'action de résolution du ticket (ev_autoresolve) vers les requêtes et incidents fils, et aligner les caractéristiques suivantes : service, équipe, agent, information de résolution',
'Tickets:Related:OpenIncidents' => 'Open incidents',
));
//
// Class: Incident
//
Dict::Add('FR FR', 'French', 'Français', array(
'Class:Incident/Attribute:parent_problem_id' => 'Problème lié',
'Class:Incident/Attribute:parent_problem_id+' => '',
'Class:Incident/Attribute:parent_problem_ref' => 'Parent problem ref~~',
'Class:Incident/Attribute:parent_problem_ref+' => '~~',
));

View File

@@ -238,3 +238,14 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
'Class:Incident/Method:ResolveChildTickets+' => 'Cascade the resolution to child ticket (ev_autoresolve), and align the following characteristics: service, team, agent, resolution info~~',
'Tickets:Related:OpenIncidents' => 'Open incidents~~',
));
//
// Class: Incident
//
Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
'Class:Incident/Attribute:parent_problem_id' => 'Parent problem id~~',
'Class:Incident/Attribute:parent_problem_id+' => '~~',
'Class:Incident/Attribute:parent_problem_ref' => 'Parent problem ref~~',
'Class:Incident/Attribute:parent_problem_ref+' => '~~',
));

View File

@@ -238,3 +238,14 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:Incident/Method:ResolveChildTickets+' => 'Cascade the resolution to child ticket (ev_autoresolve), and align the following characteristics: service, team, agent, resolution info~~',
'Tickets:Related:OpenIncidents' => 'Open incidents~~',
));
//
// Class: Incident
//
Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:Incident/Attribute:parent_problem_id' => 'Parent problem id~~',
'Class:Incident/Attribute:parent_problem_id+' => '~~',
'Class:Incident/Attribute:parent_problem_ref' => 'Parent problem ref~~',
'Class:Incident/Attribute:parent_problem_ref+' => '~~',
));

View File

@@ -237,3 +237,14 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'Class:Incident/Method:ResolveChildTickets+' => 'Cascade the resolution to child ticket (ev_autoresolve), and align the following characteristics: service, team, agent, resolution info~~',
'Tickets:Related:OpenIncidents' => 'Open incidents~~',
));
//
// Class: Incident
//
Dict::Add('JA JP', 'Japanese', '日本語', array(
'Class:Incident/Attribute:parent_problem_id' => 'Parent problem id~~',
'Class:Incident/Attribute:parent_problem_id+' => '~~',
'Class:Incident/Attribute:parent_problem_ref' => 'Parent problem ref~~',
'Class:Incident/Attribute:parent_problem_ref+' => '~~',
));

View File

@@ -225,3 +225,14 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:Incident/Method:ResolveChildTickets+' => 'Pas de oplossing ook toe op subverzoeken (ev_autoresolve) en neem de kenmerken over wat betreft service, team, agent, oplossing',
'Tickets:Related:OpenIncidents' => 'Open incidenten',
));
//
// Class: Incident
//
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:Incident/Attribute:parent_problem_id' => 'Parent problem id~~',
'Class:Incident/Attribute:parent_problem_id+' => '~~',
'Class:Incident/Attribute:parent_problem_ref' => 'Parent problem ref~~',
'Class:Incident/Attribute:parent_problem_ref+' => '~~',
));

View File

@@ -239,3 +239,14 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
'Class:Incident/Method:ResolveChildTickets+' => 'Cascade the resolution to child ticket (ev_autoresolve), and align the following characteristics: service, team, agent, resolution info~~',
'Tickets:Related:OpenIncidents' => 'Open incidents~~',
));
//
// Class: Incident
//
Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
'Class:Incident/Attribute:parent_problem_id' => 'Problema principal',
'Class:Incident/Attribute:parent_problem_id+' => '',
'Class:Incident/Attribute:parent_problem_ref' => 'Ref problema principal',
'Class:Incident/Attribute:parent_problem_ref+' => '',
));

View File

@@ -226,3 +226,14 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'Class:Incident/Method:ResolveChildTickets+' => 'Cascade the resolution to child ticket (ev_autoresolve), and align the following characteristics: service, team, agent, resolution info',
'Tickets:Related:OpenIncidents' => 'Открытые инциденты',
));
//
// Class: Incident
//
Dict::Add('RU RU', 'Russian', 'Русский', array(
'Class:Incident/Attribute:parent_problem_id' => 'Родительская проблема',
'Class:Incident/Attribute:parent_problem_id+' => '',
'Class:Incident/Attribute:parent_problem_ref' => 'Родительская проблема',
'Class:Incident/Attribute:parent_problem_ref+' => '',
));

View File

@@ -238,3 +238,14 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Class:Incident/Method:ResolveChildTickets+' => 'Cascade the resolution to child ticket (ev_autoresolve), and align the following characteristics: service, team, agent, resolution info~~',
'Tickets:Related:OpenIncidents' => 'Open incidents~~',
));
//
// Class: Incident
//
Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Class:Incident/Attribute:parent_problem_id' => 'Parent problem id~~',
'Class:Incident/Attribute:parent_problem_id+' => '~~',
'Class:Incident/Attribute:parent_problem_ref' => 'Parent problem ref~~',
'Class:Incident/Attribute:parent_problem_ref+' => '~~',
));

View File

@@ -238,3 +238,14 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Class:Incident/Method:ResolveChildTickets+' => '级联解决子Ticket(事件自动解决),和调整以下内容保持一至: 服务, 团队, 办理人, 解决方案',
'Tickets:Related:OpenIncidents' => '打开的事件',
));
//
// Class: Incident
//
Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Class:Incident/Attribute:parent_problem_id' => 'Parent problem id~~',
'Class:Incident/Attribute:parent_problem_id+' => '~~',
'Class:Incident/Attribute:parent_problem_ref' => 'Parent problem ref~~',
'Class:Incident/Attribute:parent_problem_ref+' => '~~',
));

View File

@@ -422,16 +422,16 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Class:lnkSLAToSLT/Attribute:slt_id+' => 'SLT',
'Class:lnkSLAToSLT/Attribute:slt_name' => 'SLT',
'Class:lnkSLAToSLT/Attribute:slt_name+' => 'SLT',
'Class:lnkSLAToSLT/Attribute:slt_metric' => 'SLT metric~~',
'Class:lnkSLAToSLT/Attribute:slt_metric+' => '~~',
'Class:lnkSLAToSLT/Attribute:slt_request_type' => 'SLT request type~~',
'Class:lnkSLAToSLT/Attribute:slt_request_type+' => '~~',
'Class:lnkSLAToSLT/Attribute:slt_ticket_priority' => 'SLT ticket priority~~',
'Class:lnkSLAToSLT/Attribute:slt_ticket_priority+' => '~~',
'Class:lnkSLAToSLT/Attribute:slt_value' => 'SLT value~~',
'Class:lnkSLAToSLT/Attribute:slt_value+' => '~~',
'Class:lnkSLAToSLT/Attribute:slt_value_unit' => 'SLT value unit~~',
'Class:lnkSLAToSLT/Attribute:slt_value_unit+' => '~~',
'Class:lnkSLAToSLT/Attribute:slt_metric' => 'Slt metric~~',
'Class:lnkSLAToSLT/Attribute:slt_metric+' => '',
'Class:lnkSLAToSLT/Attribute:slt_request_type' => 'Slt request type~~',
'Class:lnkSLAToSLT/Attribute:slt_request_type+' => '',
'Class:lnkSLAToSLT/Attribute:slt_ticket_priority' => 'Slt ticket priority~~',
'Class:lnkSLAToSLT/Attribute:slt_ticket_priority+' => '',
'Class:lnkSLAToSLT/Attribute:slt_value' => 'Slt value~~',
'Class:lnkSLAToSLT/Attribute:slt_value+' => '',
'Class:lnkSLAToSLT/Attribute:slt_value_unit' => 'Slt value unit~~',
'Class:lnkSLAToSLT/Attribute:slt_value_unit+' => '',
));
//

View File

@@ -422,15 +422,15 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Class:lnkSLAToSLT/Attribute:slt_name' => 'SLT',
'Class:lnkSLAToSLT/Attribute:slt_name+' => 'SLT',
'Class:lnkSLAToSLT/Attribute:slt_metric' => 'Slt metric~~',
'Class:lnkSLAToSLT/Attribute:slt_metric+' => '~~',
'Class:lnkSLAToSLT/Attribute:slt_metric+' => '',
'Class:lnkSLAToSLT/Attribute:slt_request_type' => 'Slt request type~~',
'Class:lnkSLAToSLT/Attribute:slt_request_type+' => '~~',
'Class:lnkSLAToSLT/Attribute:slt_request_type+' => '',
'Class:lnkSLAToSLT/Attribute:slt_ticket_priority' => 'Slt ticket priority~~',
'Class:lnkSLAToSLT/Attribute:slt_ticket_priority+' => '~~',
'Class:lnkSLAToSLT/Attribute:slt_ticket_priority+' => '',
'Class:lnkSLAToSLT/Attribute:slt_value' => 'Slt value~~',
'Class:lnkSLAToSLT/Attribute:slt_value+' => '~~',
'Class:lnkSLAToSLT/Attribute:slt_value+' => '',
'Class:lnkSLAToSLT/Attribute:slt_value_unit' => 'Slt value unit~~',
'Class:lnkSLAToSLT/Attribute:slt_value_unit+' => '~~',
'Class:lnkSLAToSLT/Attribute:slt_value_unit+' => '',
));
//

View File

@@ -253,3 +253,12 @@ Dict::Add('EN US', 'English', 'English', array(
'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Resolved',
'Brick:Portal:ClosedRequests:Title' => 'Closed requests',
));
//
// Class: lnkFunctionalCIToTicket
//
Dict::Add('EN US', 'English', 'English', array(
'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Ticket title',
'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '',
));

View File

@@ -251,3 +251,12 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Solucionado',
'Brick:Portal:ClosedRequests:Title' => 'Requerimientos Cerrados',
));
//
// Class: lnkFunctionalCIToTicket
//
Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Ticket title~~',
'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '~~',
));

View File

@@ -250,3 +250,12 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Resolvido',
'Brick:Portal:ClosedRequests:Title' => 'Fechar solicitações',
));
//
// Class: lnkFunctionalCIToTicket
//
Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Ticket title~~',
'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '~~',
));

View File

@@ -15,12 +15,12 @@
//
// You should have received a copy of the GNU Affero General Public License
// along with iTop. If not, see <http://www.gnu.org/licenses/>
/**
* Localized data
*
* @author Izzet Sirin <izzet.sirin@htr.com.tr>
* @copyright Copyright (C) 2010-2012 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
/**
* Localized data
*
* @author Izzet Sirin <izzet.sirin@htr.com.tr>
* @copyright Copyright (C) 2010-2012 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
// Dictionnay conventions
// Class:<class_name>