composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-21 00:02:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	composer.json
This commit is contained in:
Pierre Goiffon
2019-03-19 11:18:18 +01:00
parent d8f75495fe 54c027823b
commit c313ed2efc
36 changed files with 592 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
datamodels/2.x/itop-tickets/en.dict.itop-tickets.php
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+' => '',
));

9
datamodels/2.x/itop-tickets/es_cr.dict.itop-tickets.php
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+' => '~~',
));

9
datamodels/2.x/itop-tickets/pt_br.dict.itop-tickets.php
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+' => '~~',
));

12
datamodels/2.x/itop-tickets/tr.dict.itop-tickets.php
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>