Skip to content

Commit c641638

Browse files
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # Translation/va_ES.json
2 parents ea55fb0 + 645742d commit c641638

8 files changed

Lines changed: 591 additions & 510 deletions

File tree

Controller/ReportServicioAT.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ public function run(): void
104104
$this->loadServicesByAssigned();
105105
$this->loadServicesByClient();
106106

107+
$this->pipe('run');
107108
$this->view('ReportServicioAT.html.twig');
108109
}
109110

Translation/cs_CZ.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"notify-customer": "Notificar al cliente",
4848
"notify-user": "Notificar al usuario",
4949
"open-services": "otevřít",
50-
"open-services-last-month": "Otevřené v posledním měsíci",
50+
"open-services-last-month": "Otevřené služby za poslední měsíc",
5151
"open-services-last-year": "Otevřené služby za poslední rok",
5252
"open-services-total": "Otevřené služby",
5353
"print-agent": "Tisknout agenta",

Translation/eu_ES.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"add-material": "Materiala gehitu",
66
"add-observations": "Oharrak gehitu",
77
"add-solution": "Soluzioa gehitu",
8-
"add-start-date": "Hasiera-data gehitu",
8+
"add-start-date": "Hasierako data gehitu",
99
"allow-new-service-without-machine": "Makina gabe zerbitzu berri bat baimendu",
10-
"anonymous-machines": "Bezero gabe dauden makinak",
10+
"anonymous-machines": "Bezeroarik gabeko makinak",
1111
"calculate-hours": "Orduak kalkulatu",
1212
"change-machine": "Makina aldatu",
1313
"changed-assigned-to": "Esleitutako %oldAssigned% erabiltzaile esleitutako %newAssigned% izatera aldatu da",
@@ -56,19 +56,19 @@
5656
"print-machine-info": "Makinaren informazioa inprimatu",
5757
"print-materials": "Materialak inprimatu",
5858
"print-observations": "Oharrak inprimatu",
59-
"print-pdf": "PDF inprimatu",
59+
"print-pdf": "PDFa inprimatu",
6060
"print-pdf-desc": "Konfigurazio honek zerbitzuko PDF-etan bakarrik aplikatuko da. Core-ko pdf-a edo PlantillasPDF plugin-a erabil dezakezu.",
6161
"print-reference": "Erreferentzia inprimatu",
6262
"print-services": "Inprimatu zerbitzuak",
63-
"print-solution": "Imprimir solución",
63+
"print-solution": "Irtenbidea inprimatu",
6464
"print-ticket-desc": "Konfigurazio honek zerbitzuko tiketetan bakarrik aplikatuko da. Tiketak plugin-a instalatuta izan behar du.",
6565
"services-by-agent": "Por agente",
6666
"services-by-assigned": "Por asignado",
6767
"services-by-client": "Bezeroaren arabera",
6868
"services-by-month": "Servicios por mes (últimos 12 meses)",
69-
"services-by-nick": "Por usuario creador",
69+
"services-by-nick": "Sortzailearen arabera",
7070
"services-by-status": "Por estado",
71-
"services-by-year": "Servicios por año",
71+
"services-by-year": "Urteko zerbitzuak",
7272
"ticket-footer-text": "Txartelaren oin-testua",
7373
"total-net": "Neto total",
7474
"total-services": "Total de servicios",

Translation/fr_FR.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"services-by-month": "Services par mois (12 derniers mois)",
6969
"services-by-nick": "Par utilisateur créateur",
7070
"services-by-status": "Par statut",
71-
"services-by-year": "Services par année",
71+
"services-by-year": "Services par an",
7272
"ticket-footer-text": "Texte du pied de ticket",
7373
"total-net": "Total net",
7474
"total-services": "Total des services",

Translation/gl_ES.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"notify-user": "Notificar ao usuario",
4949
"open-services": "Abertos",
5050
"open-services-last-month": "Abertos no último mes",
51-
"open-services-last-year": "Abiertos último año",
51+
"open-services-last-year": "Abertos no último ano",
5252
"open-services-total": "Servizos abertos",
5353
"print-agent": "Imprimir axente",
5454
"print-assigned": "Imprimir asignado",

Translation/tr_TR.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,6 @@
7171
"services-by-year": "Yıla göre hizmetler",
7272
"ticket-footer-text": "Fişin alt metni",
7373
"total-net": "Toplam net",
74-
"total-services": "Toplam hizmetler",
74+
"total-services": "Toplam hizmet sayısı",
7575
"verifications": "Doğrulama işlemleri"
7676
}

0 commit comments

Comments
 (0)