Merge remote-tracking branch 'origin/develop' into feature/backoffice-full-moon-design

# Conflicts:
#	composer.json
#	css/light-grey.scss
#	lib/composer/autoload_classmap.php
#	lib/composer/autoload_static.php
This commit is contained in:
Molkobain
2020-09-08 17:30:32 +02:00
144 changed files with 19950 additions and 1687 deletions

View File

@@ -43,8 +43,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
'UI-ChangeManagementOverview-Last-7-days' => 'Número de mudanças nos últimos 7 dias',
'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Mudanças por domínio nos últimos 7 dias',
'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Mudanças por status nos últimos 7 dias',
'Tickets:Related:OpenChanges' => 'Open changes~~',
'Tickets:Related:RecentChanges' => 'Recent changes (72h)~~',
'Tickets:Related:OpenChanges' => 'Mudanças abertas',
'Tickets:Related:RecentChanges' => 'Mudanças recentes (72h)',
));
// Dictionnay conventions
@@ -132,9 +132,9 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
'Class:Change/Stimulus:ev_finish' => 'Fechar',
'Class:Change/Stimulus:ev_finish+' => '',
'Class:Change/Attribute:outage' => 'Outage',
'Class:Change/Attribute:outage+' => '~~',
'Class:Change/Attribute:outage+' => '',
'Class:Change/Attribute:outage/Value:no' => 'Não',
'Class:Change/Attribute:outage/Value:no+' => '~~',
'Class:Change/Attribute:outage/Value:no+' => '',
'Class:Change/Attribute:outage/Value:yes' => 'Sim',
'Class:Change/Attribute:outage/Value:yes+' => '~~',
'Class:Change/Attribute:outage/Value:yes+' => '',
));