Release 2.49 (#5820)

* bump packages
* add column summarization per customer (#5808)
* clarify database requirements
* added helper methods to fetch original expected time

Co-authored-by: GregorB54321 <34287148+GregorB54321@users.noreply.github.com>

.github/workflows/docker.yaml

@@ -73,6 +73,7 @@ jobs:
                   target: prod
                   platforms: linux/amd64,linux/arm64
                   tags: |
+                      kimai/kimai2:stable
                       kimai/kimai2:apache
                       kimai/kimai2:apache-${{ env.kimai_version }}
                   push: true

README.md

@@ -6,11 +6,9 @@
     <a href="https://github.com/kimai/kimai/actions"><img alt="CI Status" src="https://github.com/kimai/kimai/actions/workflows/testing.yaml/badge.svg"></a>
     <a href="https://codecov.io/gh/kimai/kimai"><img alt="Code Coverage" src="https://codecov.io/gh/kimai/kimai/branch/main/graph/badge.svg"></a>
     <a href="https://packagist.org/packages/kimai/kimai"><img alt="Latest stable version" src="https://poser.pugx.org/kimai/kimai/v/stable"></a>
-    <a href="https://www.gnu.org/licenses/agpl-3.0.en.html"><img alt="License" src="https://poser.pugx.org/kimai/kimai/license"></a>
-    <a href="https://phpc.social/@kimai" rel="me"><img alt="Mastodon" src="https://img.shields.io/badge/toot-%40kimai-8c8dff"></a>
 </p>
 
-<h1 align="center">Kimai - time-tracker</h1>
+<h1 align="center">Kimai<br>#1 Open-Source Time-Tracker</h1>
 
 Kimai is a professional grade time-tracking application, free and open-source. 
 It handles use-cases of freelancers as well as companies with dozens or hundreds of users. 
@@ -30,7 +28,7 @@ and so much more.
 ### Requirements
 
 - PHP 8.1.3 minimum with support for 8.2, 8.3, 8.4, 8.5
-- MariaDB or MySQL
+- MariaDB / MySQL in their oldest maintained LTS release, currently MariaDB >= [10.6](https://endoflife.date/mariadb) or MySQL >= [8.4](https://endoflife.date/mysql)
 - A webserver and subdomain (subdirectory is not supported)
 - PHP extensions: `gd`, `intl`, `json`, `mbstring`, `pdo`, `tokenizer`, `xml`, `xsl`, `zip`
 
@@ -71,6 +69,7 @@ The best way to start is to [open a new issue](https://github.com/kimai/kimai/is
 In case you want to contribute, but you wouldn't know how, here are some suggestions:
 
 - Spread the word: Please [write a testimonial for our Wall of love](https://love.kimai.org), vote for Kimai on any software platform, you can toot or tweet about it, share it on LinkedIn, Reddit and any other social media platform!
+- [Translate Kimai into your language](https://hosted.weblate.org/engage/kimai/), or help to improve the existing translations, many languages look for a contributor
 - Answer questions: You know the answer to another user's problem? Share your knowledge.
 - Something can be done better? An essential feature is missing? Create a feature request.
 - Report bugs makes Kimai better for everyone.
@@ -79,6 +78,12 @@ In case you want to contribute, but you wouldn't know how, here are some suggest
 
 There is one simple rule in our "Code of conduct": Don't be an ass!
 
+## Follow Kimai
+
+- Mastodon: [@kimai](https://phpc.social/@kimai)
+- Youtube: [@kimai_org](https://www.youtube.com/@kimai_org)
+- LinkedIn: [@kimai-org](https://www.linkedin.com/company/kimai-org/)
+
 ### Credits
 
 Kimai is based on modern technologies and frameworks such as [PHP](https://www.php.net/),

assets/sass/_kimai.scss

@@ -1,3 +1,4 @@
+@import "variables";
 @import "layout";
 @import "error-page";
 @import "print";

assets/sass/variables.scss

@@ -0,0 +1,33 @@
+:root {
+    --kimai-public-holiday: var(--tblr-lime);
+    --kimai-holiday: var(--tblr-green);
+    --kimai-sickness: var(--tblr-yellow);
+    --kimai-time-off: var(--tblr-blue);
+    --kimai-other: var(--tblr-purple);
+
+    --kimai-public-holiday-bg: var(--tblr-lime-lt);
+    --kimai-holiday-bg: var(--tblr-green-lt);
+    --kimai-sickness-bg: var(--tblr-yellow-lt);
+    --kimai-time-off-bg: var(--tblr-blue-lt);
+    --kimai-other-bg: var(--tblr-purple-lt);
+
+    --kimai-unexpected-bg: var(--tblr-pink-lt);
+    --kimai-missing-bg: var(--tblr-pink-lt);
+    --kimai-weekend-bg: var(--tblr-bg-surface-tertiary);
+}
+
+.public-holiday { color: var(--kimai-public-holiday); }
+.holiday { color: var(--kimai-holiday); }
+.sickness { color: var(--kimai-sickness); }
+.time-off { color: var(--kimai-time-off); }
+.other { color: var(--kimai-other); }
+
+.bg-public-holiday{ background-color: var(--kimai-public-holiday-bg); --tblr-table-bg: var(--kimai-public-holiday-bg); i.fas{ color: var(--kimai-public-holiday); } };
+.bg-holiday { background-color: var(--kimai-holiday-bg); --tblr-table-bg: var(--kimai-holiday-bg); i.fas{ color: var(--kimai-holiday); } };
+.bg-sickness { background-color: var(--kimai-sickness-bg); --tblr-table-bg: var(--kimai-sickness-bg); i.fas{ color: var(--kimai-sickness); } };
+.bg-time-off { background-color: var(--kimai-time-off-bg); --tblr-table-bg: var(--kimai-time-off-bg); i.fas{ color: var(--kimai-time-off); } };
+.bg-other { background-color: var(--kimai-other-bg); --tblr-table-bg: var(--kimai-other-bg); i.fas{ color: var(--kimai-other); } };
+
+.bg-unexpected { background-color: var(--kimai-unexpected-bg); --tblr-table-bg: var(--kimai-unexpected-bg); };
+.bg-missing { background-color: var(--kimai-missing-bg); --tblr-table-bg: var(--kimai-missing-bg); };
+.bg-weekend { background-color: var(--kimai-weekend-bg); --tblr-table-bg: var(--kimai-weekend-bg); };

config/packages/tabler.yaml

@@ -75,6 +75,7 @@ tabler:
         fax: fas fa-fax
         filter: fas fa-filter
         help: far fa-question-circle
+        holiday: fas fa-umbrella-beach
         home: fas fa-home
         info: fas fa-info-circle
         import: fas fa-file-import
@@ -95,6 +96,7 @@ tabler:
         ods: fas fa-table
         off: fas fa-toggle-off
         on: fas fa-toggle-on
+        other: fas fa-file-alt
         password: fas fa-key
         pause: fas fa-pause
         pause-small: far fa-pause-circle
@@ -108,6 +110,7 @@ tabler:
         profile: fas fa-user-edit
         profile-stats: far fa-chart-bar
         project: fas fa-briefcase
+        public-holiday: fas fa-calendar-day
         repeat: fas fa-repeat
         reporting: far fa-chart-bar
         report: far fa-chart-bar
@@ -119,6 +122,7 @@ tabler:
         save: far fa-save
         search: fas fa-search
         settings: fas fa-cog
+        sickness: fas fa-prescription-bottle-medical
         shop: fas fa-shopping-cart
         spinner: fas fa-spinner
         start: fas fa-play
@@ -130,6 +134,7 @@ tabler:
         team: fas fa-users
         timesheet: fas fa-clock
         timesheet-team: fas fa-user-clock
+        time-off: fas fa-couch
         trash: far fa-trash-alt
         unlocked: fas fa-unlock-alt
         upload: fas fa-upload

phpstan.neon

@@ -27,6 +27,7 @@ parameters:
         numericOperandsInArithmeticOperators: true
         switchConditionsMatchingType: true
         noVariableVariables: false
+    reportNonIntStringArrayKey: false
     paths:
         - src
     tmpDir: %rootDir%/../../../var/cache/phpstan

public/build/entrypoints.json

@@ -6,7 +6,7 @@
         "/build/app.41748d55.js"
       ],
       "css": [
-        "/build/app.e64b4d08.css"
+        "/build/app.6bfb9c66.css"
       ]
     },
     "app-rtl": {
@@ -15,7 +15,7 @@
         "/build/app-rtl.15853b82.js"
       ],
       "css": [
-        "/build/app-rtl.6b5a0ee9.css"
+        "/build/app-rtl.16271884.css"
       ]
     },
     "export-pdf": {
@@ -82,9 +82,9 @@
   "integrity": {
     "/build/runtime.684e9f6d.js": "sha384-suKiEX2de4fdNqQzdYbUd6osp4AepD9FiMXl+1QdvgMW9dcQqUWQNQasf3KWzwLr",
     "/build/app.41748d55.js": "sha384-iVPHnOXYjVDuq8567h8I3U2gl5SCV3mNMFNQCJdgMiNuFMZ4KO7PXOLanjgcGzTt",
-    "/build/app.e64b4d08.css": "sha384-Rapl6RNn58g7oayglp7MWOER7tDNPpChx6RKOOWe0mg6uFgaJjy3M51ZSkxXm+Hg",
+    "/build/app.6bfb9c66.css": "sha384-38+zSolYBrZdSwNcrDi5qCaQGCQlBJRKwtsJV+pnrf8rCCpf6z/M7fEpV4tS79Sz",
     "/build/app-rtl.15853b82.js": "sha384-UnKKgLMu9FnRT+CFE0no/+UiUks012bYriQdUWa6f02mo6Lswl947mPybjvKL503",
-    "/build/app-rtl.6b5a0ee9.css": "sha384-eW8BEaA6S1jAFPB8lUCBTvcm4wZZQ3SHbiHVZlxe814TXGT9L4/4BN8CuuGehZ6o",
+    "/build/app-rtl.16271884.css": "sha384-P1x4vYfjfM4JL55NQ3sfLiy+BSy8cM4bNcshj9M62nMJ4JD2xAWUioNv6VrmaK7U",
     "/build/export-pdf.395749ab.js": "sha384-3Hjvmu4FC/0dhHnR8kyRBU7k2xMNy1lxBpGgOkrw8PxXnwyQDM8/5bQmkJbjVT1+",
     "/build/export-pdf.d8a6c23b.css": "sha384-ztepocHE4rnGE9eKZ4kL6jTKaePUyiwiB9TjJjstjpf/ckcKg1HedrEOOk/8ElJg",
     "/build/invoice.42b319e4.js": "sha384-xxK7sCe/ZhTjMPFPeX1xvILURxNRZz2hJHZxAGVaw9zE6TC++2/6y2eKqg8cz852",

public/build/manifest.json

@@ -1,7 +1,7 @@
 {
-  "build/app.css": "/build/app.e64b4d08.css",
+  "build/app.css": "/build/app.6bfb9c66.css",
   "build/app.js": "/build/app.41748d55.js",
-  "build/app-rtl.css": "/build/app-rtl.6b5a0ee9.css",
+  "build/app-rtl.css": "/build/app-rtl.16271884.css",
   "build/app-rtl.js": "/build/app-rtl.15853b82.js",
   "build/export-pdf.css": "/build/export-pdf.d8a6c23b.css",
   "build/export-pdf.js": "/build/export-pdf.395749ab.js",

src/Constants.php

@@ -17,11 +17,11 @@ final class Constants
     /**
      * The current release version
      */
-    public const VERSION = '2.47.0';
+    public const VERSION = '2.49.0';
     /**
      * The current release: major * 10000 + minor * 100 + patch
      */
-    public const VERSION_ID = 24700;
+    public const VERSION_ID = 24900;
     /**
      * The software name
      */

src/Controller/DoctorController.php

@@ -108,10 +108,30 @@ final class DoctorController extends AbstractController
             'logLines' => $logLines,
             'logSize' => $this->getLogSize(),
             'composer' => $this->getComposerPackages(),
-            'release' => $latestRelease
+            'release' => $latestRelease,
+            'opcache' => $this->getOpcacheConfiguration()
         ]);
     }
 
+    /**
+     * @return array{enabled: bool, status: false|array<mixed>}
+     */
+    private function getOpcacheConfiguration(): array
+    {
+        $status = \function_exists('opcache_get_status') ? opcache_get_status() : false;
+
+        $enabled = \is_array($status) && $status['opcache_enabled'];
+
+        if ($enabled && \array_key_exists('scripts', $status)) {
+            unset($status['scripts']);
+        }
+
+        return [
+            'enabled' => $enabled,
+            'status' => $status,
+        ];
+    }
+
     /**
      * @return array<string, string>
      */
@@ -264,7 +284,12 @@ final class DoctorController extends AbstractController
             'sys_temp_dir',
             'date.timezone',
             'session.gc_maxlifetime',
-            'disable_functions'
+            'disable_functions',
+            'opcache.enable',
+            'opcache.memory_consumption',
+            'opcache.interned_strings_buffer',
+            'opcache.max_accelerated_files',
+            'opcache.validate_timestamps',
         ];
 
         $settings = [];

src/Entity/ExportTemplate.php

@@ -256,6 +256,18 @@ class ExportTemplate
         return \is_string($font) ? $font : null;
     }
 
+    public function isAvailableForAll(): bool
+    {
+        $isAllowed = $this->getOption('user_access', false);
+
+        return \is_bool($isAllowed) ? $isAllowed : false;
+    }
+
+    public function setAvailableForAll(bool $userAccess): void
+    {
+        $this->setOption('user_access', $userAccess);
+    }
+
     public function __toString(): string
     {
         return $this->title ?? 'New';

src/Entity/WorkingTime.php

@@ -36,6 +36,7 @@ class WorkingTime
     #[ORM\Column(name: 'expected', type: Types::INTEGER, nullable: false)]
     #[Assert\NotNull]
     private int $expectedTime = 0;
+    private ?int $originalExpectedTime = null;
     #[ORM\Column(name: 'actual', type: Types::INTEGER, nullable: false)]
     #[Assert\NotNull]
     private int $actualTime = 0;
@@ -75,6 +76,39 @@ class WorkingTime
     public function setExpectedTime(int $expectedTime): void
     {
         $this->expectedTime = $expectedTime;
+        $this->storeOriginalExpectedTime();
+    }
+
+    public function storeOriginalExpectedTime(): void
+    {
+        if ($this->originalExpectedTime === null) {
+            $this->originalExpectedTime = $this->expectedTime;
+        }
+    }
+
+    public function getOriginalExpectedTime(): int
+    {
+        $this->storeOriginalExpectedTime();
+
+        return $this->originalExpectedTime ?? 0;
+    }
+
+    public function halveExpectedTime(): int
+    {
+        $this->storeOriginalExpectedTime();
+
+        $reduceBy = ($this->getOriginalExpectedTime() / 2);
+
+        $this->expectedTime = $this->expectedTime - $reduceBy;
+
+        return $reduceBy;
+    }
+
+    public function emptyExpectedTime(): void
+    {
+        $this->storeOriginalExpectedTime();
+
+        $this->expectedTime = 0;
     }
 
     public function getActualTime(): int

src/EventSubscriber/Actions/TimesheetsSubscriber.php

@@ -34,7 +34,7 @@ final class TimesheetsSubscriber extends AbstractActionsSubscriber
 
         if ($this->isGranted('export_own_timesheet')) {
             foreach ($this->serviceExport->getTimesheetExporter() as $exporter) {
-                $event->addActionToSubmenu('export', $exporter->getId(), ['url' => $this->path('timesheet_export', ['exporter' => $exporter->getId()]), 'class' => 'toolbar-action', 'title' => 'button.' . $exporter->getId(), 'translation_domain' => 'messages']);
+                $event->addActionToSubmenu('export', $exporter->getId(), ['url' => $this->path('timesheet_export', ['exporter' => $exporter->getId()]), 'class' => 'toolbar-action', 'title' => $exporter->getTitle()]);
             }
         }
     }

src/EventSubscriber/Actions/TimesheetsTeamSubscriber.php

@@ -35,7 +35,7 @@ final class TimesheetsTeamSubscriber extends AbstractActionsSubscriber
 
         if ($this->isGranted('export_other_timesheet')) {
             foreach ($this->serviceExport->getTimesheetExporter() as $exporter) {
-                $event->addActionToSubmenu('export', $exporter->getId(), ['url' => $this->path('admin_timesheet_export', ['exporter' => $exporter->getId()]), 'class' => 'toolbar-action', 'title' => 'button.' . $exporter->getId(), 'translation_domain' => 'messages']);
+                $event->addActionToSubmenu('export', $exporter->getId(), ['url' => $this->path('admin_timesheet_export', ['exporter' => $exporter->getId()]), 'class' => 'toolbar-action', 'title' => $exporter->getTitle()]);
             }
         }
     }

src/Export/Renderer/CsvRendererFactory.php

@@ -35,7 +35,7 @@ final class CsvRendererFactory
 
     public function createDefault(): CsvRenderer
     {
-        $template = new DefaultTemplate($this->eventDispatcher, 'csv');
+        $template = new DefaultTemplate($this->eventDispatcher, 'csv', 'en', 'csv');
 
         return new CsvRenderer($this->converter, $this->translator, $template);
     }

src/Export/Renderer/HtmlRendererFactory.php

@@ -25,7 +25,7 @@ final class HtmlRendererFactory
     ) {
     }
 
-    public function create(string $id, string $template): HtmlRenderer
+    public function create(string $id, string $template, string $title = 'print'): HtmlRenderer
     {
         return new HtmlRenderer(
             $this->twig,
@@ -33,7 +33,7 @@ final class HtmlRendererFactory
             $this->projectStatisticService,
             $this->activityStatisticService,
             $id,
-            'print',
+            $title,
             $template
         );
     }

src/Export/Renderer/XlsxRendererFactory.php

@@ -27,7 +27,7 @@ final class XlsxRendererFactory
 
     public function createDefault(): XlsxRenderer
     {
-        $template = new DefaultTemplate($this->eventDispatcher, 'xlsx');
+        $template = new DefaultTemplate($this->eventDispatcher, 'xlsx', 'en', 'xlsx');
 
         return new XlsxRenderer($this->converter, $this->translator, $template);
     }

src/Export/ServiceExport.php

@@ -10,6 +10,7 @@
 namespace App\Export;
 
 use App\Entity\ExportableItem;
+use App\Entity\ExportTemplate;
 use App\Event\ExportItemsQueryEvent;
 use App\Export\Renderer\CsvRendererFactory;
 use App\Export\Renderer\HtmlRendererFactory;
@@ -74,6 +75,15 @@ final class ServiceExport
         $this->renderer[] = $renderer;
     }
 
+    private function filenameToTitle(string $title): string
+    {
+        if (str_contains($title, '.')) {
+            $title = explode('.', $title)[0];
+        }
+
+        return str_replace(['-', '_'], ' ', $title);
+    }
+
     /**
      * @return ExportRendererInterface[]
      */
@@ -82,32 +92,15 @@ final class ServiceExport
         $renderer = [
             $this->csvRendererFactory->createDefault(),
             $this->xlsxRendererFactory->createDefault(),
-            $this->pdfRendererFactory->create('pdf', 'export/pdf-layout.html.twig', 'default'),
-            $this->htmlRendererFactory->create('html', 'export/print.html.twig'),
+            $this->pdfRendererFactory->create('pdf', 'export/pdf-layout.html.twig', 'pdf'),
+            $this->htmlRendererFactory->create('print', 'export/print.html.twig'),
         ];
 
         foreach ($this->exportTemplateRepository->findAll() as $template) {
-            $tpl = new Template((string) $template->getId(), $template->getTitle()); // @phpstan-ignore argument.type
-            $tpl->setColumns($template->getColumns());
-            $tpl->setLocale($template->getLanguage());
-            $tpl->setOptions($template->getOptions());
-
-            switch ($template->getRenderer()) {
-                case 'csv':
-                    $renderer[] = $this->csvRendererFactory->create($tpl);
-                    break;
-
-                case 'xlsx':
-                    $renderer[] = $this->xlsxRendererFactory->create($tpl);
-                    break;
-
-                case 'pdf':
-                    $renderer[] = $this->pdfRendererFactory->createFromTemplate($tpl);
-                    break;
-
-                default:
-                    $this->logger->error('Unknown export template type: ' . $template->getRenderer());
-                    break;
+            try {
+                $renderer[] = $this->createTemplateFromExportTemplate($template);
+            } catch (\Exception $exception) {
+                $this->logger->error('Unknown export template type: ' . $template->getRenderer());
             }
         }
 
@@ -124,7 +117,7 @@ final class ServiceExport
                         continue;
                     }
 
-                    $renderer[] = $this->htmlRendererFactory->create($tplName, '@export/' . $tplName);
+                    $renderer[] = $this->htmlRendererFactory->create($tplName, '@export/' . $tplName, $this->filenameToTitle($tplName));
                 }
             }
 
@@ -136,7 +129,7 @@ final class ServiceExport
                         continue;
                     }
 
-                    $renderer[] = $this->pdfRendererFactory->create($tplName, '@export/' . $tplName);
+                    $renderer[] = $this->pdfRendererFactory->create($tplName, '@export/' . $tplName, $this->filenameToTitle($tplName));
                 }
             }
         }
@@ -144,6 +137,28 @@ final class ServiceExport
         return array_merge($this->renderer, $renderer);
     }
 
+    private function createTemplateFromExportTemplate(ExportTemplate $template): ExportRendererInterface
+    {
+        $tpl = new Template((string) $template->getId(), $template->getTitle()); // @phpstan-ignore argument.type
+        $tpl->setColumns($template->getColumns());
+        $tpl->setLocale($template->getLanguage());
+        $tpl->setOptions($template->getOptions());
+
+        switch ($template->getRenderer()) {
+            case 'csv':
+                return $this->csvRendererFactory->create($tpl);
+
+            case 'xlsx':
+                return $this->xlsxRendererFactory->create($tpl);
+
+            case 'pdf':
+                return $this->pdfRendererFactory->createFromTemplate($tpl);
+
+            default:
+                throw new \Exception('Unknown export template type: ' . $template->getRenderer());
+        }
+    }
+
     public function getRendererById(string $id): ?ExportRendererInterface
     {
         foreach ($this->getRenderer() as $renderer) {
@@ -165,6 +180,7 @@ final class ServiceExport
      */
     public function getTimesheetExporter(): array
     {
+        // TODO 3.0 cache the result, as this is one extra database query on the timesheet pages
         $exporter = [
             $this->pdfRendererFactory->create('pdf', '@export/timesheet.pdf.twig'),
             $this->xlsxRendererFactory->createDefault(),
@@ -172,6 +188,17 @@ final class ServiceExport
             $this->htmlRendererFactory->create('print', 'timesheet/export.html.twig'),
         ];
 
+        foreach ($this->exportTemplateRepository->findAll() as $template) {
+            if (!$template->isAvailableForAll()) {
+                continue;
+            }
+            try {
+                $exporter[] = $this->createTemplateFromExportTemplate($template);
+            } catch (\Exception $exception) {
+                $this->logger->error('Unknown export template type: ' . $template->getRenderer());
+            }
+        }
+
         return array_merge($this->timesheetExporter, $exporter);
     }
 

src/Form/ExportTemplateSpreadsheetForm.php

@@ -15,6 +15,7 @@ use App\Form\Type\ExportRendererType;
 use App\Form\Type\ExportSummaryColumnsType;
 use App\Form\Type\LanguageType;
 use App\Form\Type\PdfFontType;
+use App\Form\Type\YesNoType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
@@ -22,6 +23,9 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints\Length;
 
+/**
+ * TODO rename with 3.0 to ExportTemplateForm
+ */
 class ExportTemplateSpreadsheetForm extends AbstractType
 {
     public function buildForm(FormBuilderInterface $builder, array $options): void
@@ -77,6 +81,11 @@ class ExportTemplateSpreadsheetForm extends AbstractType
             'row_attr' => ['data-type' => 'pdf'],
             'required' => false,
         ]);
+
+        $builder->add('availableForAll', YesNoType::class, [
+            'label' => 'user_access_all',
+            'required' => false,
+        ]);
     }
 
     public function configureOptions(OptionsResolver $resolver): void

src/Form/Type/ExportRendererType.php

@@ -19,9 +19,9 @@ final class ExportRendererType extends AbstractType
     {
         $resolver->setDefaults([
             'choices' => [
-                'button.csv' => 'csv',
-                'button.xlsx' => 'xlsx',
-                'button.pdf' => 'pdf'
+                'csv' => 'csv',
+                'xlsx' => 'xlsx',
+                'pdf' => 'pdf'
             ],
         ]);
     }

src/Form/Type/TeamType.php

@@ -33,8 +33,9 @@ final class TeamType extends AbstractType
                 return $team->getName();
             },
             'documentation' => [
-                'type' => 'integer',
-                'description' => 'Team ID',
+                'type' => 'array',
+                'items' => ['type' => 'integer', 'description' => 'Team IDs'],
+                'description' => 'Array of Team IDs',
             ],
         ]);
 

src/Twig/SecurityPolicy/DefaultPolicy.php

@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace App\Twig\SecurityPolicy;
+
+use Symfony\Component\DependencyInjection\Attribute\Exclude;
+use Twig\Sandbox\SecurityPolicyInterface;
+
+/**
+ * @deprecated since 2.47.0 - use StrictPolicy instead
+ */
+#[Exclude]
+final class DefaultPolicy implements SecurityPolicyInterface
+{
+    private SecurityPolicyInterface $securityPolicy;
+
+    public function __construct()
+    {
+        $this->securityPolicy = new StrictPolicy();
+    }
+
+    public function checkSecurity($tags, $filters, $functions): void
+    {
+        $this->securityPolicy->checkSecurity($tags, $filters, $functions);
+    }
+
+    public function checkMethodAllowed($obj, $method): void
+    {
+        $this->securityPolicy->checkMethodAllowed($obj, $method);
+    }
+
+    public function checkPropertyAllowed($obj, $property): void
+    {
+        $this->securityPolicy->checkPropertyAllowed($obj, $property);
+    }
+}

src/Twig/SecurityPolicy/ExportPolicy.php

@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace App\Twig\SecurityPolicy;
+
+use Symfony\Component\DependencyInjection\Attribute\Exclude;
+use Twig\Sandbox\SecurityPolicyInterface;
+
+/**
+ * @deprecated since 2.47.0 - use StrictPolicy instead
+ */
+#[Exclude]
+final class ExportPolicy implements SecurityPolicyInterface
+{
+    private SecurityPolicyInterface $securityPolicy;
+
+    public function __construct()
+    {
+        $this->securityPolicy = new StrictPolicy();
+    }
+
+    public function checkSecurity($tags, $filters, $functions): void
+    {
+        $this->securityPolicy->checkSecurity($tags, $filters, $functions);
+    }
+
+    public function checkMethodAllowed($obj, $method): void
+    {
+        $this->securityPolicy->checkMethodAllowed($obj, $method);
+    }
+
+    public function checkPropertyAllowed($obj, $property): void
+    {
+        $this->securityPolicy->checkPropertyAllowed($obj, $property);
+    }
+}

src/Twig/SecurityPolicy/InvoicePolicy.php

@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace App\Twig\SecurityPolicy;
+
+use Symfony\Component\DependencyInjection\Attribute\Exclude;
+use Twig\Sandbox\SecurityPolicyInterface;
+
+/**
+ * @deprecated since 2.47.0 - use StrictPolicy instead
+ */
+#[Exclude]
+final class InvoicePolicy implements SecurityPolicyInterface
+{
+    private SecurityPolicyInterface $securityPolicy;
+
+    public function __construct()
+    {
+        $this->securityPolicy = new StrictPolicy();
+    }
+
+    public function checkSecurity($tags, $filters, $functions): void
+    {
+        $this->securityPolicy->checkSecurity($tags, $filters, $functions);
+    }
+
+    public function checkMethodAllowed($obj, $method): void
+    {
+        $this->securityPolicy->checkMethodAllowed($obj, $method);
+    }
+
+    public function checkPropertyAllowed($obj, $property): void
+    {
+        $this->securityPolicy->checkPropertyAllowed($obj, $property);
+    }
+}

src/Widget/Type/UserDurationYear.php

@@ -59,6 +59,6 @@ final class UserDurationYear extends AbstractCounterYear
 
     protected function getFinancialYearTitle(): string
     {
-        return 'stats.durationFinancialYear';
+        return 'stats.userDurationYear';
     }
 }

src/WorkingTime/Model/DayAddon.php

@@ -13,7 +13,12 @@ final class DayAddon
 {
     private bool $billable = true;
 
-    public function __construct(private string $title, private int $duration, private int $visibleDuration)
+    public function __construct(
+        private readonly string $title,
+        private readonly int $duration,
+        private readonly int $visibleDuration,
+        private readonly ?string $type = null
+    )
     {
     }
 
@@ -41,4 +46,9 @@ final class DayAddon
     {
         return $this->visibleDuration;
     }
+
+    public function getType(): ?string
+    {
+        return $this->type;
+    }
 }

templates/contract/status.html.twig

@@ -158,28 +158,35 @@
                             </td>
                             {% set dayCount = 0 %}
                             {% for day in month.days %}
-                                {% set class = 'text-end contractDay text-nowrap' %}
-                                {% if day.workingTime.expectedTime == 0 %}
-                                    {% set class = class ~ ' weekend' %}
-                                {% endif %}
+                                {% set style = null %}
                                 {% if day.workingTime.expectedTime > 0 and day.workingTime.actualTime == 0 and now > day.day %}
-                                    {% set class = class ~ ' bg-orange-lt' %}
+                                    {% set style = 'missing' %}
                                 {% elseif day.workingTime.expectedTime == 0 and day.workingTime.actualTime > 0 and now > day.day %}
-                                    {% set class = class ~ ' bg-yellow-lt' %}
+                                    {% set style = 'unexpected' %}
                                 {% endif %}
-                                <td class="{{ class }}">
-                                    {% if (day.workingTime.expectedTime != 0 or day.workingTime.actualTime != 0) and (now > day.day or day.workingTime.actualTime > 0) %}
-                                        {% if day.hasAddons() %}
-                                            {% set statusTitle = '' %}
-                                            {% for addon in day.getAddons() %}
-                                                {% set statusTitle = statusTitle ~ (addon.title|trans) ~ ' (' ~ addon.visibleDuration|duration(decimal) ~ ')' %}
-                                                {% if not loop.last %}
-                                                    {% set statusTitle = statusTitle ~ ', ' %}
-                                                {% endif %}
-                                            {% endfor %}
-                                            <span class="status-dot status-azure" data-toggle="tooltip" data-placement="top" title="{{ statusTitle }}"></span>
+                                {% set statusTitle = null %}
+                                {% if day.hasAddons() %}
+                                    {% for addon in day.getAddons() %}
+                                        {% set style = addon.type ?? style %}
+                                        {% set statusTitle = (statusTitle ?? '') ~ (addon.title|trans) %}
+                                        {% if addon.visibleDuration > 0 %}
+                                            {% set statusTitle = statusTitle ~ ' (' ~ addon.visibleDuration|duration(decimal) ~ ')' %}
+                                        {% endif %}
+                                        {% if not loop.last %}
+                                            {% set statusTitle = statusTitle ~ ', ' %}
+                                        {% endif %}
+                                    {% endfor %}
+                                {% endif %}
+                                <td class="text-end contractDay text-nowrap{% if style is not null %} bg-{{ style }}{% endif %}"{% if statusTitle is not null %} data-toggle="tooltip" data-placement="top" title="{{ statusTitle }}"{% endif %}>
+                                    {% if (day.workingTime.expectedTime != 0 or day.workingTime.actualTime != 0 or day.hasAddons()) and (now > day.day or day.workingTime.actualTime > 0) %}
+                                        {% if style is not null and statusTitle is not null %}
+                                            <i class="{{ style|icon }} fa-xs"></i>
+                                        {% endif %}
+                                        {% if day.workingTime.expectedTime == 0 and day.workingTime.actualTime == 0 %}
+                                            --:--
+                                        {% else %}
+                                            {{ work_times_result(day.workingTime.expectedTime, day.workingTime.actualTime, decimal) }}
                                         {% endif %}
-                                        {{ work_times_result(day.workingTime.expectedTime, day.workingTime.actualTime, decimal) }}
                                     {% endif %}
                                 </td>
                                 {% set dayCount = dayCount + 1 %}

templates/doctor/index.html.twig

@@ -162,4 +162,72 @@
         {% endblock %}
     {% endembed %}
 
+    {% set opcache_warning = not opcache['enabled'] %}
+    {% embed '@theme/embeds/collapsible.html.twig' with {open: opcache_warning, boxtype: (opcache_warning ? 'danger' : 'success')} %}
+        {% block title %}OPCache{% endblock %}
+        {% block body_class %}p-0{% endblock %}
+        {% block body %}
+            {% import "macros/widgets.html.twig" as widgets %}
+            {% if opcache_warning %}
+                {{ widgets.alert('danger', 'Could not detect an active OPCache. This will significantly impact the performance of Kimai.') }}
+            {% endif %}
+            {% if opcache['status'] is iterable %}
+            <table class="table table-hover">
+                <tr>
+                    <th class="text-nowrap w-min">Opcache Enabled</th>
+                    <td class="text-break">{{ widgets.label_boolean(opcache['enabled']) }}</td>
+                </tr>
+                <tr>
+                    <th class="text-nowrap w-min">Opcache Full</th>
+                    <td class="text-break">{{ widgets.label_boolean(opcache['status']['cache_full']) }}</td>
+                </tr>
+                <tr>
+                    <th class="text-nowrap w-min">Memory Used</th>
+                    <td class="text-break">{{ (opcache['status']['memory_usage']['used_memory'] / 1024 / 1024)|number_format(2) }} MB</td>
+                </tr>
+                <tr>
+                    <th class="text-nowrap w-min">Memory Free</th>
+                    <td class="text-break">{{ (opcache['status']['memory_usage']['free_memory'] / 1024 / 1024)|number_format(2) }} MB</td>
+                </tr>
+                <tr>
+                    <th class="text-nowrap w-min">Interned-Strings Used</th>
+                    <td class="text-break">{{ (opcache['status']['interned_strings_usage']['used_memory'] / 1024 / 1024)|number_format(2) }} MB</td>
+                </tr>
+                <tr>
+                    <th class="text-nowrap w-min">Interned-Strings Free</th>
+                    <td class="text-break">{{ (opcache['status']['interned_strings_usage']['free_memory'] / 1024 / 1024)|number_format(2) }} MB</td>
+                </tr>
+                <tr>
+                    <th class="text-nowrap w-min">Cached Scripts</th>
+                    <td class="text-break">{{ opcache['status']['opcache_statistics']['num_cached_scripts'] }}</td>
+                </tr>
+                <tr>
+                    <th class="text-nowrap w-min">Cached Keys</th>
+                    <td class="text-break">{{ opcache['status']['opcache_statistics']['num_cached_keys'] }}</td>
+                </tr>
+                <tr>
+                    <th class="text-nowrap w-min">Max Keys</th>
+                    <td class="text-break">{{ opcache['status']['opcache_statistics']['max_cached_keys'] }}</td>
+                </tr>
+                <tr>
+                    <th class="text-nowrap w-min">Hit Rate</th>
+                    <td class="text-break">{{ opcache['status']['opcache_statistics']['opcache_hit_rate']|number_format(2) }}</td>
+                </tr>
+                <tr>
+                    <th class="text-nowrap w-min">Jit enabled</th>
+                    <td class="text-break">{{ widgets.label_boolean(opcache['status']['jit']['enabled']) }}</td>
+                </tr>
+                <tr>
+                    <th class="text-nowrap w-min">Buffer Size</th>
+                    <td class="text-break">{{ (opcache['status']['jit']['buffer_size'] / 1024 / 1024)|number_format(2) }} MB</td>
+                </tr>
+                <tr>
+                    <th class="text-nowrap w-min">Buffer Free</th>
+                    <td class="text-break">{{ (opcache['status']['jit']['buffer_free'] / 1024 / 1024)|number_format(2) }} MB</td>
+                </tr>
+            </table>
+            {% endif %}
+        {% endblock %}
+    {% endembed %}
+
 {% endblock %}

templates/export/index.html.twig

@@ -124,17 +124,13 @@
                         <div class="btn-group me-auto" id="export-buttons" role="group">
                             {% set allowCreate = is_granted('create_export_template') %}
                             {% for type, group in buttons %}
-                                {% set btnTitle = ('button.' ~ type)|trans %}
-                                {% if btnTitle == ('button.' ~ type) %}
-                                    {% set btnTitle = type|trans  %}
+                                {% if type == 'html' %}
+                                    {% set type = 'print' %}
                                 {% endif %}
+                                {% set btnTitle = type|trans %}
                                 {% if group|length == 1 %}
                                     {% for id, cfg in group %}
                                         {% set title = cfg.title %}
-                                        {% set btnTitle2 = ('button.' ~ title)|trans %}
-                                        {% if btnTitle2 != ('button.' ~ title) %}
-                                            {% set btnTitle = btnTitle2 %}
-                                        {% endif %}
                                         <button type="button" id="export-{{ id }}-button" class="btn btn-primary startExportBtn" data-type="{{ id }}">
                                             {{ btnTitle }}
                                         </button>
@@ -146,13 +142,9 @@
                                         </button>
                                         <div class="dropdown-menu">
                                             {% for id, cfg in group %}
-                                                {% set title = cfg.title %}
-                                                {% set btnTitle = id|trans({}, 'export') %}
-                                                {% if btnTitle == id %}
-                                                    {% set btnTitle = title|trans %}
-                                                {% endif %}
-                                                {% if btnTitle == id %}
-                                                    {% set btnTitle = id|split('.')|first|replace({'-': ' ', '_': ' '})|split(' ')|map(t => t|capitalize)|join(' ') %}
+                                                {% set btnTitle = (cfg.title)|trans %}
+                                                {% if loop.first %}
+                                                    {% set btnTitle = 'default'|trans %}
                                                 {% endif %}
                                                 <a href="#" class="dropdown-item startExportBtn" data-type="{{ id }}">
                                                     {{ btnTitle }}

templates/export/renderer/timesheet.pdf.twig

@@ -6,7 +6,7 @@
 {% set showCustomerSummary = false %}
 {% set decimal = true %}
 {% set showDateTimeShort = true %}
-{% block title %}{{ 'timesheet.pdf.twig'|trans({}, 'export') }}{% endblock %}
+{% block title %}{{ 'timesheet'|trans }}{% endblock %}
 {% block description %}
     {% if entry.description is not empty %}
         {{ entry.description|desc2html }}

templates/reporting/report_by_user.html.twig

@@ -17,5 +17,8 @@
         {% block column_classes_total -%}
             {% if column is weekend %} weekend{% endif %}
         {%- endblock %}
+        {% block column_classes_customer_total -%}
+            {% if column is weekend %} weekend{% endif %}
+        {%- endblock %}
     {% endembed %}
 {% endblock %}

templates/reporting/report_by_user_data.html.twig

@@ -46,6 +46,23 @@
         {% elseif data.customer != totalCurrency %}
             {% set totalCurrency = null %}
         {% endif %}
+        {% set customerTotalsDuration = {} %}
+        {% set customerTotalsInternalRate = {} %}
+        {% set customerTotalsRate = {} %}
+        {% for column in period.dateTimes %}
+            {% set dateKey = column|report_date %}
+            {% set customerTotalsDuration = customerTotalsDuration|merge({(dateKey): 0}) %}
+            {% set customerTotalsInternalRate = customerTotalsInternalRate|merge({(dateKey): 0}) %}
+            {% set customerTotalsRate = customerTotalsRate|merge({(dateKey): 0}) %}
+        {% endfor %}
+        {% for project in data.projects %}
+            {% for column in project.data.data %}
+                {% set dateKey = column.date|report_date %}
+                {% set customerTotalsDuration = customerTotalsDuration|merge({(dateKey): (customerTotalsDuration[dateKey] + column.duration)}) %}
+                {% set customerTotalsInternalRate = customerTotalsInternalRate|merge({(dateKey): (customerTotalsInternalRate[dateKey] + column.internalRate)}) %}
+                {% set customerTotalsRate = customerTotalsRate|merge({(dateKey): (customerTotalsRate[dateKey] + column.rate)}) %}
+            {% endfor %}
+        {% endfor %}
         <tr class="summary">
             <td>{{ widgets.label_customer(data.customer) }}</td>
             <td class="text-center total">
@@ -59,7 +76,20 @@
                 {% endif %}
                 {% if with_links %}</a>{% endif %}
             </td>
-            <td colspan="{{ columns }}"></td>
+            {% for column in period.dateTimes %}
+                {% set dateKey = column|report_date %}
+                <td class="text-nowrap text-center day-total {% block column_classes_customer_total %}{% endblock %}">
+                    {% if customerTotalsRate[dateKey] > 0 or customerTotalsInternalRate[dateKey] > 0 or customerTotalsDuration[dateKey] > 0 %}
+                        {% if dataType == 'rate' %}
+                            <strong>{{ customerTotalsRate[dateKey]|money(currency) }}</strong>
+                        {% elseif dataType == 'internalRate' %}
+                            <strong>{{ customerTotalsInternalRate[dateKey]|money(currency) }}</strong>
+                        {% else %}
+                            <strong>{{ customerTotalsDuration[dateKey]|duration(decimal) }}</strong>
+                        {% endif %}
+                    {% endif %}
+                </td>
+            {% endfor %}
         </tr>
         {% for project in data.projects %}
             {% set absoluteDuration = absoluteDuration + project.duration %}

templates/reporting/report_by_user_year.html.twig

@@ -14,5 +14,6 @@
         {% block column_classes_project %}{% endblock %}
         {% block column_classes_activity %}{% endblock %}
         {% block column_classes_total %}{% endblock %}
+        {% block column_classes_customer_total %}{% endblock %}
     {% endembed %}
 {% endblock %}

templates/reporting/report_by_user_year_export.html.twig

@@ -5,4 +5,5 @@
     {% block column_classes_project %}{% endblock %}
     {% block column_classes_activity %}{% endblock %}
     {% block column_classes_total %}{% endblock %}
+    {% block column_classes_customer_total %}{% endblock %}
 {% endembed %}

tests/Controller/ExportControllerTest.php

@@ -105,7 +105,7 @@ class ExportControllerTest extends AbstractControllerBaseTestCase
         // assert export type buttons are available
         $expected = [
             'csv' => 'csv',
-            'html' => 'html',
+            'print' => 'html',
             'pdf' => 'pdf',
             'xlsx' => 'xlsx'
         ];
@@ -162,7 +162,7 @@ class ExportControllerTest extends AbstractControllerBaseTestCase
         // assert export type buttons are available
         $expected = [
             'csv' => 'csv',
-            'html' => 'html',
+            'print' => 'html',
             'pdf' => 'pdf',
             'xlsx' => 'xlsx'
         ];
@@ -227,7 +227,7 @@ class ExportControllerTest extends AbstractControllerBaseTestCase
 
         // don't add daterange to make sure the current month is the default range
         $client->submit($form, [
-            'renderer' => 'html',
+            'renderer' => 'print',
             'markAsExported' => 1
         ]);
 

tests/Entity/WorkingTimeTest.php

@@ -50,4 +50,23 @@ class WorkingTimeTest extends TestCase
         self::assertSame($approvedBy, $sut->getApprovedBy());
         self::assertTrue($sut->isApproved());
     }
+
+    public function testExpectedTime(): void
+    {
+        $user = new User();
+        $user->setUsername('bar');
+        $date = new \DateTimeImmutable();
+        $sut = new WorkingTime($user, $date);
+        $sut->setExpectedTime(222222);
+
+        self::assertEquals(222222, $sut->getExpectedTime());
+        self::assertEquals(222222, $sut->getOriginalExpectedTime());
+        $reducedBy = $sut->halveExpectedTime();
+        self::assertEquals(111111, $reducedBy);
+        self::assertEquals(111111, $sut->getExpectedTime());
+        self::assertEquals(222222, $sut->getOriginalExpectedTime());
+        $sut->emptyExpectedTime();
+        self::assertEquals(0, $sut->getExpectedTime());
+        self::assertEquals(222222, $sut->getOriginalExpectedTime());
+    }
 }

tests/Export/Base/XlsxRendererTest.php

@@ -54,7 +54,7 @@ class XlsxRendererTest extends AbstractRendererTestCase
 
         self::assertEquals('xlsx', $sut->getType());
         self::assertEquals('xlsx', $sut->getId());
-        self::assertEquals('default', $sut->getTitle());
+        self::assertEquals('xlsx', $sut->getTitle());
         self::assertFalse($sut->isInternal());
         $sut->setInternal(true);
         self::assertTrue($sut->isInternal());

translations/daterangepicker.id.xlf

@@ -34,6 +34,18 @@
         <source>This year — until today</source>
         <target state="translated">Tahun ini — hingga hari ini</target>
       </trans-unit>
+      <trans-unit id="8f61k.L" resname="daterangepicker.thisMonth" xml:space="preserve">
+        <source>daterangepicker.thisMonth</source>
+        <target state="translated">Bulan ini</target>
+      </trans-unit>
+      <trans-unit id="AdEC6w4" resname="daterangepicker.lastMonth" xml:space="preserve">
+        <source>daterangepicker.lastMonth</source>
+        <target state="translated">Bulan lalu</target>
+      </trans-unit>
+      <trans-unit id="mgJ2Z7M" resname="daterangepicker.thisFinancialYear" xml:space="preserve">
+        <source>daterangepicker.thisFinancialYear</source>
+        <target state="translated">Tahun fiskal ini</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>

translations/daterangepicker.ko.xlf

@@ -26,6 +26,10 @@
         <source>daterangepicker.thisYear</source>
         <target state="translated">올해</target>
       </trans-unit>
+      <trans-unit id="AY_E9UR" resname="daterangepicker.thisYearUntilNow" xml:space="preserve">
+        <source>This year — until today</source>
+        <target state="translated">올해 — 오늘까지</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>

translations/daterangepicker.vi.xlf

@@ -42,6 +42,10 @@
         <source>daterangepicker.lastMonth</source>
         <target state="translated">Tháng trước</target>
       </trans-unit>
+      <trans-unit id="mgJ2Z7M" resname="daterangepicker.thisFinancialYear" xml:space="preserve">
+        <source>daterangepicker.thisFinancialYear</source>
+        <target state="translated">Năm tài chính hiện tại</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>

translations/email.el.xlf

@@ -38,6 +38,18 @@
         <source>Don't worry, Kimai will help you create a new one!</source>
         <target state="needs-translation">… επομένως ξεχάσατε τον κωδικό σας; Μην ανησυχείτε: Το Kimai θα σας βοηθήσει να δημιουργήσετε ένα νέο:</target>
       </trans-unit>
+      <trans-unit id="U.JjI9R" resname="approval_rejected_message" xml:space="preserve">
+        <source>approval_rejected_message</source>
+        <target state="translated">Η αίτηση εξουσιοδότησής σας απορρίφθηκε από τον/την %created_by%
+
+%list%
+
+Παρακαλούμε ελέγξτε τα αιτήματά σας στο:%url%</target>
+      </trans-unit>
+      <trans-unit id="YdGZyer" resname="approval_approved_subject" xml:space="preserve">
+        <source>approval_approved_subject</source>
+        <target state="translated">Το αίτημα σας έχει εγκριθεί</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>

translations/email.fr.xlf

@@ -32,7 +32,7 @@
       </trans-unit>
       <trans-unit id="qbt.84Y" resname="reset.button" xml:space="preserve">
         <source>reset.button</source>
-        <target state="translated">Connectez-vous</target>
+        <target state="translated">Se connecter</target>
       </trans-unit>
       <trans-unit id="rhkMAep" resname="reset.intro" xml:space="preserve">
         <source>Don't worry, Kimai will help you create a new one!</source>

translations/email.hu.xlf

@@ -50,9 +50,9 @@ Please review them at: %url%</source>
 
 Kérjük, tekintse át a következő címen: %url%</target>
       </trans-unit>
-      <trans-unit id="yohIAA_" resname="absence_created_supervisor_subject">
+      <trans-unit id="yohIAA_" resname="absence_created_supervisor_subject" xml:space="preserve">
         <source>absence_created_supervisor_subject</source>
-        <target state="translated">Új távollét | %user% | %type%</target>
+        <target state="translated">Új távollét: %user% (%type%)</target>
       </trans-unit>
       <trans-unit id="1q.VHdU" resname="approval_requested_subject" xml:space="preserve">
         <source>approval_requested_subject</source>

translations/email.pl.xlf

@@ -32,11 +32,11 @@
       </trans-unit>
       <trans-unit id="qbt.84Y" resname="reset.button" xml:space="preserve">
         <source>reset.button</source>
-        <target state="needs-translation">Zresetuj swoje hasło</target>
+        <target state="translated">Zaloguj się</target>
       </trans-unit>
       <trans-unit id="rhkMAep" resname="reset.intro" xml:space="preserve">
         <source>Don't worry, Kimai will help you create a new one!</source>
-        <target state="needs-translation">… zapomniałeś hasła? Nie martw się, Kimai pomoże Ci stworzyć nowe:</target>
+        <target state="translated">Link będzie ważny przez 15 najbliższych minut</target>
       </trans-unit>
       <trans-unit id="yohIAA_" resname="absence_created_supervisor_subject" xml:space="preserve">
         <source>absence_created_supervisor_subject</source>
@@ -54,6 +54,42 @@ Please review them at: %url%</source>
 
 Prosimy o zapoznanie się z nią na stronie: %url%</target>
       </trans-unit>
+      <trans-unit id="1q.VHdU" resname="approval_requested_subject" xml:space="preserve">
+        <source>approval_requested_subject</source>
+        <target state="translated">Wniosek o zatwierdzenie: %user%</target>
+      </trans-unit>
+      <trans-unit id="Z172mQ8" resname="approval_requested_message" xml:space="preserve">
+        <source>approval_requested_message</source>
+        <target state="translated">Wysłano prośbę o zatwierdzenie dla %user%.
+
+%list%
+
+Proszę zapoznać się z nimi pod adresem: %url%</target>
+      </trans-unit>
+      <trans-unit id="dvPkiia" resname="approval_rejected_subject" xml:space="preserve">
+        <source>approval_rejected_subject</source>
+        <target state="translated">Twoja prośba została odrzucona</target>
+      </trans-unit>
+      <trans-unit id="U.JjI9R" resname="approval_rejected_message" xml:space="preserve">
+        <source>approval_rejected_message</source>
+        <target state="translated">Twoja prośba o autoryzację została odrzucona przez %created_by%.
+
+%list%
+
+Proszę sprawdzić swoje wnioski pod adresem: %url%</target>
+      </trans-unit>
+      <trans-unit id="YdGZyer" resname="approval_approved_subject" xml:space="preserve">
+        <source>approval_approved_subject</source>
+        <target state="translated">Twój wniosek został zaakceptowany</target>
+      </trans-unit>
+      <trans-unit id="4nn7Vi1" resname="approval_approved_message" xml:space="preserve">
+        <source>approval_approved_message</source>
+        <target state="translated">Twój wniosek został zaakceptowany przez %created_by%.
+
+%list%
+
+Wszystkie zapytania można znaleźć pod adresem: %url%</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>

translations/email.vi.xlf

@@ -54,6 +54,42 @@ Please review them at: %url%</source>
 
 Vui lòng xét duyệt tại: %url%</target>
       </trans-unit>
+      <trans-unit id="1q.VHdU" resname="approval_requested_subject" xml:space="preserve">
+        <source>approval_requested_subject</source>
+        <target state="translated">Quyền cấp phép đã được yêu cầu:%user%</target>
+      </trans-unit>
+      <trans-unit id="Z172mQ8" resname="approval_requested_message" xml:space="preserve">
+        <source>approval_requested_message</source>
+        <target state="translated">Quyền cấp phép cho %user% đã được yêu cầu
+
+%list%
+
+Hãy xem qua tại:%url%</target>
+      </trans-unit>
+      <trans-unit id="dvPkiia" resname="approval_rejected_subject" xml:space="preserve">
+        <source>approval_rejected_subject</source>
+        <target state="translated">Yêu cầu của bạn đã bị từ chối</target>
+      </trans-unit>
+      <trans-unit id="U.JjI9R" resname="approval_rejected_message" xml:space="preserve">
+        <source>approval_rejected_message</source>
+        <target state="translated">Yêu cầu xác thực của bạn đã bị từ chối bởi %created_by%
+
+%list%
+
+Vui lòng xem qua yêu cầu của bạn tại: %url%</target>
+      </trans-unit>
+      <trans-unit id="YdGZyer" resname="approval_approved_subject" xml:space="preserve">
+        <source>approval_approved_subject</source>
+        <target state="translated">Yêu cầu của bạn đã được chấp nhận</target>
+      </trans-unit>
+      <trans-unit id="4nn7Vi1" resname="approval_approved_message" xml:space="preserve">
+        <source>approval_approved_message</source>
+        <target state="translated">Yêu cầu của bạn đã được chấp nhận bởi %created_by%
+
+%list%
+
+Bạn có thể tất cả truy vấn của bạn tại: %url%</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>

translations/export.ar.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="ar" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig">
-        <source>Timesheet</source>
-        <target>ورقة التوقيت</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.bg.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="bg" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig" xml:space="preserve">
-        <source>Timesheet</source>
-        <target state="translated">Работно време</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.ca.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="ca" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig" xml:space="preserve">
-        <source>Timesheet</source>
-        <target state="translated">Registre d'hores</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.cs.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="cs" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig">
-        <source>Timesheet</source>
-        <target state="translated">Pracovní výkaz</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.da.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="da" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig" xml:space="preserve">
-        <source>Timesheet</source>
-        <target state="translated">Timeoverblik</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.de.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="de" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig">
-        <source>Timesheet</source>
-        <target>Stundennachweis</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.de_CH.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="de-CH" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig">
-        <source>Timesheet</source>
-        <target state="translated">Stundenzettel</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.el.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="el" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig">
-        <source>Timesheet</source>
-        <target>Χρονοδιάγραμμα</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.en.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="en" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig">
-        <source>Timesheet</source>
-        <target>Timesheet</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.eo.xlf

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="eo" datatype="plaintext" original="export.en.xlf">
-    <body>
-      
-    </body>
-  </file>
-</xliff>

translations/export.es.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="es" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig">
-        <source>Timesheet</source>
-        <target state="translated">Parte de horas</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.et.xlf

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="et" datatype="plaintext" original="export.en.xlf">
-    <body>
-      
-    </body>
-  </file>
-</xliff>

translations/export.eu.xlf

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="eu" datatype="plaintext" original="export.en.xlf">
-    <body>
-    </body>
-  </file>
-</xliff>

translations/export.fa.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="fa" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig">
-        <source>Timesheet</source>
-        <target state="translated">تایم شیت</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.fi.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="fi" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig">
-        <source>Timesheet</source>
-        <target state="translated">Kellokortti</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.fo.xlf

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="fo" datatype="plaintext" original="export.en.xlf">
-    <body>
-    </body>
-  </file>
-</xliff>

translations/export.fr.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="fr" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig">
-        <source>Timesheet</source>
-        <target>Feuille de temps</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.he.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="he" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig">
-        <source>Timesheet</source>
-        <target>גיליון שעות</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.hr.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="hr" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig" xml:space="preserve">
-        <source>Timesheet</source>
-        <target state="translated">Vremenska tablica</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.hu.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="hu" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig" xml:space="preserve">
-        <source>Timesheet</source>
-        <target state="translated">Munkaidő-nyilvántartás</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.id.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="id" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig" xml:space="preserve">
-        <source>Timesheet</source>
-        <target state="translated">Lembar Waktu</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.it.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="it" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig" approved="yes">
-        <source>Timesheet</source>
-        <target state="final">Foglio di presenza</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.ja.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="ja" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig">
-        <source>Timesheet</source>
-        <target state="translated">タイムシート</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.ko.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="ko" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig">
-        <source>Timesheet</source>
-        <target>근무 시간 기록표</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.lv.xlf

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="lv" datatype="plaintext" original="export.en.xlf">
-    <body>
-      </body>
-  </file>
-</xliff>

translations/export.mk.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="mk" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig" xml:space="preserve">
-        <source>Timesheet</source>
-        <target state="translated">Временски лист</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.nb_NO.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="nb-NO" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig">
-        <source>Timesheet</source>
-        <target>Timeseddel</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.nl.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="nl" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig">
-        <source>Timesheet</source>
-        <target state="translated">Tijdrooster</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.pa.xlf

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="pa" datatype="plaintext" original="export.en.xlf">
-    <body>
-    </body>
-  </file>
-</xliff>

translations/export.pl.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="pl" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig">
-        <source>Timesheet</source>
-        <target state="translated">Ewidencja pomiarów</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.pt.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="pt" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig">
-        <source>Timesheet</source>
-        <target>Quadro de horários</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.pt_BR.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="pt-BR" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig">
-        <source>Timesheet</source>
-        <target>Planilha de horários</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.ro.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="ro" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig">
-        <source>Timesheet</source>
-        <target>Fișă de pontaj</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.ru.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="ru" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig">
-        <source>Timesheet</source>
-        <target state="translated">Табель рабочего времени</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.sk.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="sk" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig">
-        <source>Timesheet</source>
-        <target state="translated">Pracovný výkaz</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.sl.xlf

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="sl" datatype="plaintext" original="export.en.xlf">
-    <body>
-    </body>
-  </file>
-</xliff>

translations/export.sv.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="sv" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig">
-        <source>Timesheet</source>
-        <target state="translated">Tidrapport</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.ta.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="ta" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig" xml:space="preserve" approved="yes">
-        <source>Timesheet</source>
-        <target state="final">நேரத்தாள்</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.tr.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="tr" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig">
-        <source>Timesheet</source>
-        <target>Zaman çizelgesi</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.uk.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="uk" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig">
-        <source>Timesheet</source>
-        <target state="translated">Табель робочого часу</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.vi.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="vi" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig">
-        <source>Timesheet</source>
-        <target state="translated">Bảng chấm công</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.zh_CN.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="zh-CN" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig">
-        <source>Timesheet</source>
-        <target state="translated">时间表</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/export.zh_Hant.xlf

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" target-language="zh-Hant" datatype="plaintext" original="export.en.xlf">
-    <body>
-      <trans-unit id="dzZWfU1" resname="timesheet.pdf.twig" xml:space="preserve" approved="yes">
-        <source>Timesheet</source>
-        <target state="final">工時單</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

translations/flashmessages.id.xlf

@@ -6,13 +6,53 @@
         <source>warning</source>
         <target state="translated">Peringatan</target>
       </trans-unit>
-      <trans-unit id="WmrEP_5" resname="timesheet.stop.success">
+      <trans-unit id="WmrEP_5" resname="timesheet.stop.success" xml:space="preserve">
         <source>timesheet.stop.success</source>
-        <target state="translated">Perekaman waktu dihentikan</target>
+        <target state="translated">Pencatatan waktu telah dihentikan</target>
       </trans-unit>
       <trans-unit id="NPBnpK_" resname="timesheet.stop.error" xml:space="preserve">
         <source>timesheet.stop.error</source>
-        <target state="translated">Perekaman waktu tidak dapat dihentikan</target>
+        <target state="translated">Pencatatan waktu tidak dapat dihentikan</target>
+      </trans-unit>
+      <trans-unit id="CCUoZga" resname="timesheet.start.success" xml:space="preserve">
+        <source>timesheet.start.success</source>
+        <target state="translated">Pencatatan waktu telah dimulai</target>
+      </trans-unit>
+      <trans-unit id="3w9tuox" resname="timesheet.start.error" xml:space="preserve">
+        <source>timesheet.start.error</source>
+        <target state="translated">Pencatatan waktu tidak dapat dimulai</target>
+      </trans-unit>
+      <trans-unit id="kPINWEK" resname="timesheet.locked.warning" xml:space="preserve">
+        <source>timesheet.locked.warning</source>
+        <target state="translated">Anda sedang mengedit catatan yang telah diekspor</target>
+      </trans-unit>
+      <trans-unit id="72Ih8zO" resname="action.update.success" xml:space="preserve">
+        <source>action.update.success</source>
+        <target state="translated">Perubahan tersimpan</target>
+      </trans-unit>
+      <trans-unit id="xeu1LSy" resname="action.update.error" xml:space="preserve">
+        <source>action.update.error</source>
+        <target state="translated">Perubahan tidak dapat disimpan: %reason%</target>
+      </trans-unit>
+      <trans-unit id="YV50HDB" resname="action.delete.success" xml:space="preserve">
+        <source>action.delete.success</source>
+        <target state="translated">Entri telah dihapus</target>
+      </trans-unit>
+      <trans-unit id="mW91Tmb" resname="action.delete.error" xml:space="preserve">
+        <source>action.delete.error</source>
+        <target state="translated">Entri tidak dapat dihapus: %reason%</target>
+      </trans-unit>
+      <trans-unit id="B_cz49z" resname="invoice.first_template" xml:space="preserve">
+        <source>invoice.first_template</source>
+        <target state="translated">Harap buat templat faktur terlebih dahulu</target>
+      </trans-unit>
+      <trans-unit id="wejAEcR" resname="action.upload.error" xml:space="preserve">
+        <source>action.upload.error</source>
+        <target state="translated">File tidak dapat diunggah atau disimpan: %reason%</target>
+      </trans-unit>
+      <trans-unit resname="action.csrf.error" id="bOE_q5R" xml:space="preserve">
+        <source>action.csrf.error</source>
+        <target state="translated">Tindakan tidak dapat dilakukan: token keamanan tidak valid.</target>
       </trans-unit>
     </body>
   </file>

translations/invoice-calculator.el.xlf

@@ -38,6 +38,14 @@
         <source>price</source>
         <target state="translated">Τιμή: μια καταχώριση ανά τιμή</target>
       </trans-unit>
+      <trans-unit id="oRa0mkz" resname="activity_user" xml:space="preserve">
+        <source>activity_user</source>
+        <target state="translated">Δραστηριότητα και χρήστης</target>
+      </trans-unit>
+      <trans-unit id="0l1P9cz" resname="date_user" xml:space="preserve">
+        <source>date_user</source>
+        <target state="translated">Ημερομηνία και χρήστης</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>

translations/invoice-calculator.et.xlf

@@ -4,7 +4,7 @@
     <body>
       <trans-unit id="DodjLNR" resname="date" xml:space="preserve">
         <source>date</source>
-        <target state="translated">Kuupöev</target>
+        <target state="translated">Kuupäev</target>
       </trans-unit>
       <trans-unit id="BPiZbad" resname="user" xml:space="preserve">
         <source>user</source>

translations/invoice-calculator.he.xlf

@@ -26,9 +26,9 @@
         <source>project</source>
         <target state="translated">מיזם</target>
       </trans-unit>
-      <trans-unit id="DodjLNR" resname="date">
+      <trans-unit id="DodjLNR" resname="date" xml:space="preserve" approved="yes">
         <source>date</source>
-        <target state="translated">תאריך</target>
+        <target state="final">תאריך</target>
       </trans-unit>
       <trans-unit id="aDtTH0H" resname="price">
         <source>price</source>

translations/invoice-calculator.id.xlf

@@ -24,12 +24,36 @@
       </trans-unit>
       <trans-unit id="KWX.j1b" resname="invoice_calculator.help" xml:space="preserve">
         <source>invoice_calculator.help</source>
-        <target state="translated">Pilih berdasarkan bidang mana item faktur harus dikelompokkan</target>
+        <target state="translated">Pilih berdasarkan kolom mana item faktur harus dikelompokkan</target>
       </trans-unit>
       <trans-unit id="N6juwc4" resname="default" xml:space="preserve">
         <source>default</source>
         <target state="translated">Default (satu baris per entri)</target>
       </trans-unit>
+      <trans-unit id="_bAHi13" resname="short" xml:space="preserve">
+        <source>short</source>
+        <target state="translated">Semua (satu total entri)</target>
+      </trans-unit>
+      <trans-unit id="oRa0mkz" resname="activity_user" xml:space="preserve">
+        <source>activity_user</source>
+        <target state="translated">Aktivitas dan pengguna</target>
+      </trans-unit>
+      <trans-unit id="AJm1952" resname="project_user" xml:space="preserve">
+        <source>project_user</source>
+        <target state="translated">Proyek dan pengguna</target>
+      </trans-unit>
+      <trans-unit id="0l1P9cz" resname="date_user" xml:space="preserve">
+        <source>date_user</source>
+        <target state="translated">Tanggal dan pengguna</target>
+      </trans-unit>
+      <trans-unit id="iFDs7Zh" resname="weekly" xml:space="preserve">
+        <source>weekly</source>
+        <target state="translated">Minggu kalender</target>
+      </trans-unit>
+      <trans-unit id="aDtTH0H" resname="price" xml:space="preserve">
+        <source>price</source>
+        <target state="translated">Harga</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>

translations/invoice-calculator.it.xlf

@@ -30,7 +30,7 @@
         <source>project</source>
         <target state="final">Progetto</target>
       </trans-unit>
-      <trans-unit id="DodjLNR" resname="date" approved="yes">
+      <trans-unit id="DodjLNR" resname="date" approved="yes" xml:space="preserve">
         <source>date</source>
         <target state="final">Data</target>
       </trans-unit>

translations/invoice-calculator.ko.xlf

@@ -50,6 +50,10 @@
         <source>date_user</source>
         <target state="translated">날짜 및 사용자</target>
       </trans-unit>
+      <trans-unit id="KWX.j1b" resname="invoice_calculator.help" xml:space="preserve">
+        <source>invoice_calculator.help</source>
+        <target state="translated">명세서 항목을 묶을 기준을 선택해 주세요</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>

translations/invoice-calculator.uk.xlf

@@ -26,9 +26,9 @@
         <source>project</source>
         <target state="translated">Проєкт</target>
       </trans-unit>
-      <trans-unit id="DodjLNR" resname="date">
+      <trans-unit id="DodjLNR" resname="date" xml:space="preserve" approved="yes">
         <source>date</source>
-        <target state="translated">Дата</target>
+        <target state="final">Дата</target>
       </trans-unit>
       <trans-unit id="iFDs7Zh" resname="weekly">
         <source>weekly</source>

translations/invoice-renderer.de.xlf

@@ -2,41 +2,41 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
   <file source-language="en" target-language="de" datatype="plaintext" original="invoice-renderer.en.xlf">
     <body>
-      <trans-unit id="hOcTt2G" resname="invoice_renderer">
+      <trans-unit id="hOcTt2G" resname="invoice_renderer" xml:space="preserve" approved="yes">
         <source>invoice_renderer</source>
-        <target>Rechnungsvorlage</target>
+        <target state="final">Rechnungsvorlage</target>
       </trans-unit>
-      <trans-unit id="7mEUv6C" resname="help.upload">
+      <trans-unit id="7mEUv6C" resname="help.upload" xml:space="preserve" approved="yes">
         <source>help.upload</source>
-        <target state="translated">Achtung: existierende Dateien werden überschrieben. Erlaubte Dateitypen sind: %extensions%.</target>
+        <target state="final">Achtung: existierende Dateien werden überschrieben. Erlaubte Dateitypen sind: %extensions%.</target>
       </trans-unit>
-      <trans-unit id="22pt8Gs" resname="download_invoice_renderer">
+      <trans-unit id="22pt8Gs" resname="download_invoice_renderer" xml:space="preserve" approved="yes">
         <source>download_invoice_renderer</source>
-        <target state="translated">Sie können weitere Vorlagen hier herunterladen</target>
+        <target state="final">Sie können hier weitere Vorlagen herunterladen</target>
       </trans-unit>
-      <trans-unit id="E5BwZHT" resname="programmatic">
+      <trans-unit id="E5BwZHT" resname="programmatic" xml:space="preserve" approved="yes">
         <source>programmatic</source>
-        <target>Zur Weiterverarbeitung</target>
+        <target state="final">Zur Weiterverarbeitung</target>
       </trans-unit>
-      <trans-unit id="Utbj3k_" resname="invoice">
+      <trans-unit id="Utbj3k_" resname="invoice" xml:space="preserve" approved="yes">
         <source>invoice</source>
-        <target>Rechnung</target>
+        <target state="final">Rechnung</target>
       </trans-unit>
       <trans-unit id="N6juwc4" resname="default" xml:space="preserve" approved="yes">
         <source>Invoice</source>
         <target state="final">Rechnung</target>
       </trans-unit>
-      <trans-unit id="mC2ePrm" resname="text">
+      <trans-unit id="mC2ePrm" resname="text" xml:space="preserve" approved="yes">
         <source>text</source>
-        <target>Text</target>
+        <target state="final">Text</target>
       </trans-unit>
       <trans-unit id="lt2Y2LO" resname="timesheet" xml:space="preserve" approved="yes">
         <source>timesheet</source>
         <target state="final">Stundenzettel</target>
       </trans-unit>
-      <trans-unit id="m1UyfD9" resname="service-date">
-        <source>service-date</source>
-        <target>Leistungsdatum</target>
+      <trans-unit id="m1UyfD9" resname="service-date" xml:space="preserve" approved="yes">
+        <source>Single service date</source>
+        <target state="final">Leistungsdatum</target>
       </trans-unit>
     </body>
   </file>