Merge pull request #11608 from firefly-iii/release-1769541194

🤖 Automatically merge the PR into the develop branch.

.ci/php-cs-fixer/.php-cs-fixer.php

@@ -26,6 +26,7 @@ $paths = [
     $current . '/../../config',
     $current . '/../../routes',
     $current . '/../../tests',
+    $current . '/../../resources/lang/en_US',
 ];
 
 $finder = PhpCsFixer\Finder::create()

THANKS.md

@@ -4,6 +4,7 @@ Over time, many people have contributed to Firefly III. Their efforts are not al
 Please find below all the people who contributed to the Firefly III code. Their names are mentioned in the year of their first contribution.
 
 ## 2026
+- mateuszkulapl
 - Gianluca Martino
 - embedded
 

app/Api/V1/Controllers/System/BatchController.php

@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * BatchController.php
+ * Copyright (c) 2026 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Api\V1\Controllers\System;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Events\Model\TransactionGroup\CreatedSingleTransactionGroup;
+use FireflyIII\Events\Model\TransactionGroup\TransactionGroupEventFlags;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class BatchController extends Controller
+{
+    private JournalRepositoryInterface $repository;
+
+    /**
+     * UserController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(function ($request, $next) {
+            $this->repository = app(JournalRepositoryInterface::class);
+
+            return $next($request);
+        });
+    }
+
+    public function finishBatch(Request $request): JsonResponse
+    {
+        $journals          = $this->repository->getUncompletedJournals();
+        if (0 === count($journals)) {
+            return response()->json([], 204);
+        }
+
+        /** @var TransactionJournal $first */
+        $first             = $journals->first();
+        $group             = $first?->transactionGroup;
+        if (null === $group) {
+            return response()->json([], 204);
+        }
+        $flags             = new TransactionGroupEventFlags();
+        $flags->applyRules = 'true' === $request->get('apply_rules');
+        event(new CreatedSingleTransactionGroup($group, $flags));
+
+        return response()->json([], 204);
+    }
+}

app/Api/V1/Controllers/System/UserController.php

@@ -58,6 +58,8 @@ class UserController extends Controller
         });
     }
 
+    public function finishBatch(): JsonResponse {}
+
     /**
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/users/deleteUser

app/Factory/TransactionJournalFactory.php

@@ -50,6 +50,7 @@ use FireflyIII\Services\Internal\Destroy\JournalDestroyService;
 use FireflyIII\Services\Internal\Support\JournalServiceTrait;
 use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\NullArrayObject;
 use FireflyIII\User;
 use FireflyIII\Validation\AccountValidator;
 use Illuminate\Support\Collection;
@@ -126,7 +127,7 @@ class TransactionJournalFactory
             foreach ($transactions as $index => $row) {
                 $row['batch_submission'] = $batchSubmission;
                 Log::debug(sprintf('Now creating journal %d/%d', $index + 1, count($transactions)));
-                $journal                 = $this->createJournal($row);
+                $journal                 = $this->createJournal(new NullArrayObject($row));
                 if ($journal instanceof TransactionJournal) {
                     $collection->push($journal);
                 }
@@ -162,7 +163,7 @@ class TransactionJournalFactory
      *
      * @SuppressWarnings("PHPMD.ExcessiveMethodLength")
      */
-    private function createJournal(array $row): ?TransactionJournal
+    private function createJournal(NullArrayObject $row): ?TransactionJournal
     {
         Log::debug('Now in TransactionJournalFactory::createJournal()');
         $row['import_hash_v2'] = $this->hashArray($row);
@@ -345,7 +346,7 @@ class TransactionJournalFactory
         return $journal;
     }
 
-    private function hashArray(array $row): string
+    private function hashArray(NullArrayObject $row): string
     {
         unset($row['import_hash_v2'], $row['original_source']);
 
@@ -356,7 +357,7 @@ class TransactionJournalFactory
             $json = microtime();
         }
         $hash = hash('sha256', $json);
-        Log::debug(sprintf('The hash is: %s', $hash), $row);
+        Log::debug(sprintf('The hash is: %s', $hash), $row->getArrayCopy());
 
         return $hash;
     }
@@ -576,7 +577,7 @@ class TransactionJournalFactory
     /**
      * Link a piggy bank to this journal.
      */
-    private function storePiggyEvent(TransactionJournal $journal, array $data): void
+    private function storePiggyEvent(TransactionJournal $journal, NullArrayObject $data): void
     {
         Log::debug('Will now store piggy event.');
 
@@ -591,10 +592,10 @@ class TransactionJournalFactory
         Log::debug('Create no piggy event');
     }
 
-    private function storeMetaFields(TransactionJournal $journal, array $transaction): void
+    private function storeMetaFields(TransactionJournal $journal, NullArrayObject $transaction): void
     {
         foreach ($this->fields as $field) {
-            $this->storeMeta($journal, $transaction, $field);
+            $this->storeMeta($journal, $transaction->getArrayCopy(), $field);
         }
     }
 
@@ -614,7 +615,7 @@ class TransactionJournalFactory
         $factory->updateOrCreate($set);
     }
 
-    private function storeLocation(TransactionJournal $journal, array $data): void
+    private function storeLocation(TransactionJournal $journal, NullArrayObject $data): void
     {
         if (!in_array(null, [$data['longitude'], $data['latitude'], $data['zoom_level']], true)) {
             $location             = new Location();

app/Http/Controllers/Admin/ConfigurationController.php

@@ -61,36 +61,38 @@ class ConfigurationController extends Controller
      */
     public function index(): Factory|\Illuminate\Contracts\View\View
     {
-        $subTitle            = (string) trans('firefly.instance_configuration');
-        $subTitleIcon        = 'fa-wrench';
+        $subTitle              = (string) trans('firefly.instance_configuration');
+        $subTitleIcon          = 'fa-wrench';
 
         Log::channel('audit')->info('User visits admin config index.');
 
         // all available configuration and their default value in case
         // they don't exist yet.
-        $singleUserMode      = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
-        $isDemoSite          = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
-        $siteOwner           = config('firefly.site_owner');
+        $singleUserMode        = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
+        $isDemoSite            = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
+        $siteOwner             = config('firefly.site_owner');
 
-        $enableExchangeRates = FireflyConfig::get('enable_exchange_rates', config('cer.enabled'))->data;
-        $useRunningBalance   = FireflyConfig::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data;
-        $enableExternalMap   = FireflyConfig::get('enable_external_map', config('firefly.enable_external_map'))->data;
-        $enableExternalRates = FireflyConfig::get('enable_external_rates', config('cer.download_enabled'))->data;
-        $allowWebhooks       = FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data;
-        $validUrlProtocols   = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
+        $enableExchangeRates   = FireflyConfig::get('enable_exchange_rates', config('cer.enabled'))->data;
+        $useRunningBalance     = FireflyConfig::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data;
+        $enableExternalMap     = FireflyConfig::get('enable_external_map', config('firefly.enable_external_map'))->data;
+        $enableExternalRates   = FireflyConfig::get('enable_external_rates', config('cer.download_enabled'))->data;
+        $allowWebhooks         = FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data;
+        $enableBatchProcessing = FireflyConfig::get('enable_batch_processing', false)->data;
+        $validUrlProtocols     = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
 
         return view('settings.configuration.index', [
-            'subTitle'            => $subTitle,
-            'subTitleIcon'        => $subTitleIcon,
-            'singleUserMode'      => $singleUserMode,
-            'isDemoSite'          => $isDemoSite,
-            'siteOwner'           => $siteOwner,
-            'enableExchangeRates' => $enableExchangeRates,
-            'useRunningBalance'   => $useRunningBalance,
-            'enableExternalMap'   => $enableExternalMap,
-            'enableExternalRates' => $enableExternalRates,
-            'allowWebhooks'       => $allowWebhooks,
-            'validUrlProtocols'   => $validUrlProtocols,
+            'subTitle'              => $subTitle,
+            'subTitleIcon'          => $subTitleIcon,
+            'singleUserMode'        => $singleUserMode,
+            'isDemoSite'            => $isDemoSite,
+            'siteOwner'             => $siteOwner,
+            'enableExchangeRates'   => $enableExchangeRates,
+            'useRunningBalance'     => $useRunningBalance,
+            'enableExternalMap'     => $enableExternalMap,
+            'enableExternalRates'   => $enableExternalRates,
+            'allowWebhooks'         => $allowWebhooks,
+            'enableBatchProcessing' => $enableBatchProcessing,
+            'validUrlProtocols'     => $validUrlProtocols,
         ]);
     }
 

app/Http/Middleware/TrustProxies.php

@@ -45,6 +45,6 @@ class TrustProxies extends Middleware
      */
     public function __construct()
     {
-        $this->proxies = (string) config('firefly.trusted_proxies');
+        $this->proxies = (string) config('trustedproxy.proxies');
     }
 }

app/Http/Requests/ConfigurationRequest.php

@@ -41,14 +41,15 @@ class ConfigurationRequest extends FormRequest
     public function getConfigurationData(): array
     {
         return [
-            'single_user_mode'      => $this->boolean('single_user_mode'),
-            'enable_exchange_rates' => $this->boolean('enable_exchange_rates'),
-            'use_running_balance'   => $this->boolean('use_running_balance'),
-            'enable_external_map'   => $this->boolean('enable_external_map'),
-            'enable_external_rates' => $this->boolean('enable_external_rates'),
-            'allow_webhooks'        => $this->boolean('allow_webhooks'),
-            'valid_url_protocols'   => $this->string('valid_url_protocols'),
-            'is_demo_site'          => $this->boolean('is_demo_site'),
+            'single_user_mode'        => $this->boolean('single_user_mode'),
+            'enable_exchange_rates'   => $this->boolean('enable_exchange_rates'),
+            'use_running_balance'     => $this->boolean('use_running_balance'),
+            'enable_external_map'     => $this->boolean('enable_external_map'),
+            'enable_external_rates'   => $this->boolean('enable_external_rates'),
+            'allow_webhooks'          => $this->boolean('allow_webhooks'),
+            'valid_url_protocols'     => $this->string('valid_url_protocols'),
+            'is_demo_site'            => $this->boolean('is_demo_site'),
+            'enable_batch_processing' => $this->boolean('enable_batch_processing'),
         ];
     }
 
@@ -59,14 +60,15 @@ class ConfigurationRequest extends FormRequest
     {
         // fixed
         return [
-            'single_user_mode'      => 'min:0|max:1|numeric',
-            'enable_exchange_rates' => 'min:0|max:1|numeric',
-            'use_running_balance'   => 'min:0|max:1|numeric',
-            'enable_external_map'   => 'min:0|max:1|numeric',
-            'enable_external_rates' => 'min:0|max:1|numeric',
-            'allow_webhooks'        => 'min:0|max:1|numeric',
-            'valid_url_protocols'   => 'min:0|max:255',
-            'is_demo_site'          => 'min:0|max:1|numeric',
+            'single_user_mode'        => 'min:0|max:1|numeric',
+            'enable_exchange_rates'   => 'min:0|max:1|numeric',
+            'use_running_balance'     => 'min:0|max:1|numeric',
+            'enable_external_map'     => 'min:0|max:1|numeric',
+            'enable_external_rates'   => 'min:0|max:1|numeric',
+            'allow_webhooks'          => 'min:0|max:1|numeric',
+            'enable_batch_processing' => 'min:0|max:1|numeric',
+            'valid_url_protocols'     => 'min:0|max:255',
+            'is_demo_site'            => 'min:0|max:1|numeric',
         ];
     }
 

app/Listeners/Model/TransactionGroup/ProcessesNewTransactionGroup.php

@@ -48,8 +48,13 @@ class ProcessesNewTransactionGroup implements ShouldQueue
     public function handle(CreatedSingleTransactionGroup $event): void
     {
         Log::debug(sprintf('In ProcessesNewTransactionGroup::handle(#%d)', $event->transactionGroup->id));
-        if (true === $event->flags->batchSubmission) {
-            Log::debug(sprintf('Will do nothing for group #%d because it is part of a batch.', $event->transactionGroup->id));
+        $setting    = FireflyConfig::get('enable_batch_processing', false)->data;
+        if (true === $event->flags->batchSubmission && true === $setting) {
+            Log::debug(sprintf(
+                'Will do nothing for group #%d because it is part of a batch (setting:%s).',
+                $event->transactionGroup->id,
+                var_export($setting, true)
+            ));
 
             return;
         }

app/Services/Internal/Support/JournalServiceTrait.php

@@ -36,6 +36,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 use FireflyIII\Rules\UniqueIban;
+use FireflyIII\Support\NullArrayObject;
 use Illuminate\Support\Facades\Log;
 use Safe\Exceptions\JsonException;
 
@@ -377,7 +378,7 @@ trait JournalServiceTrait
         return $amount;
     }
 
-    protected function storeBudget(TransactionJournal $journal, array $data): void
+    protected function storeBudget(TransactionJournal $journal, NullArrayObject $data): void
     {
         if (TransactionTypeEnum::WITHDRAWAL->value !== $journal->transactionType->type) {
             $journal->budgets()->sync([]);
@@ -395,7 +396,7 @@ trait JournalServiceTrait
         $journal->budgets()->sync([]);
     }
 
-    protected function storeCategory(TransactionJournal $journal, array $data): void
+    protected function storeCategory(TransactionJournal $journal, NullArrayObject $data): void
     {
         $category = $this->categoryRepository->findCategory($data['category_id'], $data['category_name']);
         if (null !== $category) {

app/Support/Binder/DynamicConfigKey.php

@@ -42,6 +42,7 @@ class DynamicConfigKey
         'configuration.enable_external_map', // boolean
         'configuration.enable_external_rates', // boolean
         'configuration.allow_webhooks', // boolean
+        'configuration.enable_batch_processing', // boolean
         'configuration.valid_url_protocols', // string ("http,https")
     ];
 

bootstrap/app.php

@@ -47,6 +47,7 @@ use Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance;
 use Illuminate\Foundation\Http\Middleware\TrimStrings;
 use Illuminate\Http\Middleware\HandleCors;
 use Illuminate\Http\Middleware\ValidatePostSize;
+use Illuminate\Routing\Middleware\SubstituteBindings;
 use Illuminate\View\Middleware\ShareErrorsFromSession;
 use Laravel\Passport\Http\Middleware\CreateFreshApiToken;
 use Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful;
@@ -88,11 +89,6 @@ if (!function_exists('stringIsEqual')) {
     }
 }
 
-//$app = new Application(
-//    realpath(__DIR__ . '/../')
-//);
-
-
 $app = Application::configure(basePath: dirname(__DIR__))
                   ->withRouting(
                       web     : __DIR__ . '/../routes/web.php',
@@ -101,30 +97,39 @@ $app = Application::configure(basePath: dirname(__DIR__))
                   )
                   ->withMiddleware(function (Middleware $middleware): void {
                       // overrule the standard middleware
-                      $middleware->use([
-                                           InvokeDeferredCallbacks::class,
-                                           // \Illuminate\Http\Middleware\TrustHosts::class,
-                                           TrustProxies::class,
-                                           HandleCors::class,
-                                           PreventRequestsDuringMaintenance::class,
-                                           ValidatePostSize::class,
-                                           TrimStrings::class,
-                                           ConvertEmptyStringsToNull::class,
-                                           SecureHeaders::class,
-                                       ]);
+                      $middleware->use(
+                          [
+                              InvokeDeferredCallbacks::class,
+                              HandleCors::class,
+                              PreventRequestsDuringMaintenance::class,
+                              ValidatePostSize::class,
+                              TrimStrings::class,
+                              ConvertEmptyStringsToNull::class,
+                              SecureHeaders::class,
+                              TrustProxies::class,
+                          ]
+                      );
 
                       // overrule the web group
-                      $middleware->group('web', [
-                          Illuminate\Cookie\Middleware\EncryptCookies::class,
-                          Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
-                          StartFireflySession::class,
-                          Illuminate\View\Middleware\ShareErrorsFromSession::class,
-                          VerifyCsrfToken::class,
-                          Illuminate\Routing\Middleware\SubstituteBindings::class,
-                          CreateFreshApiToken::class,
-                      ]);
+                      $middleware->group('web',
+                                         [
+                                             EncryptCookies::class,
+                                             AddQueuedCookiesToResponse::class,
+                                             StartFireflySession::class,
+                                             ShareErrorsFromSession::class,
+                                             VerifyCsrfToken::class,
+                                             SubstituteBindings::class,
+                                             CreateFreshApiToken::class,
+                                         ]
+                      );
                       // new group?
-                      $middleware->appendToGroup('binders-only', [Installer::class, EncryptCookies::class, AddQueuedCookiesToResponse::class, Binder::class]);
+                      $middleware->appendToGroup('binders-only',
+                                                 [
+                                                     Installer::class,
+                                                     EncryptCookies::class,
+                                                     AddQueuedCookiesToResponse::class,
+                                                     Binder::class,
+                                                 ]);
 
                       //
                       $middleware->appendToGroup('user-not-logged-in', [

composer.json

@@ -115,11 +115,11 @@
         "thecodingmachine/safe": "^3.1"
     },
     "require-dev": {
-        "barryvdh/laravel-debugbar": "^3.9",
         "barryvdh/laravel-ide-helper": "^3",
         "driftingly/rector-laravel": "^2.0",
         "fakerphp/faker": "1.*",
         "filp/whoops": "2.*",
+        "fruitcake/laravel-debugbar": "^4.0",
         "larastan/larastan": "^3",
         "laravel-json-api/testing": "^3.0",
         "mockery/mockery": "1.*",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "434b4c996dad2af3b38326bd81c57534",
+    "content-hash": "1de93b568d1a9a4847285e5b5bc6695b",
     "packages": [
         {
             "name": "bacon/bacon-qr-code",
@@ -4824,16 +4824,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "3.0.48",
+            "version": "3.0.49",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "64065a5679c50acb886e82c07aa139b0f757bb89"
+                "reference": "6233a1e12584754e6b5daa69fe1289b47775c1b9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/64065a5679c50acb886e82c07aa139b0f757bb89",
-                "reference": "64065a5679c50acb886e82c07aa139b0f757bb89",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/6233a1e12584754e6b5daa69fe1289b47775c1b9",
+                "reference": "6233a1e12584754e6b5daa69fe1289b47775c1b9",
                 "shasum": ""
             },
             "require": {
@@ -4914,7 +4914,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.48"
+                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.49"
             },
             "funding": [
                 {
@@ -4930,7 +4930,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-12-15T11:51:42+00:00"
+            "time": "2026-01-27T09:17:28+00:00"
         },
         {
             "name": "pragmarx/google2fa",
@@ -10077,91 +10077,6 @@
         }
     ],
     "packages-dev": [
-        {
-            "name": "barryvdh/laravel-debugbar",
-            "version": "v3.16.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/fruitcake/laravel-debugbar.git",
-                "reference": "e85c0a8464da67e5b4a53a42796d46a43fc06c9a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/fruitcake/laravel-debugbar/zipball/e85c0a8464da67e5b4a53a42796d46a43fc06c9a",
-                "reference": "e85c0a8464da67e5b4a53a42796d46a43fc06c9a",
-                "shasum": ""
-            },
-            "require": {
-                "illuminate/routing": "^10|^11|^12",
-                "illuminate/session": "^10|^11|^12",
-                "illuminate/support": "^10|^11|^12",
-                "php": "^8.1",
-                "php-debugbar/php-debugbar": "^2.2.4",
-                "symfony/finder": "^6|^7|^8"
-            },
-            "require-dev": {
-                "mockery/mockery": "^1.3.3",
-                "orchestra/testbench-dusk": "^7|^8|^9|^10",
-                "phpunit/phpunit": "^9.5.10|^10|^11",
-                "squizlabs/php_codesniffer": "^3.5"
-            },
-            "type": "library",
-            "extra": {
-                "laravel": {
-                    "aliases": {
-                        "Debugbar": "Barryvdh\\Debugbar\\Facades\\Debugbar"
-                    },
-                    "providers": [
-                        "Barryvdh\\Debugbar\\ServiceProvider"
-                    ]
-                },
-                "branch-alias": {
-                    "dev-master": "3.16-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/helpers.php"
-                ],
-                "psr-4": {
-                    "Barryvdh\\Debugbar\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Barry vd. Heuvel",
-                    "email": "barryvdh@gmail.com"
-                }
-            ],
-            "description": "PHP Debugbar integration for Laravel",
-            "keywords": [
-                "debug",
-                "debugbar",
-                "dev",
-                "laravel",
-                "profiler",
-                "webprofiler"
-            ],
-            "support": {
-                "issues": "https://github.com/fruitcake/laravel-debugbar/issues",
-                "source": "https://github.com/fruitcake/laravel-debugbar/tree/v3.16.5"
-            },
-            "funding": [
-                {
-                    "url": "https://fruitcake.nl",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/barryvdh",
-                    "type": "github"
-                }
-            ],
-            "time": "2026-01-23T15:03:22+00:00"
-        },
         {
             "name": "barryvdh/laravel-ide-helper",
             "version": "v3.6.1",
@@ -10613,6 +10528,108 @@
             },
             "time": "2024-11-21T13:46:39+00:00"
         },
+        {
+            "name": "fruitcake/laravel-debugbar",
+            "version": "v4.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/fruitcake/laravel-debugbar.git",
+                "reference": "9eec3770a304c52d1dd71577b44bbb9ab904f5d8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/fruitcake/laravel-debugbar/zipball/9eec3770a304c52d1dd71577b44bbb9ab904f5d8",
+                "reference": "9eec3770a304c52d1dd71577b44bbb9ab904f5d8",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/routing": "^11|^12",
+                "illuminate/session": "^11|^12",
+                "illuminate/support": "^11|^12",
+                "php": "^8.2",
+                "php-debugbar/php-debugbar": "^3.1",
+                "php-debugbar/symfony-bridge": "^1.1"
+            },
+            "replace": {
+                "barryvdh/laravel-debugbar": "self.version"
+            },
+            "require-dev": {
+                "larastan/larastan": "^3",
+                "laravel/octane": "^2",
+                "laravel/pennant": "^1",
+                "laravel/pint": "^1",
+                "laravel/telescope": "^5.16",
+                "livewire/livewire": "^3.7|^4",
+                "mockery/mockery": "^1.3.3",
+                "orchestra/testbench-dusk": "^9|^10",
+                "php-debugbar/twig-bridge": "^2.0",
+                "phpstan/phpstan-phpunit": "^2",
+                "phpstan/phpstan-strict-rules": "^2.0",
+                "phpunit/phpunit": "^11",
+                "shipmonk/phpstan-rules": "^4.3"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "aliases": {
+                        "Debugbar": "Fruitcake\\LaravelDebugbar\\Facades\\Debugbar"
+                    },
+                    "providers": [
+                        "Fruitcake\\LaravelDebugbar\\ServiceProvider"
+                    ]
+                },
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/helpers.php"
+                ],
+                "psr-4": {
+                    "Fruitcake\\LaravelDebugbar\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fruitcake",
+                    "homepage": "https://fruitcake.nl"
+                },
+                {
+                    "name": "Barry vd. Heuvel",
+                    "email": "barryvdh@gmail.com"
+                }
+            ],
+            "description": "PHP Debugbar integration for Laravel",
+            "keywords": [
+                "barryvdh",
+                "debug",
+                "debugbar",
+                "dev",
+                "laravel",
+                "profiler",
+                "webprofiler"
+            ],
+            "support": {
+                "issues": "https://github.com/fruitcake/laravel-debugbar/issues",
+                "source": "https://github.com/fruitcake/laravel-debugbar/tree/v4.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://fruitcake.nl",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/barryvdh",
+                    "type": "github"
+                }
+            ],
+            "time": "2026-01-26T18:25:58+00:00"
+        },
         {
             "name": "hamcrest/hamcrest-php",
             "version": "v2.1.1",
@@ -11181,47 +11198,63 @@
         },
         {
             "name": "php-debugbar/php-debugbar",
-            "version": "v2.2.6",
+            "version": "v3.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-debugbar/php-debugbar.git",
-                "reference": "abb9fa3c5c8dbe7efe03ddba56782917481de3e8"
+                "reference": "0c61c6023742c76bc3678100ed6bc52dc4c8d434"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-debugbar/php-debugbar/zipball/abb9fa3c5c8dbe7efe03ddba56782917481de3e8",
-                "reference": "abb9fa3c5c8dbe7efe03ddba56782917481de3e8",
+                "url": "https://api.github.com/repos/php-debugbar/php-debugbar/zipball/0c61c6023742c76bc3678100ed6bc52dc4c8d434",
+                "reference": "0c61c6023742c76bc3678100ed6bc52dc4c8d434",
                 "shasum": ""
             },
             "require": {
-                "php": "^8.1",
+                "php": "^8.2",
                 "psr/log": "^1|^2|^3",
-                "symfony/var-dumper": "^5.4|^6.4|^7.3|^8.0"
+                "symfony/var-dumper": "^5.4|^6|^7|^8"
             },
             "replace": {
                 "maximebf/debugbar": "self.version"
             },
             "require-dev": {
-                "dbrekelmans/bdi": "^1",
+                "dbrekelmans/bdi": "^1.4",
+                "friendsofphp/php-cs-fixer": "^3.92",
+                "monolog/monolog": "^3.9",
+                "php-debugbar/doctrine-bridge": "^3@dev",
+                "php-debugbar/monolog-bridge": "^1@dev",
+                "php-debugbar/symfony-bridge": "^1@dev",
+                "php-debugbar/twig-bridge": "^2@dev",
+                "phpstan/phpstan": "^2.1",
+                "phpstan/phpstan-phpunit": "^2.0",
+                "phpstan/phpstan-strict-rules": "^2.0",
                 "phpunit/phpunit": "^10",
-                "symfony/browser-kit": "^6.0|7.0",
+                "predis/predis": "^3.3",
+                "shipmonk/phpstan-rules": "^4.3",
+                "symfony/browser-kit": "^6.4|7.0",
+                "symfony/dom-crawler": "^6.4|^7",
+                "symfony/event-dispatcher": "^5.4|^6.4|^7.3|^8.0",
+                "symfony/http-foundation": "^5.4|^6.4|^7.3|^8.0",
+                "symfony/mailer": "^5.4|^6.4|^7.3|^8.0",
                 "symfony/panther": "^1|^2.1",
                 "twig/twig": "^3.11.2"
             },
             "suggest": {
-                "kriswallsmith/assetic": "The best way to manage assets",
-                "monolog/monolog": "Log using Monolog",
-                "predis/predis": "Redis storage"
+                "php-debugbar/doctrine-bridge": "To integrate Doctrine with php-debugbar.",
+                "php-debugbar/monolog-bridge": "To integrate Monolog with php-debugbar.",
+                "php-debugbar/symfony-bridge": "To integrate Symfony with php-debugbar.",
+                "php-debugbar/twig-bridge": "To integrate Twig with php-debugbar."
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.2-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "DebugBar\\": "src/DebugBar/"
+                    "DebugBar\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -11245,13 +11278,91 @@
                 "debug",
                 "debug bar",
                 "debugbar",
-                "dev"
+                "dev",
+                "profiler",
+                "toolbar"
             ],
             "support": {
                 "issues": "https://github.com/php-debugbar/php-debugbar/issues",
-                "source": "https://github.com/php-debugbar/php-debugbar/tree/v2.2.6"
+                "source": "https://github.com/php-debugbar/php-debugbar/tree/v3.2.3"
             },
-            "time": "2025-12-22T13:21:32+00:00"
+            "funding": [
+                {
+                    "url": "https://fruitcake.nl",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/barryvdh",
+                    "type": "github"
+                }
+            ],
+            "time": "2026-01-27T10:26:33+00:00"
+        },
+        {
+            "name": "php-debugbar/symfony-bridge",
+            "version": "v1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-debugbar/symfony-bridge.git",
+                "reference": "e37d2debe5d316408b00d0ab2688d9c2cf59b5ad"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-debugbar/symfony-bridge/zipball/e37d2debe5d316408b00d0ab2688d9c2cf59b5ad",
+                "reference": "e37d2debe5d316408b00d0ab2688d9c2cf59b5ad",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.2",
+                "php-debugbar/php-debugbar": "^3.1",
+                "symfony/http-foundation": "^5.4|^6.4|^7.3|^8.0"
+            },
+            "require-dev": {
+                "dbrekelmans/bdi": "^1.4",
+                "phpunit/phpunit": "^10",
+                "symfony/browser-kit": "^6|^7",
+                "symfony/dom-crawler": "^6|^7",
+                "symfony/mailer": "^5.4|^6.4|^7.3|^8.0",
+                "symfony/panther": "^1|^2.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "DebugBar\\Bridge\\Symfony\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Maxime Bouroumeau-Fuseau",
+                    "email": "maxime.bouroumeau@gmail.com",
+                    "homepage": "http://maximebf.com"
+                },
+                {
+                    "name": "Barry vd. Heuvel",
+                    "email": "barryvdh@gmail.com"
+                }
+            ],
+            "description": "Symfony bridge for PHP Debugbar",
+            "homepage": "https://github.com/php-debugbar/php-debugbar",
+            "keywords": [
+                "debugbar",
+                "dev",
+                "symfony"
+            ],
+            "support": {
+                "issues": "https://github.com/php-debugbar/symfony-bridge/issues",
+                "source": "https://github.com/php-debugbar/symfony-bridge/tree/v1.1.0"
+            },
+            "time": "2026-01-15T14:47:34+00:00"
         },
         {
             "name": "phpstan/extension-installer",
@@ -11403,16 +11514,16 @@
         },
         {
             "name": "phpstan/phpstan-strict-rules",
-            "version": "2.0.7",
+            "version": "2.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan-strict-rules.git",
-                "reference": "d6211c46213d4181054b3d77b10a5c5cb0d59538"
+                "reference": "1ed9e626a37f7067b594422411539aa807190573"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/d6211c46213d4181054b3d77b10a5c5cb0d59538",
-                "reference": "d6211c46213d4181054b3d77b10a5c5cb0d59538",
+                "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/1ed9e626a37f7067b594422411539aa807190573",
+                "reference": "1ed9e626a37f7067b594422411539aa807190573",
                 "shasum": ""
             },
             "require": {
@@ -11445,9 +11556,9 @@
             "description": "Extra strict and opinionated rules for PHPStan",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan-strict-rules/issues",
-                "source": "https://github.com/phpstan/phpstan-strict-rules/tree/2.0.7"
+                "source": "https://github.com/phpstan/phpstan-strict-rules/tree/2.0.8"
             },
-            "time": "2025-09-26T11:19:08+00:00"
+            "time": "2026-01-27T08:10:25+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -11785,16 +11896,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "12.5.7",
+            "version": "12.5.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "79dee3d2685b80518e94b9ea741b3f822b213a5e"
+                "reference": "37ddb96c14bfee10304825edbb7e66d341ec6889"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/79dee3d2685b80518e94b9ea741b3f822b213a5e",
-                "reference": "79dee3d2685b80518e94b9ea741b3f822b213a5e",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/37ddb96c14bfee10304825edbb7e66d341ec6889",
+                "reference": "37ddb96c14bfee10304825edbb7e66d341ec6889",
                 "shasum": ""
             },
             "require": {
@@ -11862,7 +11973,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.7"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.8"
             },
             "funding": [
                 {
@@ -11886,7 +11997,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-01-24T16:12:53+00:00"
+            "time": "2026-01-27T06:12:29+00:00"
         },
         {
             "name": "rector/rector",

config/auth.php

@@ -64,6 +64,7 @@ return [
         'web'               => [
             'driver'   => 'session',
             'provider' => 'users',
+            'remember' => true,
         ],
         'remote_user_guard' => [
             'driver'   => 'remote_user_guard',

config/bindables.php

@@ -67,61 +67,62 @@ use FireflyIII\User;
 return [
     'bindables' => [
         // models
-        'account'               => Account::class,
-        'attachment'            => Attachment::class,
-        'availableBudget'       => AvailableBudget::class,
-        'bill'                  => Bill::class,
-        'budget'                => Budget::class,
-        'budgetLimit'           => BudgetLimit::class,
-        'category'              => Category::class,
-        'linkType'              => LinkType::class,
-        'transactionType'       => TransactionType::class,
-        'journalLink'           => TransactionJournalLink::class,
-        'currency'              => TransactionCurrency::class,
-        'objectGroup'           => ObjectGroup::class,
-        'piggyBank'             => PiggyBank::class,
-        'preference'            => Preference::class,
-        'tj'                    => TransactionJournal::class,
-        'tag'                   => Tag::class,
-        'recurrence'            => Recurrence::class,
-        'rule'                  => Rule::class,
-        'ruleGroup'             => RuleGroup::class,
-        'transactionGroup'      => TransactionGroup::class,
-        'user'                  => User::class,
-        'webhook'               => Webhook::class,
-        'webhookMessage'        => WebhookMessage::class,
-        'webhookAttempt'        => WebhookAttempt::class,
-        'invitedUser'           => InvitedUser::class,
+        'account'                   => Account::class,
+        'attachment'                => Attachment::class,
+        'availableBudget'           => AvailableBudget::class,
+        'bill'                      => Bill::class,
+        'budget'                    => Budget::class,
+        'budgetLimit'               => BudgetLimit::class,
+        'category'                  => Category::class,
+        'linkType'                  => LinkType::class,
+        'transactionType'           => TransactionType::class,
+        'journalLink'               => TransactionJournalLink::class,
+        'currency'                  => TransactionCurrency::class,
+        'objectGroup'               => ObjectGroup::class,
+        'piggyBank'                 => PiggyBank::class,
+        'preference'                => Preference::class,
+        'preferenceName'            => Preference::class,
+        'tj'                        => TransactionJournal::class,
+        'tag'                       => Tag::class,
+        'recurrence'                => Recurrence::class,
+        'rule'                      => Rule::class,
+        'ruleGroup'                 => RuleGroup::class,
+        'transactionGroup'          => TransactionGroup::class,
+        'user'                      => User::class,
+        'webhook'                   => Webhook::class,
+        'webhookMessage'            => WebhookMessage::class,
+        'webhookAttempt'            => WebhookAttempt::class,
+        'invitedUser'               => InvitedUser::class,
 
         // strings
-        'currency_code'         => CurrencyCode::class,
+        'currency_code'             => CurrencyCode::class,
 
         // dates
-        'start_date'            => Date::class,
-        'end_date'              => Date::class,
-        'date'                  => Date::class,
+        'start_date'                => Date::class,
+        'end_date'                  => Date::class,
+        'date'                      => Date::class,
 
         // lists
-        'accountList'           => AccountList::class,
-        'doubleList'            => AccountList::class,
-        'budgetList'            => BudgetList::class,
-        'journalList'           => JournalList::class,
-        'categoryList'          => CategoryList::class,
-        'tagList'               => TagList::class,
+        'accountList'               => AccountList::class,
+        'doubleList'                => AccountList::class,
+        'budgetList'                => BudgetList::class,
+        'journalList'               => JournalList::class,
+        'categoryList'              => CategoryList::class,
+        'tagList'                   => TagList::class,
 
         // others
-        'fromCurrencyCode'      => CurrencyCode::class,
-        'toCurrencyCode'        => CurrencyCode::class,
-        'cliToken'              => CLIToken::class,
-        'tagOrId'               => TagOrId::class,
-        'dynamicConfigKey'      => DynamicConfigKey::class,
-        'eitherConfigKey'       => EitherConfigKey::class,
+        'fromCurrencyCode'          => CurrencyCode::class,
+        'toCurrencyCode'            => CurrencyCode::class,
+        'cliToken'                  => CLIToken::class,
+        'tagOrId'                   => TagOrId::class,
+        'dynamicConfigKey'          => DynamicConfigKey::class,
+        'eitherConfigKey'           => EitherConfigKey::class,
 
         // V2 API endpoints:
-        'userGroupAccount'      => UserGroupAccount::class,
-        'userGroupTransaction'  => UserGroupTransaction::class,
-        'userGroupBill'         => UserGroupBill::class,
-        'userGroupExchangeRate' => UserGroupExchangeRate::class,
-        'userGroup'             => UserGroup::class,
+        'userGroupAccount'          => UserGroupAccount::class,
+        'userGroupTransaction'      => UserGroupTransaction::class,
+        'userGroupBill'             => UserGroupBill::class,
+        'userGroupExchangeRate'     => UserGroupExchangeRate::class,
+        'userGroup'                 => UserGroup::class,
     ],
 ];

config/firefly.php

@@ -78,8 +78,8 @@ return [
         'running_balance_column' => (bool)envNonEmpty('USE_RUNNING_BALANCE', true), // this is only the default value, is not used.
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                              => 'develop/2026-01-25',
-    'build_time'                           => 1769359942,
+    'version'                              => 'develop/2026-01-27',
+    'build_time'                           => 1769541065,
     'api_version'                          => '2.1.0', // field is no longer used.
     'db_version'                           => 28, // field is no longer used.
 

mago.toml

@@ -4,7 +4,7 @@ php-version = "8.4.0"
 
 [source]
 workspace = "."
-paths = ["app/", "database/factories/", "database/seeders/", "tests/"]
+paths = ["app/", "database/factories/", "database/seeders/", "tests/", "resources/lang/en_US"]
 includes = ["vendor"]
 excludes = []
 

package-lock.json

@@ -2606,9 +2606,9 @@
             }
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.56.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.56.0.tgz",
-            "integrity": "sha512-LNKIPA5k8PF1+jAFomGe3qN3bbIgJe/IlpDBwuVjrDKrJhVWywgnJvflMt/zkbVNLFtF1+94SljYQS6e99klnw==",
+            "version": "4.57.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.57.0.tgz",
+            "integrity": "sha512-tPgXB6cDTndIe1ah7u6amCI1T0SsnlOuKgg10Xh3uizJk4e5M1JGaUMk7J4ciuAUcFpbOiNhm2XIjP9ON0dUqA==",
             "cpu": [
                 "arm"
             ],
@@ -2620,9 +2620,9 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.56.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.56.0.tgz",
-            "integrity": "sha512-lfbVUbelYqXlYiU/HApNMJzT1E87UPGvzveGg2h0ktUNlOCxKlWuJ9jtfvs1sKHdwU4fzY7Pl8sAl49/XaEk6Q==",
+            "version": "4.57.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.57.0.tgz",
+            "integrity": "sha512-sa4LyseLLXr1onr97StkU1Nb7fWcg6niokTwEVNOO7awaKaoRObQ54+V/hrF/BP1noMEaaAW6Fg2d/CfLiq3Mg==",
             "cpu": [
                 "arm64"
             ],
@@ -2634,9 +2634,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.56.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.56.0.tgz",
-            "integrity": "sha512-EgxD1ocWfhoD6xSOeEEwyE7tDvwTgZc8Bss7wCWe+uc7wO8G34HHCUH+Q6cHqJubxIAnQzAsyUsClt0yFLu06w==",
+            "version": "4.57.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.57.0.tgz",
+            "integrity": "sha512-/NNIj9A7yLjKdmkx5dC2XQ9DmjIECpGpwHoGmA5E1AhU0fuICSqSWScPhN1yLCkEdkCwJIDu2xIeLPs60MNIVg==",
             "cpu": [
                 "arm64"
             ],
@@ -2648,9 +2648,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.56.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.56.0.tgz",
-            "integrity": "sha512-1vXe1vcMOssb/hOF8iv52A7feWW2xnu+c8BV4t1F//m9QVLTfNVpEdja5ia762j/UEJe2Z1jAmEqZAK42tVW3g==",
+            "version": "4.57.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.57.0.tgz",
+            "integrity": "sha512-xoh8abqgPrPYPr7pTYipqnUi1V3em56JzE/HgDgitTqZBZ3yKCWI+7KUkceM6tNweyUKYru1UMi7FC060RyKwA==",
             "cpu": [
                 "x64"
             ],
@@ -2662,9 +2662,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-arm64": {
-            "version": "4.56.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.56.0.tgz",
-            "integrity": "sha512-bof7fbIlvqsyv/DtaXSck4VYQ9lPtoWNFCB/JY4snlFuJREXfZnm+Ej6yaCHfQvofJDXLDMTVxWscVSuQvVWUQ==",
+            "version": "4.57.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.57.0.tgz",
+            "integrity": "sha512-PCkMh7fNahWSbA0OTUQ2OpYHpjZZr0hPr8lId8twD7a7SeWrvT3xJVyza+dQwXSSq4yEQTMoXgNOfMCsn8584g==",
             "cpu": [
                 "arm64"
             ],
@@ -2676,9 +2676,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-x64": {
-            "version": "4.56.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.56.0.tgz",
-            "integrity": "sha512-KNa6lYHloW+7lTEkYGa37fpvPq+NKG/EHKM8+G/g9WDU7ls4sMqbVRV78J6LdNuVaeeK5WB9/9VAFbKxcbXKYg==",
+            "version": "4.57.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.57.0.tgz",
+            "integrity": "sha512-1j3stGx+qbhXql4OCDZhnK7b01s6rBKNybfsX+TNrEe9JNq4DLi1yGiR1xW+nL+FNVvI4D02PUnl6gJ/2y6WJA==",
             "cpu": [
                 "x64"
             ],
@@ -2690,9 +2690,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.56.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.56.0.tgz",
-            "integrity": "sha512-E8jKK87uOvLrrLN28jnAAAChNq5LeCd2mGgZF+fGF5D507WlG/Noct3lP/QzQ6MrqJ5BCKNwI9ipADB6jyiq2A==",
+            "version": "4.57.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.57.0.tgz",
+            "integrity": "sha512-eyrr5W08Ms9uM0mLcKfM/Uzx7hjhz2bcjv8P2uynfj0yU8GGPdz8iYrBPhiLOZqahoAMB8ZiolRZPbbU2MAi6Q==",
             "cpu": [
                 "arm"
             ],
@@ -2704,9 +2704,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.56.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.56.0.tgz",
-            "integrity": "sha512-jQosa5FMYF5Z6prEpTCCmzCXz6eKr/tCBssSmQGEeozA9tkRUty/5Vx06ibaOP9RCrW1Pvb8yp3gvZhHwTDsJw==",
+            "version": "4.57.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.57.0.tgz",
+            "integrity": "sha512-Xds90ITXJCNyX9pDhqf85MKWUI4lqjiPAipJ8OLp8xqI2Ehk+TCVhF9rvOoN8xTbcafow3QOThkNnrM33uCFQA==",
             "cpu": [
                 "arm"
             ],
@@ -2718,9 +2718,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.56.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.56.0.tgz",
-            "integrity": "sha512-uQVoKkrC1KGEV6udrdVahASIsaF8h7iLG0U0W+Xn14ucFwi6uS539PsAr24IEF9/FoDtzMeeJXJIBo5RkbNWvQ==",
+            "version": "4.57.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.57.0.tgz",
+            "integrity": "sha512-Xws2KA4CLvZmXjy46SQaXSejuKPhwVdaNinldoYfqruZBaJHqVo6hnRa8SDo9z7PBW5x84SH64+izmldCgbezw==",
             "cpu": [
                 "arm64"
             ],
@@ -2732,9 +2732,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.56.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.56.0.tgz",
-            "integrity": "sha512-vLZ1yJKLxhQLFKTs42RwTwa6zkGln+bnXc8ueFGMYmBTLfNu58sl5/eXyxRa2RarTkJbXl8TKPgfS6V5ijNqEA==",
+            "version": "4.57.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.57.0.tgz",
+            "integrity": "sha512-hrKXKbX5FdaRJj7lTMusmvKbhMJSGWJ+w++4KmjiDhpTgNlhYobMvKfDoIWecy4O60K6yA4SnztGuNTQF+Lplw==",
             "cpu": [
                 "arm64"
             ],
@@ -2746,9 +2746,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-loong64-gnu": {
-            "version": "4.56.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.56.0.tgz",
-            "integrity": "sha512-FWfHOCub564kSE3xJQLLIC/hbKqHSVxy8vY75/YHHzWvbJL7aYJkdgwD/xGfUlL5UV2SB7otapLrcCj2xnF1dg==",
+            "version": "4.57.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.57.0.tgz",
+            "integrity": "sha512-6A+nccfSDGKsPm00d3xKcrsBcbqzCTAukjwWK6rbuAnB2bHaL3r9720HBVZ/no7+FhZLz/U3GwwZZEh6tOSI8Q==",
             "cpu": [
                 "loong64"
             ],
@@ -2760,9 +2760,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-loong64-musl": {
-            "version": "4.56.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.56.0.tgz",
-            "integrity": "sha512-z1EkujxIh7nbrKL1lmIpqFTc/sr0u8Uk0zK/qIEFldbt6EDKWFk/pxFq3gYj4Bjn3aa9eEhYRlL3H8ZbPT1xvA==",
+            "version": "4.57.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.57.0.tgz",
+            "integrity": "sha512-4P1VyYUe6XAJtQH1Hh99THxr0GKMMwIXsRNOceLrJnaHTDgk1FTcTimDgneRJPvB3LqDQxUmroBclQ1S0cIJwQ==",
             "cpu": [
                 "loong64"
             ],
@@ -2774,9 +2774,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-ppc64-gnu": {
-            "version": "4.56.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.56.0.tgz",
-            "integrity": "sha512-iNFTluqgdoQC7AIE8Q34R3AuPrJGJirj5wMUErxj22deOcY7XwZRaqYmB6ZKFHoVGqRcRd0mqO+845jAibKCkw==",
+            "version": "4.57.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.57.0.tgz",
+            "integrity": "sha512-8Vv6pLuIZCMcgXre6c3nOPhE0gjz1+nZP6T+hwWjr7sVH8k0jRkH+XnfjjOTglyMBdSKBPPz54/y1gToSKwrSQ==",
             "cpu": [
                 "ppc64"
             ],
@@ -2788,9 +2788,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-ppc64-musl": {
-            "version": "4.56.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.56.0.tgz",
-            "integrity": "sha512-MtMeFVlD2LIKjp2sE2xM2slq3Zxf9zwVuw0jemsxvh1QOpHSsSzfNOTH9uYW9i1MXFxUSMmLpeVeUzoNOKBaWg==",
+            "version": "4.57.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.57.0.tgz",
+            "integrity": "sha512-r1te1M0Sm2TBVD/RxBPC6RZVwNqUTwJTA7w+C/IW5v9Ssu6xmxWEi+iJQlpBhtUiT1raJ5b48pI8tBvEjEFnFA==",
             "cpu": [
                 "ppc64"
             ],
@@ -2802,9 +2802,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.56.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.56.0.tgz",
-            "integrity": "sha512-in+v6wiHdzzVhYKXIk5U74dEZHdKN9KH0Q4ANHOTvyXPG41bajYRsy7a8TPKbYPl34hU7PP7hMVHRvv/5aCSew==",
+            "version": "4.57.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.57.0.tgz",
+            "integrity": "sha512-say0uMU/RaPm3CDQLxUUTF2oNWL8ysvHkAjcCzV2znxBr23kFfaxocS9qJm+NdkRhF8wtdEEAJuYcLPhSPbjuQ==",
             "cpu": [
                 "riscv64"
             ],
@@ -2816,9 +2816,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-musl": {
-            "version": "4.56.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.56.0.tgz",
-            "integrity": "sha512-yni2raKHB8m9NQpI9fPVwN754mn6dHQSbDTwxdr9SE0ks38DTjLMMBjrwvB5+mXrX+C0npX0CVeCUcvvvD8CNQ==",
+            "version": "4.57.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.57.0.tgz",
+            "integrity": "sha512-/MU7/HizQGsnBREtRpcSbSV1zfkoxSTR7wLsRmBPQ8FwUj5sykrP1MyJTvsxP5KBq9SyE6kH8UQQQwa0ASeoQQ==",
             "cpu": [
                 "riscv64"
             ],
@@ -2830,9 +2830,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.56.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.56.0.tgz",
-            "integrity": "sha512-zhLLJx9nQPu7wezbxt2ut+CI4YlXi68ndEve16tPc/iwoylWS9B3FxpLS2PkmfYgDQtosah07Mj9E0khc3Y+vQ==",
+            "version": "4.57.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.57.0.tgz",
+            "integrity": "sha512-Q9eh+gUGILIHEaJf66aF6a414jQbDnn29zeu0eX3dHMuysnhTvsUvZTCAyZ6tJhUjnvzBKE4FtuaYxutxRZpOg==",
             "cpu": [
                 "s390x"
             ],
@@ -2844,9 +2844,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.56.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.56.0.tgz",
-            "integrity": "sha512-MVC6UDp16ZSH7x4rtuJPAEoE1RwS8N4oK9DLHy3FTEdFoUTCFVzMfJl/BVJ330C+hx8FfprA5Wqx4FhZXkj2Kw==",
+            "version": "4.57.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.57.0.tgz",
+            "integrity": "sha512-OR5p5yG5OKSxHReWmwvM0P+VTPMwoBS45PXTMYaskKQqybkS3Kmugq1W+YbNWArF8/s7jQScgzXUhArzEQ7x0A==",
             "cpu": [
                 "x64"
             ],
@@ -2858,9 +2858,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.56.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.56.0.tgz",
-            "integrity": "sha512-ZhGH1eA4Qv0lxaV00azCIS1ChedK0V32952Md3FtnxSqZTBTd6tgil4nZT5cU8B+SIw3PFYkvyR4FKo2oyZIHA==",
+            "version": "4.57.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.57.0.tgz",
+            "integrity": "sha512-XeatKzo4lHDsVEbm1XDHZlhYZZSQYym6dg2X/Ko0kSFgio+KXLsxwJQprnR48GvdIKDOpqWqssC3iBCjoMcMpw==",
             "cpu": [
                 "x64"
             ],
@@ -2872,9 +2872,9 @@
             ]
         },
         "node_modules/@rollup/rollup-openbsd-x64": {
-            "version": "4.56.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.56.0.tgz",
-            "integrity": "sha512-O16XcmyDeFI9879pEcmtWvD/2nyxR9mF7Gs44lf1vGGx8Vg2DRNx11aVXBEqOQhWb92WN4z7fW/q4+2NYzCbBA==",
+            "version": "4.57.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.57.0.tgz",
+            "integrity": "sha512-Lu71y78F5qOfYmubYLHPcJm74GZLU6UJ4THkf/a1K7Tz2ycwC2VUbsqbJAXaR6Bx70SRdlVrt2+n5l7F0agTUw==",
             "cpu": [
                 "x64"
             ],
@@ -2886,9 +2886,9 @@
             ]
         },
         "node_modules/@rollup/rollup-openharmony-arm64": {
-            "version": "4.56.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.56.0.tgz",
-            "integrity": "sha512-LhN/Reh+7F3RCgQIRbgw8ZMwUwyqJM+8pXNT6IIJAqm2IdKkzpCh/V9EdgOMBKuebIrzswqy4ATlrDgiOwbRcQ==",
+            "version": "4.57.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.57.0.tgz",
+            "integrity": "sha512-v5xwKDWcu7qhAEcsUubiav7r+48Uk/ENWdr82MBZZRIm7zThSxCIVDfb3ZeRRq9yqk+oIzMdDo6fCcA5DHfMyA==",
             "cpu": [
                 "arm64"
             ],
@@ -2900,9 +2900,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.56.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.56.0.tgz",
-            "integrity": "sha512-kbFsOObXp3LBULg1d3JIUQMa9Kv4UitDmpS+k0tinPBz3watcUiV2/LUDMMucA6pZO3WGE27P7DsfaN54l9ing==",
+            "version": "4.57.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.57.0.tgz",
+            "integrity": "sha512-XnaaaSMGSI6Wk8F4KK3QP7GfuuhjGchElsVerCplUuxRIzdvZ7hRBpLR0omCmw+kI2RFJB80nenhOoGXlJ5TfQ==",
             "cpu": [
                 "arm64"
             ],
@@ -2914,9 +2914,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.56.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.56.0.tgz",
-            "integrity": "sha512-vSSgny54D6P4vf2izbtFm/TcWYedw7f8eBrOiGGecyHyQB9q4Kqentjaj8hToe+995nob/Wv48pDqL5a62EWtg==",
+            "version": "4.57.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.57.0.tgz",
+            "integrity": "sha512-3K1lP+3BXY4t4VihLw5MEg6IZD3ojSYzqzBG571W3kNQe4G4CcFpSUQVgurYgib5d+YaCjeFow8QivWp8vuSvA==",
             "cpu": [
                 "ia32"
             ],
@@ -2928,9 +2928,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-gnu": {
-            "version": "4.56.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.56.0.tgz",
-            "integrity": "sha512-FeCnkPCTHQJFbiGG49KjV5YGW/8b9rrXAM2Mz2kiIoktq2qsJxRD5giEMEOD2lPdgs72upzefaUvS+nc8E3UzQ==",
+            "version": "4.57.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.57.0.tgz",
+            "integrity": "sha512-MDk610P/vJGc5L5ImE4k5s+GZT3en0KoK1MKPXCRgzmksAMk79j4h3k1IerxTNqwDLxsGxStEZVBqG0gIqZqoA==",
             "cpu": [
                 "x64"
             ],
@@ -2942,9 +2942,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.56.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.56.0.tgz",
-            "integrity": "sha512-H8AE9Ur/t0+1VXujj90w0HrSOuv0Nq9r1vSZF2t5km20NTfosQsGGUXDaKdQZzwuLts7IyL1fYT4hM95TI9c4g==",
+            "version": "4.57.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.57.0.tgz",
+            "integrity": "sha512-Zv7v6q6aV+VslnpwzqKAmrk5JdVkLUzok2208ZXGipjb+msxBr/fJPZyeEXiFgH7k62Ak0SLIfxQRZQvTuf7rQ==",
             "cpu": [
                 "x64"
             ],
@@ -3834,9 +3834,9 @@
             }
         },
         "node_modules/alpinejs": {
-            "version": "3.15.4",
-            "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.15.4.tgz",
-            "integrity": "sha512-lDpOdoVo0bhFjgl310k1qw3kbpUYwM/v0WByvAchsO93bl3o1rrgr0P/ssx3CimwEtNfXbmwKbtHbqTRCTTH9g==",
+            "version": "3.15.5",
+            "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.15.5.tgz",
+            "integrity": "sha512-l1R4em/uCUr7eJimcO/b0L1+H2tVcB1Y7cQ3d+pzwVnv0zWs7gw4MhwdsLjfLccWV2iH0ahlfaJWitNRFOZdvQ==",
             "license": "MIT",
             "dependencies": {
                 "@vue/reactivity": "~3.1.1"
@@ -4019,9 +4019,9 @@
             }
         },
         "node_modules/axios": {
-            "version": "1.13.3",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.3.tgz",
-            "integrity": "sha512-ERT8kdX7DZjtUm7IitEyV7InTHAF42iJuMArIiDIV5YtPanJkgw4hw5Dyg9fh0mihdWNn1GKaeIWErfe56UQ1g==",
+            "version": "1.13.4",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.4.tgz",
+            "integrity": "sha512-1wVkUaAO6WyaYtCkcYCOx12ZgpGf9Zif+qXa4n+oYzK558YryKqiL6UWwd5DqiH3VRW0GYhTZQ/vlgJrCoNQlg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -5191,21 +5191,21 @@
             }
         },
         "node_modules/css-loader": {
-            "version": "7.1.2",
-            "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-7.1.2.tgz",
-            "integrity": "sha512-6WvYYn7l/XEGN8Xu2vWFt9nVzrCn39vKyTEFf/ExEyoksJjjSZV/0/35XPlMbpnr6VGhZIUg5yJrL8tGfes/FA==",
+            "version": "7.1.3",
+            "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-7.1.3.tgz",
+            "integrity": "sha512-frbERmjT0UC5lMheWpJmMilnt9GEhbZJN/heUb7/zaJYeIzj5St9HvDcfshzzOqbsS+rYpMk++2SD3vGETDSyA==",
             "dev": true,
             "license": "MIT",
             "peer": true,
             "dependencies": {
                 "icss-utils": "^5.1.0",
-                "postcss": "^8.4.33",
+                "postcss": "^8.4.40",
                 "postcss-modules-extract-imports": "^3.1.0",
                 "postcss-modules-local-by-default": "^4.0.5",
                 "postcss-modules-scope": "^3.2.0",
                 "postcss-modules-values": "^4.0.0",
                 "postcss-value-parser": "^4.2.0",
-                "semver": "^7.5.4"
+                "semver": "^7.6.3"
             },
             "engines": {
                 "node": ">= 18.12.0"
@@ -5769,9 +5769,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.278",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.278.tgz",
-            "integrity": "sha512-dQ0tM1svDRQOwxnXxm+twlGTjr9Upvt8UFWAgmLsxEzFQxhbti4VwxmMjsDxVC51Zo84swW7FVCXEV+VAkhuPw==",
+            "version": "1.5.279",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.279.tgz",
+            "integrity": "sha512-0bblUU5UNdOt5G7XqGiJtpZMONma6WAfq9vsFmtn9x1+joAObr6x1chfqyxFSDCAFwFhCQDrqeAr6MYdpwJ9Hg==",
             "dev": true,
             "license": "ISC"
         },
@@ -10089,9 +10089,9 @@
             }
         },
         "node_modules/rollup": {
-            "version": "4.56.0",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.56.0.tgz",
-            "integrity": "sha512-9FwVqlgUHzbXtDg9RCMgodF3Ua4Na6Gau+Sdt9vyCN4RhHfVKX2DCHy3BjMLTDd47ITDhYAnTwGulWTblJSDLg==",
+            "version": "4.57.0",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.57.0.tgz",
+            "integrity": "sha512-e5lPJi/aui4TO1LpAXIRLySmwXSE8k3b9zoGfd42p67wzxog4WHjiZF3M2uheQih4DGyc25QEV4yRBbpueNiUA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -10105,31 +10105,31 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.56.0",
-                "@rollup/rollup-android-arm64": "4.56.0",
-                "@rollup/rollup-darwin-arm64": "4.56.0",
-                "@rollup/rollup-darwin-x64": "4.56.0",
-                "@rollup/rollup-freebsd-arm64": "4.56.0",
-                "@rollup/rollup-freebsd-x64": "4.56.0",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.56.0",
-                "@rollup/rollup-linux-arm-musleabihf": "4.56.0",
-                "@rollup/rollup-linux-arm64-gnu": "4.56.0",
-                "@rollup/rollup-linux-arm64-musl": "4.56.0",
-                "@rollup/rollup-linux-loong64-gnu": "4.56.0",
-                "@rollup/rollup-linux-loong64-musl": "4.56.0",
-                "@rollup/rollup-linux-ppc64-gnu": "4.56.0",
-                "@rollup/rollup-linux-ppc64-musl": "4.56.0",
-                "@rollup/rollup-linux-riscv64-gnu": "4.56.0",
-                "@rollup/rollup-linux-riscv64-musl": "4.56.0",
-                "@rollup/rollup-linux-s390x-gnu": "4.56.0",
-                "@rollup/rollup-linux-x64-gnu": "4.56.0",
-                "@rollup/rollup-linux-x64-musl": "4.56.0",
-                "@rollup/rollup-openbsd-x64": "4.56.0",
-                "@rollup/rollup-openharmony-arm64": "4.56.0",
-                "@rollup/rollup-win32-arm64-msvc": "4.56.0",
-                "@rollup/rollup-win32-ia32-msvc": "4.56.0",
-                "@rollup/rollup-win32-x64-gnu": "4.56.0",
-                "@rollup/rollup-win32-x64-msvc": "4.56.0",
+                "@rollup/rollup-android-arm-eabi": "4.57.0",
+                "@rollup/rollup-android-arm64": "4.57.0",
+                "@rollup/rollup-darwin-arm64": "4.57.0",
+                "@rollup/rollup-darwin-x64": "4.57.0",
+                "@rollup/rollup-freebsd-arm64": "4.57.0",
+                "@rollup/rollup-freebsd-x64": "4.57.0",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.57.0",
+                "@rollup/rollup-linux-arm-musleabihf": "4.57.0",
+                "@rollup/rollup-linux-arm64-gnu": "4.57.0",
+                "@rollup/rollup-linux-arm64-musl": "4.57.0",
+                "@rollup/rollup-linux-loong64-gnu": "4.57.0",
+                "@rollup/rollup-linux-loong64-musl": "4.57.0",
+                "@rollup/rollup-linux-ppc64-gnu": "4.57.0",
+                "@rollup/rollup-linux-ppc64-musl": "4.57.0",
+                "@rollup/rollup-linux-riscv64-gnu": "4.57.0",
+                "@rollup/rollup-linux-riscv64-musl": "4.57.0",
+                "@rollup/rollup-linux-s390x-gnu": "4.57.0",
+                "@rollup/rollup-linux-x64-gnu": "4.57.0",
+                "@rollup/rollup-linux-x64-musl": "4.57.0",
+                "@rollup/rollup-openbsd-x64": "4.57.0",
+                "@rollup/rollup-openharmony-arm64": "4.57.0",
+                "@rollup/rollup-win32-arm64-msvc": "4.57.0",
+                "@rollup/rollup-win32-ia32-msvc": "4.57.0",
+                "@rollup/rollup-win32-x64-gnu": "4.57.0",
+                "@rollup/rollup-win32-x64-msvc": "4.57.0",
                 "fsevents": "~2.3.2"
             }
         },

resources/assets/v1/src/components/transactions/PiggyBank.vue

@@ -79,7 +79,7 @@ export default {
           if (res.data.hasOwnProperty(key) && /^0$|^[1-9]\d*$/.test(key) && key <= 4294967294) {
             // add to temp list
             let currentPiggy = res.data[key];
-            if (currentPiggy.objectGroup) {
+            if (null !== currentPiggy.object_group_id) {
               let groupOrder = currentPiggy.object_group_order;
               if (!tempList[groupOrder]) {
                 tempList[groupOrder] = {

resources/lang/en_US/api.php

@@ -22,7 +22,4 @@
 
 declare(strict_types=1);
 
-
-
-return [
-];
+return [];

resources/lang/en_US/auth.php

@@ -20,11 +20,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-
-
 declare(strict_types=1);
 
-return [
-    'failed'   => 'These credentials do not match our records.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
-];
+return ['failed'   => 'These credentials do not match our records.', 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.'];

resources/lang/en_US/breadcrumbs.php

@@ -20,8 +20,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-
-
 declare(strict_types=1);
 
 return [
@@ -56,8 +54,6 @@ return [
     'transfer_list'          => 'Transfers',
     'transfers_list'         => 'Transfers',
 
-
-
     'reconciliation_list'    => 'Reconciliations',
     'create_withdrawal'      => 'Create new withdrawal',
     'create_deposit'         => 'Create new deposit',
@@ -93,5 +89,4 @@ return [
     // exchange rates
     'exchange_rates_index'   => 'Exchange rates',
     'exchange_rates_rates'   => 'Exchange rates between :from and :to (and the other way around)',
-
 ];

resources/lang/en_US/components.php

@@ -20,9 +20,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-
-
 declare(strict_types=1);
 
-return [
-];
+return [];

resources/lang/en_US/config.php

@@ -20,8 +20,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-
-
 declare(strict_types=1);
 
 return [
@@ -41,8 +39,6 @@ return [
     // 'month_and_day_no_year'   => '%B %e',
     'month_and_day_no_year_js' => 'MMMM Do',
 
-
-
     // 'date_time'               => '%B %e, %Y, @ %T',
     'date_time_js'             => 'MMMM Do, YYYY, @ HH:mm:ss',
     'date_time_fns'            => 'MMMM do, yyyy @ HH:mm:ss',

resources/lang/en_US/demo.php

@@ -20,8 +20,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-
-
 declare(strict_types=1);
 
 return [

resources/lang/en_US/email.php

@@ -20,181 +20,172 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-
-
 declare(strict_types=1);
 
 return [
     // common items
-    'greeting'                                    => 'Hi there,',
-    'closing'                                     => 'Beep boop,',
-    'signature'                                   => 'The Firefly III Mail Robot',
-    'footer_ps'                                   => 'PS: This message was sent because a request from IP :ipAddress triggered it.',
+    'greeting'                                   => 'Hi there,',
+    'closing'                                    => 'Beep boop,',
+    'signature'                                  => 'The Firefly III Mail Robot',
+    'footer_ps'                                  => 'PS: This message was sent because a request from IP :ipAddress triggered it.',
 
     // admin test
-    'admin_test_subject'                          => 'A test message from your Firefly III installation',
-    'admin_test_body'                             => 'This is a test message from your Firefly III instance. It was sent to :email.',
-    'admin_test_message'                          => 'This is a test message from your Firefly III instance over channel ":channel".',
-
-
+    'admin_test_subject'                         => 'A test message from your Firefly III installation',
+    'admin_test_body'                            => 'This is a test message from your Firefly III instance. It was sent to :email.',
+    'admin_test_message'                         => 'This is a test message from your Firefly III instance over channel ":channel".',
 
     // invite
-    'invitation_created_subject'                  => 'An invitation has been created',
-    'invitation_created_body'                     => 'Admin user ":email" created a user invitation which can be used by whoever is behind email address ":invitee". The invite will be valid for 48hrs.',
-    'invite_user_subject'                         => 'You\'ve been invited to create a Firefly III account.',
-    'invitation_introduction'                     => 'You\'ve been invited to create a Firefly III account on **:host**. Firefly III  is a personal, self-hosted, private personal finance manager. All the cool kids are using it.',
-    'invitation_invited_by'                       => 'You\'ve been invited by ":admin" and this invitation was sent to ":invitee". That\'s you, right?',
-    'invitation_url'                              => 'The invitation is valid for 48 hours and can be redeemed by surfing to [Firefly III](:url). Enjoy!',
+    'invitation_created_subject'                 => 'An invitation has been created',
+    'invitation_created_body'                    => 'Admin user ":email" created a user invitation which can be used by whoever is behind email address ":invitee". The invite will be valid for 48hrs.',
+    'invite_user_subject'                        => 'You\'ve been invited to create a Firefly III account.',
+    'invitation_introduction'                    => 'You\'ve been invited to create a Firefly III account on **:host**. Firefly III  is a personal, self-hosted, private personal finance manager. All the cool kids are using it.',
+    'invitation_invited_by'                      => 'You\'ve been invited by ":admin" and this invitation was sent to ":invitee". That\'s you, right?',
+    'invitation_url'                             => 'The invitation is valid for 48 hours and can be redeemed by surfing to [Firefly III](:url). Enjoy!',
 
     // new IP
-    'login_from_new_ip'                           => 'New login on Firefly III',
-    'slack_login_from_new_ip'                     => 'New Firefly III login from IP :ip (:host)',
-    'new_ip_body'                                 => 'Firefly III detected a new login on your account from an unknown IP address. If you never logged in from the IP address below, or it has been more than six months ago, Firefly III will warn you.',
-    'new_ip_warning'                              => 'If you recognize this IP address or the login, you can ignore this message. If you didn\'t login, of if you have no idea what this is about, verify your password security, change it, and log out all other sessions. To do this, go to your profile page. Of course you have 2FA enabled already, right? Stay safe!',
-    'ip_address'                                  => 'IP address',
-    'host_name'                                   => 'Host',
-    'date_time'                                   => 'Date + time',
-    'user_agent'                                  => 'Browser',
+    'login_from_new_ip'                          => 'New login on Firefly III',
+    'slack_login_from_new_ip'                    => 'New Firefly III login from IP :ip (:host)',
+    'new_ip_body'                                => 'Firefly III detected a new login on your account from an unknown IP address. If you never logged in from the IP address below, or it has been more than six months ago, Firefly III will warn you.',
+    'new_ip_warning'                             => 'If you recognize this IP address or the login, you can ignore this message. If you didn\'t login, of if you have no idea what this is about, verify your password security, change it, and log out all other sessions. To do this, go to your profile page. Of course you have 2FA enabled already, right? Stay safe!',
+    'ip_address'                                 => 'IP address',
+    'host_name'                                  => 'Host',
+    'date_time'                                  => 'Date + time',
+    'user_agent'                                 => 'Browser',
 
     // access token created
-    'access_token_created_subject'                => 'A new access token was created',
-    'access_token_created_body'                   => 'Somebody (hopefully you) just created a new Firefly III API Access Token for your user account.',
-    'access_token_created_explanation'            => 'With this token, they can access **all** of your financial records through the Firefly III API.',
-    'access_token_created_revoke'                 => 'If this wasn\'t you, please revoke this token as soon as possible at :url',
+    'access_token_created_subject'               => 'A new access token was created',
+    'access_token_created_body'                  => 'Somebody (hopefully you) just created a new Firefly III API Access Token for your user account.',
+    'access_token_created_explanation'           => 'With this token, they can access **all** of your financial records through the Firefly III API.',
+    'access_token_created_revoke'                => 'If this wasn\'t you, please revoke this token as soon as possible at :url',
 
     // unknown user login attempt
-    'unknown_user_subject'                        => 'An unknown user tried to log in',
-    'unknown_user_body'                           => 'An unknown user (:ip) tried to log in to Firefly III. The email address they used was ":address".',
-    'unknown_user_message'                        => 'The email address they (:ip) used was ":address".',
+    'unknown_user_subject'                       => 'An unknown user tried to log in',
+    'unknown_user_body'                          => 'An unknown user (:ip) tried to log in to Firefly III. The email address they used was ":address".',
+    'unknown_user_message'                       => 'The email address they (:ip) used was ":address".',
 
     // known user login attempt
-    'failed_login_subject'                        => 'Firefly III detected a failed login attempt',
-    'failed_login_body'                           => 'Firefly III detected that somebody (you?) failed to login with your account ":email". Please verify that this was you.',
-    'failed_login_message'                        => 'A failed login attempt (:ip) on your Firefly III account ":email" was detected.',
-    'failed_login_warning'                        => 'If you recognize this IP address or the login attempt, you can ignore this message. If you didn\'t try to login, of if you have no idea what this is about, verify your password security, change it, and log out all other sessions. To do this, go to your profile page. Of course you have 2FA enabled already, right? Stay safe!',
+    'failed_login_subject'                       => 'Firefly III detected a failed login attempt',
+    'failed_login_body'                          => 'Firefly III detected that somebody (you?) failed to login with your account ":email". Please verify that this was you.',
+    'failed_login_message'                       => 'A failed login attempt (:ip) on your Firefly III account ":email" was detected.',
+    'failed_login_warning'                       => 'If you recognize this IP address or the login attempt, you can ignore this message. If you didn\'t try to login, of if you have no idea what this is about, verify your password security, change it, and log out all other sessions. To do this, go to your profile page. Of course you have 2FA enabled already, right? Stay safe!',
 
     // registered
-    'registered_subject'                          => 'Welcome to Firefly III!',
-    'registered_subject_admin'                    => 'A new user has registered',
-    'admin_new_user_registered'                   => 'A new user has registered. User **:email** was given user ID #:id.',
-    'registered_welcome'                          => 'Welcome to [Firefly III](:address). Your registration has made it, and this email is here to confirm it. Yay!',
-    'registered_pw'                               => 'If you have forgotten your password already, please reset it using [the password reset tool](:address/password/reset).',
-    'registered_help'                             => 'There is a help-icon in the top right corner of each page. If you need help, click it!',
-    'registered_closing'                          => 'Enjoy!',
-    'registered_firefly_iii_link'                 => 'Firefly III:',
-    'registered_pw_reset_link'                    => 'Password reset:',
-    'registered_doc_link'                         => 'Documentation:',
-
-
+    'registered_subject'                         => 'Welcome to Firefly III!',
+    'registered_subject_admin'                   => 'A new user has registered',
+    'admin_new_user_registered'                  => 'A new user has registered. User **:email** was given user ID #:id.',
+    'registered_welcome'                         => 'Welcome to [Firefly III](:address). Your registration has made it, and this email is here to confirm it. Yay!',
+    'registered_pw'                              => 'If you have forgotten your password already, please reset it using [the password reset tool](:address/password/reset).',
+    'registered_help'                            => 'There is a help-icon in the top right corner of each page. If you need help, click it!',
+    'registered_closing'                         => 'Enjoy!',
+    'registered_firefly_iii_link'                => 'Firefly III:',
+    'registered_pw_reset_link'                   => 'Password reset:',
+    'registered_doc_link'                        => 'Documentation:',
 
     // new version
-    'new_version_email_subject'                   => 'A new Firefly III version is available',
+    'new_version_email_subject'                  => 'A new Firefly III version is available',
 
     // email change
-    'email_change_subject'                        => 'Your Firefly III email address has changed',
-    'email_change_body_to_new'                    => 'You or somebody with access to your Firefly III account has changed your email address. If you did not expect this message, please ignore and delete it.',
-    'email_change_body_to_old'                    => 'You or somebody with access to your Firefly III account has changed your email address. If you did not expect this to happen, you **must** follow the "undo"-link below to protect your account!',
-    'email_change_ignore'                         => 'If you initiated this change, you may safely ignore this message.',
-    'email_change_old'                            => 'The old email address was: :email',
-    'email_change_old_strong'                     => 'The old email address was: **:email**',
-    'email_change_new'                            => 'The new email address is: :email',
-    'email_change_new_strong'                     => 'The new email address is: **:email**',
-    'email_change_instructions'                   => 'You cannot use Firefly III until you confirm this change. Please follow the link below to do so.',
-    'email_change_undo_link'                      => 'To undo the change, follow this link:',
+    'email_change_subject'                       => 'Your Firefly III email address has changed',
+    'email_change_body_to_new'                   => 'You or somebody with access to your Firefly III account has changed your email address. If you did not expect this message, please ignore and delete it.',
+    'email_change_body_to_old'                   => 'You or somebody with access to your Firefly III account has changed your email address. If you did not expect this to happen, you **must** follow the "undo"-link below to protect your account!',
+    'email_change_ignore'                        => 'If you initiated this change, you may safely ignore this message.',
+    'email_change_old'                           => 'The old email address was: :email',
+    'email_change_old_strong'                    => 'The old email address was: **:email**',
+    'email_change_new'                           => 'The new email address is: :email',
+    'email_change_new_strong'                    => 'The new email address is: **:email**',
+    'email_change_instructions'                  => 'You cannot use Firefly III until you confirm this change. Please follow the link below to do so.',
+    'email_change_undo_link'                     => 'To undo the change, follow this link:',
 
     // OAuth token created
-    'oauth_created_subject'                       => 'A new OAuth client has been created',
-    'oauth_created_body'                          => 'Somebody (hopefully you) just created a new Firefly III API OAuth Client for your user account. It\'s labeled ":name" and has callback URL `:url`.',
-    'oauth_created_explanation'                   => 'With this client, they can access **all** of your financial records through the Firefly III API.',
-    'oauth_created_undo'                          => 'If this wasn\'t you, please revoke this client as soon as possible at `:url`',
+    'oauth_created_subject'                      => 'A new OAuth client has been created',
+    'oauth_created_body'                         => 'Somebody (hopefully you) just created a new Firefly III API OAuth Client for your user account. It\'s labeled ":name" and has callback URL `:url`.',
+    'oauth_created_explanation'                  => 'With this client, they can access **all** of your financial records through the Firefly III API.',
+    'oauth_created_undo'                         => 'If this wasn\'t you, please revoke this client as soon as possible at `:url`',
 
     // reset password
-    'reset_pw_subject'                            => 'Your password reset request',
-    'reset_pw_message'                            => 'You have received password reset instructions in your email. If this was you, please follow the instructions.',
-    'reset_pw_instructions'                       => 'Somebody tried to reset your password. If it was you, please follow the link below to do so.',
-    'reset_pw_warning'                            => '**PLEASE** verify that the link actually goes to the Firefly III you expect it to go!',
+    'reset_pw_subject'                           => 'Your password reset request',
+    'reset_pw_message'                           => 'You have received password reset instructions in your email. If this was you, please follow the instructions.',
+    'reset_pw_instructions'                      => 'Somebody tried to reset your password. If it was you, please follow the link below to do so.',
+    'reset_pw_warning'                           => '**PLEASE** verify that the link actually goes to the Firefly III you expect it to go!',
 
     // error
-    'error_subject'                               => 'Caught an error in Firefly III',
-    'error_intro'                                 => 'Firefly III v:version ran into an error: <span style="font-family: monospace;">:errorMessage</span>.',
-    'error_type'                                  => 'The error was of type ":class".',
-    'error_timestamp'                             => 'The error occurred on/at: :time.',
-    'error_location'                              => 'This error occurred in file "<span style="font-family: monospace;">:file</span>" on line :line with code :code.',
-    'error_user'                                  => 'The error was encountered by user #:id, <a href="mailto::email">:email</a>.',
-    'error_no_user'                               => 'There was no user logged in for this error or no user was detected.',
-    'error_ip'                                    => 'The IP address related to this error is: :ip',
-    'error_url'                                   => 'URL is: :url',
-    'error_user_agent'                            => 'User agent: :userAgent',
-    'error_stacktrace'                            => 'The full stacktrace is below. If you think this is a bug in Firefly III, you can forward this message to <a href="mailto:james@firefly-iii.org?subject=I%20found%20a%20bug!">james@firefly-iii.org</a>. This can help fix the bug you just encountered.',
-    'error_github_html'                           => 'If you prefer, you can also open a new issue on <a href="https://github.com/firefly-iii/firefly-iii/issues">GitHub</a>.',
-    'error_github_text'                           => 'If you prefer, you can also open a new issue on https://github.com/firefly-iii/firefly-iii/issues.',
-    'error_stacktrace_below'                      => 'The full stacktrace is below:',
-    'error_headers'                               => 'The following headers may also be relevant:',
-    'error_post'                                  => 'This was submitted by the user:',
-
-
+    'error_subject'                              => 'Caught an error in Firefly III',
+    'error_intro'                                => 'Firefly III v:version ran into an error: <span style="font-family: monospace;">:errorMessage</span>.',
+    'error_type'                                 => 'The error was of type ":class".',
+    'error_timestamp'                            => 'The error occurred on/at: :time.',
+    'error_location'                             => 'This error occurred in file "<span style="font-family: monospace;">:file</span>" on line :line with code :code.',
+    'error_user'                                 => 'The error was encountered by user #:id, <a href="mailto::email">:email</a>.',
+    'error_no_user'                              => 'There was no user logged in for this error or no user was detected.',
+    'error_ip'                                   => 'The IP address related to this error is: :ip',
+    'error_url'                                  => 'URL is: :url',
+    'error_user_agent'                           => 'User agent: :userAgent',
+    'error_stacktrace'                           => 'The full stacktrace is below. If you think this is a bug in Firefly III, you can forward this message to <a href="mailto:james@firefly-iii.org?subject=I%20found%20a%20bug!">james@firefly-iii.org</a>. This can help fix the bug you just encountered.',
+    'error_github_html'                          => 'If you prefer, you can also open a new issue on <a href="https://github.com/firefly-iii/firefly-iii/issues">GitHub</a>.',
+    'error_github_text'                          => 'If you prefer, you can also open a new issue on https://github.com/firefly-iii/firefly-iii/issues.',
+    'error_stacktrace_below'                     => 'The full stacktrace is below:',
+    'error_headers'                              => 'The following headers may also be relevant:',
+    'error_post'                                 => 'This was submitted by the user:',
 
     // report new journals
-    'new_journals_subject'                        => 'Firefly III has created a new transaction|Firefly III has created :count new transactions',
-    'new_journals_header'                         => 'Firefly III has created a transaction for you. You can find it in your Firefly III installation:|Firefly III has created :count transactions for you. You can find them in your Firefly III installation:',
+    'new_journals_subject'                       => 'Firefly III has created a new transaction|Firefly III has created :count new transactions',
+    'new_journals_header'                        => 'Firefly III has created a transaction for you. You can find it in your Firefly III installation:|Firefly III has created :count transactions for you. You can find them in your Firefly III installation:',
 
     // subscription is overdue.
-    'subscriptions_overdue_subject_multi'               => 'You have :count subscriptions that are overdue to be paid',
-    'subscriptions_overdue_subject_single'               => 'You have a subscription that is overdue to be paid',
+    'subscriptions_overdue_subject_multi'        => 'You have :count subscriptions that are overdue to be paid',
+    'subscriptions_overdue_subject_single'       => 'You have a subscription that is overdue to be paid',
     'subscriptions_overdue_warning_intro_single' => 'You have one subscription that is overdue to be paid. At the following date(s) a payment was expected, but it has not yet arrived.',
-    'subscriptions_overdue_warning_intro_multi' => 'You have :count subscription(s) that are overdue to be paid. At the following date(s) a payment was expected, but it has not yet arrived.',
+    'subscriptions_overdue_warning_intro_multi'  => 'You have :count subscription(s) that are overdue to be paid. At the following date(s) a payment was expected, but it has not yet arrived.',
     'subscriptions_overdue_please_action_single' => 'Perhaps you have simply not linked a transaction to this subscription. In that case, please do so. You will NOT get another warning about this overdue subscription. A new warning will be sent out for the NEXT due payment.',
-    'subscriptions_overdue_please_action_multi' => 'Perhaps you have simply not linked a transaction to these subscriptions. In that case, please do so. You will NOT get another warning about these overdue subscriptions. A new warning will be sent out for the NEXT due payments.',
-    'subscriptions_overdue_outro' => 'If you believe this message is wrong, please contact the Firefly III developer. Thank you for using Firefly III.',
+    'subscriptions_overdue_please_action_multi'  => 'Perhaps you have simply not linked a transaction to these subscriptions. In that case, please do so. You will NOT get another warning about these overdue subscriptions. A new warning will be sent out for the NEXT due payments.',
+    'subscriptions_overdue_outro'                => 'If you believe this message is wrong, please contact the Firefly III developer. Thank you for using Firefly III.',
     // bill warning
-    'bill_warning_subject_end_date'               => 'Your subscription ":name" is due to end in :diff days',
-    'bill_warning_subject_now_end_date'           => 'Your subscription ":name" is due to end TODAY',
-    'bill_warning_subject_extension_date'         => 'Your subscription ":name" is due to be extended or cancelled in :diff days',
-    'bill_warning_subject_now_extension_date'     => 'Your subscription ":name" is due to be extended or cancelled TODAY',
-    'bill_warning_end_date'                       => 'Your subscription **":name"** is due to end on :date. This moment will pass in about **:diff days**.',
-    'bill_warning_extension_date'                 => 'Your subscription **":name"** is due to be extended or cancelled on :date. This moment will pass in about **:diff days**.',
-    'bill_warning_end_date_zero'                  => 'Your subscription **":name"** is due to end on :date. This moment will pass **TODAY!**',
-    'bill_warning_extension_date_zero'            => 'Your subscription **":name"** is due to be extended or cancelled on :date. This moment will pass **TODAY!**',
-    'bill_warning_please_action'                  => 'Please take the appropriate action.',
+    'bill_warning_subject_end_date'              => 'Your subscription ":name" is due to end in :diff days',
+    'bill_warning_subject_now_end_date'          => 'Your subscription ":name" is due to end TODAY',
+    'bill_warning_subject_extension_date'        => 'Your subscription ":name" is due to be extended or cancelled in :diff days',
+    'bill_warning_subject_now_extension_date'    => 'Your subscription ":name" is due to be extended or cancelled TODAY',
+    'bill_warning_end_date'                      => 'Your subscription **":name"** is due to end on :date. This moment will pass in about **:diff days**.',
+    'bill_warning_extension_date'                => 'Your subscription **":name"** is due to be extended or cancelled on :date. This moment will pass in about **:diff days**.',
+    'bill_warning_end_date_zero'                 => 'Your subscription **":name"** is due to end on :date. This moment will pass **TODAY!**',
+    'bill_warning_extension_date_zero'           => 'Your subscription **":name"** is due to be extended or cancelled on :date. This moment will pass **TODAY!**',
+    'bill_warning_please_action'                 => 'Please take the appropriate action.',
 
     // user has enabled MFA
-    'enabled_mfa_subject'                         => 'You have enabled multi-factor authentication',
-    'enabled_mfa_slack'                           => 'You (:email) have enabled multi-factor authentication. Is this not correct? Check your settings!',
-    'have_enabled_mfa'                            => 'You have enabled multi-factor authentication on your Firefly III account ":email". This means that you will need to use an authenticator app to log in from now on.',
-    'enabled_mfa_warning'                         => 'If you did not enable this, please contact your administrator immediately or check out the Firefly III documentation.',
+    'enabled_mfa_subject'                        => 'You have enabled multi-factor authentication',
+    'enabled_mfa_slack'                          => 'You (:email) have enabled multi-factor authentication. Is this not correct? Check your settings!',
+    'have_enabled_mfa'                           => 'You have enabled multi-factor authentication on your Firefly III account ":email". This means that you will need to use an authenticator app to log in from now on.',
+    'enabled_mfa_warning'                        => 'If you did not enable this, please contact your administrator immediately or check out the Firefly III documentation.',
 
-    'disabled_mfa_subject'                        => 'You have disabled multi-factor authentication!',
-    'disabled_mfa_slack'                          => 'You (:email) have disabled multi-factor authentication. Is this not correct? Check your settings!',
-    'have_disabled_mfa'                           => 'You have disabled multi-factor authentication on your Firefly III account ":email".',
-    'disabled_mfa_warning'                        => 'If you did not disable this, please contact your administrator immediately or check out the Firefly III documentation.',
+    'disabled_mfa_subject'                       => 'You have disabled multi-factor authentication!',
+    'disabled_mfa_slack'                         => 'You (:email) have disabled multi-factor authentication. Is this not correct? Check your settings!',
+    'have_disabled_mfa'                          => 'You have disabled multi-factor authentication on your Firefly III account ":email".',
+    'disabled_mfa_warning'                       => 'If you did not disable this, please contact your administrator immediately or check out the Firefly III documentation.',
 
-    'new_backup_codes_subject'                    => 'You have generated new back-up codes',
-    'new_backup_codes_slack'                      => 'You (:email) have generated new back-up codes. These can be used to login to Firefly III. Is this not correct? Check your settings!',
-    'new_backup_codes_intro'                      => 'You (:email) have generated new back-up codes. These can be used to login to Firefly III if you lose access to your authenticator app.',
-    'new_backup_codes_warning'                    => 'Please store these codes in a safe place. If you lose them, you will not be able to log in to Firefly III. If you did not do this, please contact your administrator immediately or check out the Firefly III documentation.',
+    'new_backup_codes_subject'                   => 'You have generated new back-up codes',
+    'new_backup_codes_slack'                     => 'You (:email) have generated new back-up codes. These can be used to login to Firefly III. Is this not correct? Check your settings!',
+    'new_backup_codes_intro'                     => 'You (:email) have generated new back-up codes. These can be used to login to Firefly III if you lose access to your authenticator app.',
+    'new_backup_codes_warning'                   => 'Please store these codes in a safe place. If you lose them, you will not be able to log in to Firefly III. If you did not do this, please contact your administrator immediately or check out the Firefly III documentation.',
 
-    'used_backup_code_subject'                    => 'You have used a back-up code to login',
-    'used_backup_code_slack'                      => 'You (:email) have used a back-up code to login',
+    'used_backup_code_subject'                   => 'You have used a back-up code to login',
+    'used_backup_code_slack'                     => 'You (:email) have used a back-up code to login',
 
-    'used_backup_code_intro'                      => 'You (:email) have used a back-up code to login to Firefly III. You now have one less back-up code to login with. Please remove it from your list.',
-    'used_backup_code_warning'                    => 'If you did not do this, please contact your administrator immediately or check out the Firefly III documentation.',
+    'used_backup_code_intro'                     => 'You (:email) have used a back-up code to login to Firefly III. You now have one less back-up code to login with. Please remove it from your list.',
+    'used_backup_code_warning'                   => 'If you did not do this, please contact your administrator immediately or check out the Firefly III documentation.',
 
     // few left:
-    'mfa_few_backups_left_subject'                => 'You have only :count backup code(s) left!',
-    'mfa_few_backups_left_slack'                  => 'You (:email) have only :count backup code(s) left!',
-    'few_backup_codes_intro'                      => 'You (:email) have used most of your backup codes, and now have only :count left. Please generate new ones as soon as possible.',
-    'few_backup_codes_warning'                    => 'Without backup codes, you cannot recover your MFA login if you lose access to your code generator.',
+    'mfa_few_backups_left_subject'               => 'You have only :count backup code(s) left!',
+    'mfa_few_backups_left_slack'                 => 'You (:email) have only :count backup code(s) left!',
+    'few_backup_codes_intro'                     => 'You (:email) have used most of your backup codes, and now have only :count left. Please generate new ones as soon as possible.',
+    'few_backup_codes_warning'                   => 'Without backup codes, you cannot recover your MFA login if you lose access to your code generator.',
 
     // NO left:
-    'mfa_no_backups_left_subject'                 => 'You have NO backup codes left!',
-    'mfa_no_backups_left_slack'                   => 'You (:email) NO backup codes left!',
-    'no_backup_codes_intro'                       => 'You (:email) have used ALL of your backup codes. Please generate new ones as soon as possible.',
-    'no_backup_codes_warning'                     => 'Without backup codes, you cannot recover your MFA login if you lose access to your code generator.',
+    'mfa_no_backups_left_subject'                => 'You have NO backup codes left!',
+    'mfa_no_backups_left_slack'                  => 'You (:email) NO backup codes left!',
+    'no_backup_codes_intro'                      => 'You (:email) have used ALL of your backup codes. Please generate new ones as soon as possible.',
+    'no_backup_codes_warning'                    => 'Without backup codes, you cannot recover your MFA login if you lose access to your code generator.',
 
     // many failed MFA attempts
-    'mfa_many_failed_subject'                     => 'You have tried and failed to use multi-factor authentication :count times now!',
-    'mfa_many_failed_slack'                       => 'You (:email) have tried and failed to use multi-factor authentication :count times now. Is this not correct? Check your settings!',
-    'mfa_many_failed_attempts_intro'              => 'You (:email) have tried :count times to use a multi-factor authentication code, but these login attempts have failed. Are you sure you are using the right MFA code? Are you sure the time on the server is correct?',
-    'mfa_many_failed_attempts_warning'            => 'If you did not do this, please contact your administrator immediately or check out the Firefly III documentation.',
-
+    'mfa_many_failed_subject'                    => 'You have tried and failed to use multi-factor authentication :count times now!',
+    'mfa_many_failed_slack'                      => 'You (:email) have tried and failed to use multi-factor authentication :count times now. Is this not correct? Check your settings!',
+    'mfa_many_failed_attempts_intro'             => 'You (:email) have tried :count times to use a multi-factor authentication code, but these login attempts have failed. Are you sure you are using the right MFA code? Are you sure the time on the server is correct?',
+    'mfa_many_failed_attempts_warning'           => 'If you did not do this, please contact your administrator immediately or check out the Firefly III documentation.',
 ];

resources/lang/en_US/errors.php

@@ -20,8 +20,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-
-
 declare(strict_types=1);
 
 return [
@@ -42,8 +40,6 @@ return [
     'stacktrace'              => 'Stack trace',
     'more_info'               => 'More information',
 
-
-
     'collect_info'            => 'Please collect more information in the <code>storage/logs</code> directory where you will find log files. If you\'re running Docker, use <code>docker logs -f [container]</code>.',
     'collect_info_more'       => 'You can read more about collecting error information in <a href="https://docs.firefly-iii.org/how-to/general/debug/">the FAQ</a>.',
     'github_help'             => 'Get help on GitHub',

resources/lang/en_US/form.php

@@ -20,266 +20,261 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-
-
 declare(strict_types=1);
 
 return [
     // new user:
-    'administration_currency'      => 'Primary currency',
-    'bank_name'                    => 'Bank name',
-    'bank_balance'                 => 'Balance',
-    'current_balance'              => 'Current balance',
-    'savings_balance'              => 'Savings balance',
-    'credit_card_limit'            => 'Credit card limit',
-    'automatch'                    => 'Match automatically',
-    'skip'                         => 'Skip',
-    'enabled'                      => 'Enabled',
-    'name'                         => 'Name',
-    'active'                       => 'Active',
-    'amount_min'                   => 'Minimum amount',
-    'amount_max'                   => 'Maximum amount',
-    'match'                        => 'Matches on',
-    'strict'                       => 'Strict mode',
-    'repeat_freq'                  => 'Repeats',
-    'object_group'                 => 'Group',
-    'location'                     => 'Location',
-    'update_channel'               => 'Update channel',
-    'currency_id'                  => 'Currency',
-    'transaction_currency_id'      => 'Currency',
-    'auto_budget_currency_id'      => 'Currency',
-    'external_ip'                  => 'Your server\'s external IP',
-    'attachments'                  => 'Attachments',
-    'BIC'                          => 'BIC',
-    'verify_password'              => 'Verify password security',
-    'source_account'               => 'Source account',
-    'destination_account'          => 'Destination account',
-    'asset_destination_account'    => 'Destination account',
-    'include_net_worth'            => 'Include in net worth',
-    'asset_source_account'         => 'Source account',
-    'journal_description'          => 'Description',
-    'note'                         => 'Notes',
-    'currency'                     => 'Currency',
-    'account_id'                   => 'Asset account',
-    'budget_id'                    => 'Budget',
-    'bill_id'                      => 'Subscription',
-    'opening_balance'              => 'Opening balance',
-    'tag_mode'                      => 'Tag mode',
-    'virtual_balance'              => 'Virtual balance',
-    'run_after_form' => 'Run this rule',
-    'valid_url_protocols' => 'Valid URL protocols',
-    'allow_webhooks' => 'Allow webhooks',
-    'enable_external_rates' => 'Enable external exchange rates',
-    'enable_external_map' => 'Enable external map',
-    'use_running_balance' => 'Calculate running balances',
-    'enable_exchange_rates' => 'Enable exchange rates',
-    'targetamount'                 => 'Target amount',
-    'target_amount'                => 'Target amount',
-    'account_role'                 => 'Account role',
-    'opening_balance_date'         => 'Opening balance date',
-    'cc_type'                      => 'Credit card payment plan',
-    'cc_monthly_payment_date'      => 'Credit card monthly payment date',
-    'piggy_bank_id'                => 'Piggy bank',
-    'returnHere'                   => 'Return here',
-    'returnHereExplanation'        => 'After storing, return here to create another one.',
-    'returnHereUpdateExplanation'  => 'After updating, return here.',
-    'description'                  => 'Description',
-    'expense_account'              => 'Expense account',
-    'revenue_account'              => 'Revenue account',
-    'decimal_places'               => 'Decimal places',
-    'destination_amount'           => 'Amount (destination)',
-    'new_email_address'            => 'New email address',
-    'verification'                 => 'Verification',
-    'api_key'                      => 'API key',
-    'remember_me'                  => 'Remember me',
-    'liability_type_id'            => 'Liability type',
-    'liability_type'               => 'Liability type',
-    'interest'                     => 'Interest',
-    'interest_period'              => 'Interest period',
-    'extension_date'               => 'Extension date',
-    'type'                         => 'Type',
-    'convert_Withdrawal'           => 'Convert withdrawal',
-    'convert_Deposit'              => 'Convert deposit',
-    'convert_Transfer'             => 'Convert transfer',
-    'amount'                       => 'Amount',
-    'foreign_amount'               => 'Foreign amount',
-    'date'                         => 'Date',
-    'interest_date'                => 'Interest date',
-    'book_date'                    => 'Book date',
-    'process_date'                 => 'Processing date',
-    'category'                     => 'Category',
-    'tags'                         => 'Tags',
-    'deletePermanently'            => 'Delete permanently',
-    'cancel'                       => 'Cancel',
-    'targetdate'                   => 'Target date',
-    'target_date'                  => 'Target date',
-    'startdate'                    => 'Start date',
-    'start_date'                   => 'Start date',
-    'tag'                          => 'Tag',
+    'administration_currency'     => 'Primary currency',
+    'bank_name'                   => 'Bank name',
+    'bank_balance'                => 'Balance',
+    'current_balance'             => 'Current balance',
+    'savings_balance'             => 'Savings balance',
+    'credit_card_limit'           => 'Credit card limit',
+    'automatch'                   => 'Match automatically',
+    'skip'                        => 'Skip',
+    'enabled'                     => 'Enabled',
+    'name'                        => 'Name',
+    'active'                      => 'Active',
+    'amount_min'                  => 'Minimum amount',
+    'amount_max'                  => 'Maximum amount',
+    'match'                       => 'Matches on',
+    'strict'                      => 'Strict mode',
+    'repeat_freq'                 => 'Repeats',
+    'object_group'                => 'Group',
+    'location'                    => 'Location',
+    'update_channel'              => 'Update channel',
+    'currency_id'                 => 'Currency',
+    'transaction_currency_id'     => 'Currency',
+    'auto_budget_currency_id'     => 'Currency',
+    'external_ip'                 => 'Your server\'s external IP',
+    'attachments'                 => 'Attachments',
+    'BIC'                         => 'BIC',
+    'verify_password'             => 'Verify password security',
+    'source_account'              => 'Source account',
+    'destination_account'         => 'Destination account',
+    'asset_destination_account'   => 'Destination account',
+    'include_net_worth'           => 'Include in net worth',
+    'asset_source_account'        => 'Source account',
+    'journal_description'         => 'Description',
+    'note'                        => 'Notes',
+    'currency'                    => 'Currency',
+    'account_id'                  => 'Asset account',
+    'budget_id'                   => 'Budget',
+    'bill_id'                     => 'Subscription',
+    'opening_balance'             => 'Opening balance',
+    'tag_mode'                    => 'Tag mode',
+    'virtual_balance'             => 'Virtual balance',
+    'run_after_form'              => 'Run this rule',
+    'valid_url_protocols'         => 'Valid URL protocols',
+    'allow_webhooks'              => 'Allow webhooks',
+    'enable_external_rates'       => 'Enable external exchange rates',
+    'enable_external_map'         => 'Enable external map',
+    'use_running_balance'         => 'Calculate running balances',
+    'enable_exchange_rates'       => 'Enable exchange rates',
+    'targetamount'                => 'Target amount',
+    'target_amount'               => 'Target amount',
+    'account_role'                => 'Account role',
+    'opening_balance_date'        => 'Opening balance date',
+    'cc_type'                     => 'Credit card payment plan',
+    'cc_monthly_payment_date'     => 'Credit card monthly payment date',
+    'piggy_bank_id'               => 'Piggy bank',
+    'enable_batch_processing'     => 'Enable batch processing',
+    'returnHere'                  => 'Return here',
+    'returnHereExplanation'       => 'After storing, return here to create another one.',
+    'returnHereUpdateExplanation' => 'After updating, return here.',
+    'description'                 => 'Description',
+    'expense_account'             => 'Expense account',
+    'revenue_account'             => 'Revenue account',
+    'decimal_places'              => 'Decimal places',
+    'destination_amount'          => 'Amount (destination)',
+    'new_email_address'           => 'New email address',
+    'verification'                => 'Verification',
+    'api_key'                     => 'API key',
+    'remember_me'                 => 'Remember me',
+    'liability_type_id'           => 'Liability type',
+    'liability_type'              => 'Liability type',
+    'interest'                    => 'Interest',
+    'interest_period'             => 'Interest period',
+    'extension_date'              => 'Extension date',
+    'type'                        => 'Type',
+    'convert_Withdrawal'          => 'Convert withdrawal',
+    'convert_Deposit'             => 'Convert deposit',
+    'convert_Transfer'            => 'Convert transfer',
+    'amount'                      => 'Amount',
+    'foreign_amount'              => 'Foreign amount',
+    'date'                        => 'Date',
+    'interest_date'               => 'Interest date',
+    'book_date'                   => 'Book date',
+    'process_date'                => 'Processing date',
+    'category'                    => 'Category',
+    'tags'                        => 'Tags',
+    'deletePermanently'           => 'Delete permanently',
+    'cancel'                      => 'Cancel',
+    'targetdate'                  => 'Target date',
+    'target_date'                 => 'Target date',
+    'startdate'                   => 'Start date',
+    'start_date'                  => 'Start date',
+    'tag'                         => 'Tag',
 
     // exchange rates
-    'from_currency_to_currency'    => '{from} &rarr; {to}',
-    'to_currency_from_currency'    => '{to} &rarr; {from}',
-    'rate'                         => 'Rate',
+    'from_currency_to_currency'   => '{from} &rarr; {to}',
+    'to_currency_from_currency'   => '{to} &rarr; {from}',
+    'rate'                        => 'Rate',
 
-    'under'                        => 'Under',
-    'symbol'                       => 'Symbol',
-    'code'                         => 'Code',
-    'iban'                         => 'IBAN',
-    'account_number'               => 'Account number',
-    'creditCardNumber'             => 'Credit card number',
-    'has_headers'                  => 'Headers',
-    'date_format'                  => 'Date format',
-    'attachments[]'                => 'Attachments',
-    'title'                        => 'Title',
-    'notes'                        => 'Notes',
-    'filename'                     => 'File name',
-    'mime'                         => 'Mime type',
-    'size'                         => 'Size',
-    'trigger'                      => 'Trigger',
-    'stop_processing'              => 'Stop processing',
-    'end_date'                     => 'End date',
-    'enddate'                      => 'End date',
-    'move_rules_before_delete'     => 'Rule group',
-    'start'                        => 'Start of range',
-    'end'                          => 'End of range',
-    'delete_account'               => 'Delete account ":name"',
-    'delete_webhook'               => 'Delete webhook ":title"',
-    'delete_bill'                  => 'Delete subscription ":name"',
-    'delete_budget'                => 'Delete budget ":name"',
-    'delete_category'              => 'Delete category ":name"',
-    'delete_currency'              => 'Delete currency ":name"',
-    'delete_journal'               => 'Delete transaction with description ":description"',
-    'delete_attachment'            => 'Delete attachment ":name"',
-    'delete_rule'                  => 'Delete rule ":title"',
-    'delete_rule_group'            => 'Delete rule group ":title"',
-    'delete_link_type'             => 'Delete link type ":name"',
-    'delete_user'                  => 'Delete user ":email"',
-    'delete_recurring'             => 'Delete recurring transaction ":title"',
-    'user_areYouSure'              => 'If you delete user ":email", everything will be gone. There is no undo, undelete or anything. If you delete yourself, you will lose access to this instance of Firefly III.',
-    'attachment_areYouSure'        => 'Are you sure you want to delete the attachment named ":name"?',
-    'account_areYouSure'           => 'Are you sure you want to delete the account named ":name"?',
-    'account_areYouSure_js'        => 'Are you sure you want to delete the account named "{name}"?',
-    'bill_areYouSure'              => 'Are you sure you want to delete the subscription named ":name"?',
-    'rule_areYouSure'              => 'Are you sure you want to delete the rule titled ":title"?',
-    'object_group_areYouSure'      => 'Are you sure you want to delete the group titled ":title"?',
-    'ruleGroup_areYouSure'         => 'Are you sure you want to delete the rule group titled ":title"?',
-    'budget_areYouSure'            => 'Are you sure you want to delete the budget named ":name"?',
-    'webhook_areYouSure'           => 'Are you sure you want to delete the webhook named ":title"?',
-    'category_areYouSure'          => 'Are you sure you want to delete the category named ":name"?',
-    'recurring_areYouSure'         => 'Are you sure you want to delete the recurring transaction titled ":title"?',
-    'currency_areYouSure'          => 'Are you sure you want to delete the currency named ":name"?',
-    'piggyBank_areYouSure'         => 'Are you sure you want to delete the piggy bank named ":name"?',
-    'journal_areYouSure'           => 'Are you sure you want to delete the transaction described ":description"?',
-    'mass_journal_are_you_sure'    => 'Are you sure you want to delete these transactions?',
+    'under'                       => 'Under',
+    'symbol'                      => 'Symbol',
+    'code'                        => 'Code',
+    'iban'                        => 'IBAN',
+    'account_number'              => 'Account number',
+    'creditCardNumber'            => 'Credit card number',
+    'has_headers'                 => 'Headers',
+    'date_format'                 => 'Date format',
+    'attachments[]'               => 'Attachments',
+    'title'                       => 'Title',
+    'notes'                       => 'Notes',
+    'filename'                    => 'File name',
+    'mime'                        => 'Mime type',
+    'size'                        => 'Size',
+    'trigger'                     => 'Trigger',
+    'stop_processing'             => 'Stop processing',
+    'end_date'                    => 'End date',
+    'enddate'                     => 'End date',
+    'move_rules_before_delete'    => 'Rule group',
+    'start'                       => 'Start of range',
+    'end'                         => 'End of range',
+    'delete_account'              => 'Delete account ":name"',
+    'delete_webhook'              => 'Delete webhook ":title"',
+    'delete_bill'                 => 'Delete subscription ":name"',
+    'delete_budget'               => 'Delete budget ":name"',
+    'delete_category'             => 'Delete category ":name"',
+    'delete_currency'             => 'Delete currency ":name"',
+    'delete_journal'              => 'Delete transaction with description ":description"',
+    'delete_attachment'           => 'Delete attachment ":name"',
+    'delete_rule'                 => 'Delete rule ":title"',
+    'delete_rule_group'           => 'Delete rule group ":title"',
+    'delete_link_type'            => 'Delete link type ":name"',
+    'delete_user'                 => 'Delete user ":email"',
+    'delete_recurring'            => 'Delete recurring transaction ":title"',
+    'user_areYouSure'             => 'If you delete user ":email", everything will be gone. There is no undo, undelete or anything. If you delete yourself, you will lose access to this instance of Firefly III.',
+    'attachment_areYouSure'       => 'Are you sure you want to delete the attachment named ":name"?',
+    'account_areYouSure'          => 'Are you sure you want to delete the account named ":name"?',
+    'account_areYouSure_js'       => 'Are you sure you want to delete the account named "{name}"?',
+    'bill_areYouSure'             => 'Are you sure you want to delete the subscription named ":name"?',
+    'rule_areYouSure'             => 'Are you sure you want to delete the rule titled ":title"?',
+    'object_group_areYouSure'     => 'Are you sure you want to delete the group titled ":title"?',
+    'ruleGroup_areYouSure'        => 'Are you sure you want to delete the rule group titled ":title"?',
+    'budget_areYouSure'           => 'Are you sure you want to delete the budget named ":name"?',
+    'webhook_areYouSure'          => 'Are you sure you want to delete the webhook named ":title"?',
+    'category_areYouSure'         => 'Are you sure you want to delete the category named ":name"?',
+    'recurring_areYouSure'        => 'Are you sure you want to delete the recurring transaction titled ":title"?',
+    'currency_areYouSure'         => 'Are you sure you want to delete the currency named ":name"?',
+    'piggyBank_areYouSure'        => 'Are you sure you want to delete the piggy bank named ":name"?',
+    'journal_areYouSure'          => 'Are you sure you want to delete the transaction described ":description"?',
+    'mass_journal_are_you_sure'   => 'Are you sure you want to delete these transactions?',
 
-
-
-    'tag_areYouSure'               => 'Are you sure you want to delete the tag ":tag"?',
-    'journal_link_areYouSure'      => 'Are you sure you want to delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>?',
-    'linkType_areYouSure'          => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
-    'permDeleteWarning'            => 'Deleting stuff from Firefly III is permanent and cannot be undone.',
-    'mass_make_selection'          => 'You can still prevent items from being deleted by removing the checkbox.',
-    'delete_all_permanently'       => 'Delete selected permanently',
-    'update_all_journals'          => 'Update these transactions',
-    'also_delete_transactions'     => 'The only transaction connected to this account will be deleted as well.|All :count transactions connected to this account will be deleted as well.',
-    'also_delete_transactions_js'  => 'No transactions|The only transaction connected to this account will be deleted as well.|All {count} transactions connected to this account will be deleted as well.',
-    'also_delete_connections'      => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
-    'also_delete_rules'            => 'The only rule connected to this rule group will be deleted as well.|All :count rules connected to this rule group will be deleted as well.',
-    'also_delete_piggyBanks'       => 'The only piggy bank connected to this account will be deleted as well.|All :count piggy bank connected to this account will be deleted as well.',
-    'also_delete_piggyBanks_js'    => 'No piggy banks|The only piggy bank connected to this account will be deleted as well.|All {count} piggy banks connected to this account will be deleted as well.',
-    'not_delete_piggy_banks'       => 'The piggy bank connected to this group will not be deleted.|The :count piggy banks connected to this group will not be deleted.',
-    'bill_keep_transactions'       => 'The only transaction connected to this subscription will not be deleted.|All :count transactions connected to this subscription will be spared deletion.',
-    'budget_keep_transactions'     => 'The only transaction connected to this budget will not be deleted.|All :count transactions connected to this budget will be spared deletion.',
-    'category_keep_transactions'   => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will be spared deletion.',
-    'recurring_keep_transactions'  => 'The only transaction created by this recurring transaction will not be deleted.|All :count transactions created by this recurring transaction will be spared deletion.',
-    'tag_keep_transactions'        => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will be spared deletion.',
-    'check_for_updates'            => 'Check for updates',
-    'liability_direction'          => 'Liability in/out',
-    'delete_object_group'          => 'Delete group ":title"',
-    'email'                        => 'Email address',
-    'password'                     => 'Password',
-    'password_confirmation'        => 'Password (again)',
-    'blocked'                      => 'Is blocked?',
-    'blocked_code'                 => 'Reason for block',
-    'login_name'                   => 'Login',
-    'is_owner'                     => 'Is admin?',
-    'url'                          => 'URL',
-    'bill_end_date'                => 'End date',
+    'tag_areYouSure'              => 'Are you sure you want to delete the tag ":tag"?',
+    'journal_link_areYouSure'     => 'Are you sure you want to delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>?',
+    'linkType_areYouSure'         => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
+    'permDeleteWarning'           => 'Deleting stuff from Firefly III is permanent and cannot be undone.',
+    'mass_make_selection'         => 'You can still prevent items from being deleted by removing the checkbox.',
+    'delete_all_permanently'      => 'Delete selected permanently',
+    'update_all_journals'         => 'Update these transactions',
+    'also_delete_transactions'    => 'The only transaction connected to this account will be deleted as well.|All :count transactions connected to this account will be deleted as well.',
+    'also_delete_transactions_js' => 'No transactions|The only transaction connected to this account will be deleted as well.|All {count} transactions connected to this account will be deleted as well.',
+    'also_delete_connections'     => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
+    'also_delete_rules'           => 'The only rule connected to this rule group will be deleted as well.|All :count rules connected to this rule group will be deleted as well.',
+    'also_delete_piggyBanks'      => 'The only piggy bank connected to this account will be deleted as well.|All :count piggy bank connected to this account will be deleted as well.',
+    'also_delete_piggyBanks_js'   => 'No piggy banks|The only piggy bank connected to this account will be deleted as well.|All {count} piggy banks connected to this account will be deleted as well.',
+    'not_delete_piggy_banks'      => 'The piggy bank connected to this group will not be deleted.|The :count piggy banks connected to this group will not be deleted.',
+    'bill_keep_transactions'      => 'The only transaction connected to this subscription will not be deleted.|All :count transactions connected to this subscription will be spared deletion.',
+    'budget_keep_transactions'    => 'The only transaction connected to this budget will not be deleted.|All :count transactions connected to this budget will be spared deletion.',
+    'category_keep_transactions'  => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will be spared deletion.',
+    'recurring_keep_transactions' => 'The only transaction created by this recurring transaction will not be deleted.|All :count transactions created by this recurring transaction will be spared deletion.',
+    'tag_keep_transactions'       => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will be spared deletion.',
+    'check_for_updates'           => 'Check for updates',
+    'liability_direction'         => 'Liability in/out',
+    'delete_object_group'         => 'Delete group ":title"',
+    'email'                       => 'Email address',
+    'password'                    => 'Password',
+    'password_confirmation'       => 'Password (again)',
+    'blocked'                     => 'Is blocked?',
+    'blocked_code'                => 'Reason for block',
+    'login_name'                  => 'Login',
+    'is_owner'                    => 'Is admin?',
+    'url'                         => 'URL',
+    'bill_end_date'               => 'End date',
 
     // import
-    'apply_rules'                  => 'Apply rules',
-    'artist'                       => 'Artist',
-    'album'                        => 'Album',
-    'song'                         => 'Song',
+    'apply_rules'                 => 'Apply rules',
+    'artist'                      => 'Artist',
+    'album'                       => 'Album',
+    'song'                        => 'Song',
 
     // admin
-    'domain'                       => 'Domain',
-    'single_user_mode'             => 'Disable user registration',
-    'is_demo_site'                 => 'Is demo site',
+    'domain'                      => 'Domain',
+    'single_user_mode'            => 'Disable user registration',
+    'is_demo_site'                => 'Is demo site',
 
     // import
-    'configuration_file'           => 'Configuration file',
-    'csv_comma'                    => 'A comma (,)',
-    'csv_semicolon'                => 'A semicolon (;)',
-    'csv_tab'                      => 'A tab (invisible)',
-    'csv_delimiter'                => 'CSV field delimiter',
-    'client_id'                    => 'Client ID',
-    'app_id'                       => 'App ID',
-    'secret'                       => 'Secret',
-    'public_key'                   => 'Public key',
-    'country_code'                 => 'Country code',
-    'provider_code'                => 'Bank or data-provider',
-    'fints_url'                    => 'FinTS API URL',
-    'fints_port'                   => 'Port',
-    'fints_bank_code'              => 'Bank code',
-    'fints_username'               => 'Username',
-    'fints_password'               => 'PIN / Password',
-    'fints_account'                => 'FinTS account',
-    'local_account'                => 'Firefly III account',
+    'configuration_file'          => 'Configuration file',
+    'csv_comma'                   => 'A comma (,)',
+    'csv_semicolon'               => 'A semicolon (;)',
+    'csv_tab'                     => 'A tab (invisible)',
+    'csv_delimiter'               => 'CSV field delimiter',
+    'client_id'                   => 'Client ID',
+    'app_id'                      => 'App ID',
+    'secret'                      => 'Secret',
+    'public_key'                  => 'Public key',
+    'country_code'                => 'Country code',
+    'provider_code'               => 'Bank or data-provider',
+    'fints_url'                   => 'FinTS API URL',
+    'fints_port'                  => 'Port',
+    'fints_bank_code'             => 'Bank code',
+    'fints_username'              => 'Username',
+    'fints_password'              => 'PIN / Password',
+    'fints_account'               => 'FinTS account',
+    'local_account'               => 'Firefly III account',
 
-
-
-    'from_date'                    => 'Date from',
-    'to_date'                      => 'Date to',
-    'due_date'                     => 'Due date',
-    'payment_date'                 => 'Payment date',
-    'invoice_date'                 => 'Invoice date',
-    'internal_reference'           => 'Internal reference',
-    'inward'                       => 'Inward description',
-    'outward'                      => 'Outward description',
-    'rule_group_id'                => 'Rule group',
-    'transaction_description'      => 'Transaction description',
-    'first_date'                   => 'First date',
-    'transaction_type'             => 'Transaction type',
-    'repeat_until'                 => 'Repeat until',
-    'recurring_description'        => 'Recurring transaction description',
-    'repetition_type'              => 'Type of repetition',
-    'foreign_currency_id'          => 'Foreign currency',
-    'repetition_end'               => 'Repetition ends',
-    'repetitions'                  => 'Repetitions',
-    'calendar'                     => 'Calendar',
-    'weekend'                      => 'Weekend',
-    'client_secret'                => 'Client secret',
-    'withdrawal_destination_id'    => 'Destination account',
-    'deposit_source_id'            => 'Source account',
-    'expected_on'                  => 'Expected on',
-    'paid'                         => 'Paid',
-    'auto_budget_type'             => 'Auto-budget',
-    'auto_budget_amount'           => 'Auto-budget amount',
-    'auto_budget_period'           => 'Auto-budget period',
-    'collected'                    => 'Collected',
-    'submitted'                    => 'Submitted',
-    'key'                          => 'Key',
-    'value'                        => 'Content of record',
-    'webhook_delivery'             => 'Delivery',
-    'webhook_response'             => 'Response',
-    'webhook_trigger'              => 'Trigger',
-    'pushover_app_token'           => 'Pushover app token',
-    'pushover_user_token'          => 'Pushover user token',
-    'ntfy_server'                  => 'Ntfy server',
-    'ntfy_topic'                   => 'Ntfy topic',
-    'ntfy_auth'                    => 'Ntfy authentication enabled',
-    'ntfy_user'                    => 'Ntfy username',
-    'ntfy_pass'                    => 'Ntfy password',
+    'from_date'                   => 'Date from',
+    'to_date'                     => 'Date to',
+    'due_date'                    => 'Due date',
+    'payment_date'                => 'Payment date',
+    'invoice_date'                => 'Invoice date',
+    'internal_reference'          => 'Internal reference',
+    'inward'                      => 'Inward description',
+    'outward'                     => 'Outward description',
+    'rule_group_id'               => 'Rule group',
+    'transaction_description'     => 'Transaction description',
+    'first_date'                  => 'First date',
+    'transaction_type'            => 'Transaction type',
+    'repeat_until'                => 'Repeat until',
+    'recurring_description'       => 'Recurring transaction description',
+    'repetition_type'             => 'Type of repetition',
+    'foreign_currency_id'         => 'Foreign currency',
+    'repetition_end'              => 'Repetition ends',
+    'repetitions'                 => 'Repetitions',
+    'calendar'                    => 'Calendar',
+    'weekend'                     => 'Weekend',
+    'client_secret'               => 'Client secret',
+    'withdrawal_destination_id'   => 'Destination account',
+    'deposit_source_id'           => 'Source account',
+    'expected_on'                 => 'Expected on',
+    'paid'                        => 'Paid',
+    'auto_budget_type'            => 'Auto-budget',
+    'auto_budget_amount'          => 'Auto-budget amount',
+    'auto_budget_period'          => 'Auto-budget period',
+    'collected'                   => 'Collected',
+    'submitted'                   => 'Submitted',
+    'key'                         => 'Key',
+    'value'                       => 'Content of record',
+    'webhook_delivery'            => 'Delivery',
+    'webhook_response'            => 'Response',
+    'webhook_trigger'             => 'Trigger',
+    'pushover_app_token'          => 'Pushover app token',
+    'pushover_user_token'         => 'Pushover user token',
+    'ntfy_server'                 => 'Ntfy server',
+    'ntfy_topic'                  => 'Ntfy topic',
+    'ntfy_auth'                   => 'Ntfy authentication enabled',
+    'ntfy_user'                   => 'Ntfy username',
+    'ntfy_pass'                   => 'Ntfy password',
 ];

resources/lang/en_US/intro.php

@@ -20,140 +20,132 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-
-
 declare(strict_types=1);
 
 return [
     // index
-    'index_intro'                                                     => 'Welcome to the index page of Firefly III. Please take the time to walk through this intro to get a feeling of how Firefly III works.',
-    'index_accounts-chart'                                            => 'This chart shows the current balance of your asset accounts. You can select the accounts visible here in your preferences.',
-    'index_box_out_holder'                                            => 'This little box and the boxes next to this one will give you a quick overview of your financial situation.',
-    'index_help'                                                      => 'If you ever need help with a page or a form, press this button.',
-    'index_outro'                                                     => 'Most pages of Firefly III will start with a little tour like this one. Please contact me when you have questions or comments. Enjoy!',
-    'index_sidebar-toggle'                                            => 'To create new transactions, accounts or other things, use the menu under this icon.',
-    'index_cash_account'                                              => 'These are the accounts created so far. You can use the cash account to track cash expenses but it\'s not mandatory of course.',
+    'index_intro'                                             => 'Welcome to the index page of Firefly III. Please take the time to walk through this intro to get a feeling of how Firefly III works.',
+    'index_accounts-chart'                                    => 'This chart shows the current balance of your asset accounts. You can select the accounts visible here in your preferences.',
+    'index_box_out_holder'                                    => 'This little box and the boxes next to this one will give you a quick overview of your financial situation.',
+    'index_help'                                              => 'If you ever need help with a page or a form, press this button.',
+    'index_outro'                                             => 'Most pages of Firefly III will start with a little tour like this one. Please contact me when you have questions or comments. Enjoy!',
+    'index_sidebar-toggle'                                    => 'To create new transactions, accounts or other things, use the menu under this icon.',
+    'index_cash_account'                                      => 'These are the accounts created so far. You can use the cash account to track cash expenses but it\'s not mandatory of course.',
 
     // transactions
-    'transactions_create_basic_info'                                  => 'Enter the basic information of your transaction. Source, destination, date and description.',
-    'transactions_create_amount_info'                                 => 'Enter the amount of the transaction. If necessary the fields will auto-update for foreign amount info.',
-    'transactions_create_optional_info'                               => 'All of these fields are optional. Adding meta-data here will make your transactions better organised.',
-    'transactions_create_split'                                       => 'If you want to split a transaction, add more splits with this button',
+    'transactions_create_basic_info'                          => 'Enter the basic information of your transaction. Source, destination, date and description.',
+    'transactions_create_amount_info'                         => 'Enter the amount of the transaction. If necessary the fields will auto-update for foreign amount info.',
+    'transactions_create_optional_info'                       => 'All of these fields are optional. Adding meta-data here will make your transactions better organised.',
+    'transactions_create_split'                               => 'If you want to split a transaction, add more splits with this button',
 
     // create account:
-    'accounts_create_iban'                                            => 'Give your accounts a valid IBAN. This could make a data import very easy in the future.',
-    'accounts_create_asset_opening_balance'                           => 'Assets accounts may have an "opening balance", indicating the start of this account\'s history in Firefly III.',
-    'accounts_create_asset_currency'                                  => 'Firefly III supports multiple currencies. Asset accounts have one main currency, which you must set here.',
-    'accounts_create_asset_virtual'                                   => 'It can sometimes help to give your account a virtual balance: an extra amount always added to or removed from the actual balance.',
+    'accounts_create_iban'                                    => 'Give your accounts a valid IBAN. This could make a data import very easy in the future.',
+    'accounts_create_asset_opening_balance'                   => 'Assets accounts may have an "opening balance", indicating the start of this account\'s history in Firefly III.',
+    'accounts_create_asset_currency'                          => 'Firefly III supports multiple currencies. Asset accounts have one main currency, which you must set here.',
+    'accounts_create_asset_virtual'                           => 'It can sometimes help to give your account a virtual balance: an extra amount always added to or removed from the actual balance.',
 
     // budgets index
-    'budgets_index_intro'                                             => 'Budgets are used to manage your finances and form one of the core functions of Firefly III.',
-    'budgets_index_see_expenses_bar'                                  => 'Spending money will slowly fill this bar.',
-    'budgets_index_navigate_periods'                                  => 'Navigate through periods to easily set budgets ahead of time.',
-    'budgets_index_new_budget'                                        => 'Create new budgets as you see fit.',
-    'budgets_index_list_of_budgets'                                   => 'Use this table to set the amounts for each budget and see how you are doing.',
-    'budgets_index_outro'                                             => 'To learn more about budgeting, checkout the help icon in the top right corner.',
-
-
+    'budgets_index_intro'                                     => 'Budgets are used to manage your finances and form one of the core functions of Firefly III.',
+    'budgets_index_see_expenses_bar'                          => 'Spending money will slowly fill this bar.',
+    'budgets_index_navigate_periods'                          => 'Navigate through periods to easily set budgets ahead of time.',
+    'budgets_index_new_budget'                                => 'Create new budgets as you see fit.',
+    'budgets_index_list_of_budgets'                           => 'Use this table to set the amounts for each budget and see how you are doing.',
+    'budgets_index_outro'                                     => 'To learn more about budgeting, checkout the help icon in the top right corner.',
 
     // reports (index)
-    'reports_index_intro'                                             => 'Use these reports to get detailed insights in your finances.',
-    'reports_index_inputReportType'                                   => 'Pick a report type. Check out the help pages to see what each report shows you.',
-    'reports_index_inputAccountsSelect'                               => 'You can exclude or include asset accounts as you see fit.',
-    'reports_index_inputDateRange'                                    => 'The selected date range is entirely up to you: from one day to 10 years or more.',
-    'reports_index_extra-options-box'                                 => 'Depending on the report you have selected, you can select extra filters and options here. Watch this box when you change report types.',
+    'reports_index_intro'                                     => 'Use these reports to get detailed insights in your finances.',
+    'reports_index_inputReportType'                           => 'Pick a report type. Check out the help pages to see what each report shows you.',
+    'reports_index_inputAccountsSelect'                       => 'You can exclude or include asset accounts as you see fit.',
+    'reports_index_inputDateRange'                            => 'The selected date range is entirely up to you: from one day to 10 years or more.',
+    'reports_index_extra-options-box'                         => 'Depending on the report you have selected, you can select extra filters and options here. Watch this box when you change report types.',
 
     // reports (reports)
-    'reports_report_default_intro'                                    => 'This report will give you a quick and comprehensive overview of your finances. If you wish to see anything else, please don\'t hestitate to contact me!',
-    'reports_report_audit_intro'                                      => 'This report will give you detailed insights in your asset accounts.',
-    'reports_report_audit_optionsBox'                                 => 'Use these check boxes to show or hide the columns you are interested in.',
+    'reports_report_default_intro'                            => 'This report will give you a quick and comprehensive overview of your finances. If you wish to see anything else, please don\'t hestitate to contact me!',
+    'reports_report_audit_intro'                              => 'This report will give you detailed insights in your asset accounts.',
+    'reports_report_audit_optionsBox'                         => 'Use these check boxes to show or hide the columns you are interested in.',
 
-    'reports_report_category_intro'                                   => 'This report will give you insight in one or multiple categories.',
-    'reports_report_category_pieCharts'                               => 'These charts will give you insight in expenses and income per category or per account.',
-    'reports_report_category_incomeAndExpensesChart'                  => 'This chart shows your expenses and income per category.',
+    'reports_report_category_intro'                           => 'This report will give you insight in one or multiple categories.',
+    'reports_report_category_pieCharts'                       => 'These charts will give you insight in expenses and income per category or per account.',
+    'reports_report_category_incomeAndExpensesChart'          => 'This chart shows your expenses and income per category.',
 
-    'reports_report_tag_intro'                                        => 'This report will give you insight in one or multiple tags.',
-    'reports_report_tag_pieCharts'                                    => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
-    'reports_report_tag_incomeAndExpensesChart'                       => 'This chart shows your expenses and income per tag.',
+    'reports_report_tag_intro'                                => 'This report will give you insight in one or multiple tags.',
+    'reports_report_tag_pieCharts'                            => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
+    'reports_report_tag_incomeAndExpensesChart'               => 'This chart shows your expenses and income per tag.',
 
-    'reports_report_budget_intro'                                     => 'This report will give you insight in one or multiple budgets.',
-    'reports_report_budget_pieCharts'                                 => 'These charts will give you insight in expenses per budget or per account.',
-    'reports_report_budget_incomeAndExpensesChart'                    => 'This chart shows your expenses per budget.',
+    'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
+    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses per budget or per account.',
+    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows your expenses per budget.',
 
     // create transaction
-    'transactions_create_switch_box'                                  => 'Use these buttons to quickly switch the type of transaction you wish to save.',
-    'transactions_create_ffInput_category'                            => 'You can freely type in this field. Previously created categories will be suggested.',
-    'transactions_create_withdrawal_ffInput_budget'                   => 'Link your withdrawal to a budget for better financial control.',
-    'transactions_create_withdrawal_currency_dropdown_amount'         => 'Use this dropdown when your withdrawal is in another currency.',
-    'transactions_create_deposit_currency_dropdown_amount'            => 'Use this dropdown when your deposit is in another currency.',
-    'transactions_create_transfer_ffInput_piggy_bank_id'              => 'Select a piggy bank and link this transfer to your savings.',
+    'transactions_create_switch_box'                          => 'Use these buttons to quickly switch the type of transaction you wish to save.',
+    'transactions_create_ffInput_category'                    => 'You can freely type in this field. Previously created categories will be suggested.',
+    'transactions_create_withdrawal_ffInput_budget'           => 'Link your withdrawal to a budget for better financial control.',
+    'transactions_create_withdrawal_currency_dropdown_amount' => 'Use this dropdown when your withdrawal is in another currency.',
+    'transactions_create_deposit_currency_dropdown_amount'    => 'Use this dropdown when your deposit is in another currency.',
+    'transactions_create_transfer_ffInput_piggy_bank_id'      => 'Select a piggy bank and link this transfer to your savings.',
 
     // piggy banks index:
-    'piggy-banks_index_saved'                                         => 'This field shows you how much you\'ve saved in each piggy bank.',
-    'piggy-banks_index_button'                                        => 'Next to this progress bar are two buttons (+ and -) to add or remove money from each piggy bank.',
-    'piggy-banks_index_accountStatus'                                 => 'For each asset account with at least one piggy bank the status is listed in this table.',
-
-
+    'piggy-banks_index_saved'                                 => 'This field shows you how much you\'ve saved in each piggy bank.',
+    'piggy-banks_index_button'                                => 'Next to this progress bar are two buttons (+ and -) to add or remove money from each piggy bank.',
+    'piggy-banks_index_accountStatus'                         => 'For each asset account with at least one piggy bank the status is listed in this table.',
 
     // create piggy
-    'piggy-banks_create_name'                                         => 'What is your goal? A new couch, a camera, money for emergencies?',
-    'piggy-banks_create_date'                                         => 'You can set a target date or a deadline for your piggy bank.',
+    'piggy-banks_create_name'                                 => 'What is your goal? A new couch, a camera, money for emergencies?',
+    'piggy-banks_create_date'                                 => 'You can set a target date or a deadline for your piggy bank.',
 
     // show piggy
-    'piggy-banks_show_piggyChart'                                     => 'This chart will show the history of this piggy bank.',
-    'piggy-banks_show_piggyDetails'                                   => 'Some details about your piggy bank',
-    'piggy-banks_show_piggyEvents'                                    => 'Any additions or removals are also listed here.',
+    'piggy-banks_show_piggyChart'                             => 'This chart will show the history of this piggy bank.',
+    'piggy-banks_show_piggyDetails'                           => 'Some details about your piggy bank',
+    'piggy-banks_show_piggyEvents'                            => 'Any additions or removals are also listed here.',
 
     // bill index
-    'bills_index_rules'                                               => 'Here you see which rules will check if this subscription is hit',
-    'bills_index_paid_in_period'                                      => 'This field indicates when the subscription was last paid.',
-    'bills_index_expected_in_period'                                  => 'This field indicates for each subscription if and when the next subscription is expected to hit.',
+    'bills_index_rules'                                       => 'Here you see which rules will check if this subscription is hit',
+    'bills_index_paid_in_period'                              => 'This field indicates when the subscription was last paid.',
+    'bills_index_expected_in_period'                          => 'This field indicates for each subscription if and when the next subscription is expected to hit.',
 
-    'subscriptions_index_rules'                                       => 'Here you see which rules will check if this subscription is hit',
-    'subscriptions_index_paid_in_period'                              => 'This field indicates when the subscription was last paid.',
-    'subscriptions_index_expected_in_period'                          => 'This field indicates for each subscription if and when the next subscription is expected to hit.',
+    'subscriptions_index_rules'                               => 'Here you see which rules will check if this subscription is hit',
+    'subscriptions_index_paid_in_period'                      => 'This field indicates when the subscription was last paid.',
+    'subscriptions_index_expected_in_period'                  => 'This field indicates for each subscription if and when the next subscription is expected to hit.',
 
     // show bill
-    'bills_show_billInfo'                                             => 'This table shows some general information about this subscription.',
-    'bills_show_billButtons'                                          => 'Use this button to re-scan old transactions so they will be matched to this subscription.',
-    'bills_show_billChart'                                            => 'This chart shows the transactions linked to this subscription.',
-    'subscriptions_show_billInfo'                                     => 'This table shows some general information about this subscription.',
-    'subscriptions_show_billButtons'                                  => 'Use this button to re-scan old transactions so they will be matched to this subscription.',
-    'subscriptions_show_billChart'                                    => 'This chart shows the transactions linked to this subscription.',
+    'bills_show_billInfo'                                     => 'This table shows some general information about this subscription.',
+    'bills_show_billButtons'                                  => 'Use this button to re-scan old transactions so they will be matched to this subscription.',
+    'bills_show_billChart'                                    => 'This chart shows the transactions linked to this subscription.',
+    'subscriptions_show_billInfo'                             => 'This table shows some general information about this subscription.',
+    'subscriptions_show_billButtons'                          => 'Use this button to re-scan old transactions so they will be matched to this subscription.',
+    'subscriptions_show_billChart'                            => 'This chart shows the transactions linked to this subscription.',
 
     // create bill
-    'bills_create_intro'                                              => 'Use subscriptions to track the amount of money you\'re due every period. Think about expenses like rent, insurance or mortgage payments.',
-    'bills_create_name'                                               => 'Use a descriptive name such as "Rent" or "Health insurance".',
+    'bills_create_intro'                                      => 'Use subscriptions to track the amount of money you\'re due every period. Think about expenses like rent, insurance or mortgage payments.',
+    'bills_create_name'                                       => 'Use a descriptive name such as "Rent" or "Health insurance".',
     // 'bills_create_match'                                      => 'To match transactions, use terms from those transactions or the expense account involved. All words must match.',
-    'bills_create_amount_min_holder'                                  => 'Select a minimum and maximum amount for this subscription.',
-    'bills_create_repeat_freq_holder'                                 => 'Most subscriptions repeat monthly, but you can set another frequency here.',
-    'bills_create_skip_holder'                                        => 'If a subscription repeats every 2 weeks, the "skip"-field should be set to "1" to skip every other week.',
+    'bills_create_amount_min_holder'                          => 'Select a minimum and maximum amount for this subscription.',
+    'bills_create_repeat_freq_holder'                         => 'Most subscriptions repeat monthly, but you can set another frequency here.',
+    'bills_create_skip_holder'                                => 'If a subscription repeats every 2 weeks, the "skip"-field should be set to "1" to skip every other week.',
 
     // rules index
-    'rules_index_intro'                                               => 'Firefly III allows you to manage rules, that will automagically be applied to any transaction you create or edit.',
-    'rules_index_new_rule_group'                                      => 'You can combine rules in groups for easier management.',
-    'rules_index_new_rule'                                            => 'Create as many rules as you like.',
-    'rules_index_prio_buttons'                                        => 'Order them any way you see fit.',
-    'rules_index_test_buttons'                                        => 'You can test your rules or apply them to existing transactions.',
-    'rules_index_rule-triggers'                                       => 'Rules have "triggers" and "actions" that you can order by drag-and-drop.',
-    'rules_index_outro'                                               => 'Be sure to check out the help pages using the (?) icon in the top right!',
+    'rules_index_intro'                                       => 'Firefly III allows you to manage rules, that will automagically be applied to any transaction you create or edit.',
+    'rules_index_new_rule_group'                              => 'You can combine rules in groups for easier management.',
+    'rules_index_new_rule'                                    => 'Create as many rules as you like.',
+    'rules_index_prio_buttons'                                => 'Order them any way you see fit.',
+    'rules_index_test_buttons'                                => 'You can test your rules or apply them to existing transactions.',
+    'rules_index_rule-triggers'                               => 'Rules have "triggers" and "actions" that you can order by drag-and-drop.',
+    'rules_index_outro'                                       => 'Be sure to check out the help pages using the (?) icon in the top right!',
 
     // create rule:
-    'rules_create_mandatory'                                          => 'Choose a descriptive title, and set when the rule should be fired.',
-    'rules_create_ruletriggerholder'                                  => 'Add as many triggers as you like, but remember that ALL triggers must match before any actions are fired.',
-    'rules_create_test_rule_triggers'                                 => 'Use this button to see which transactions would match your rule.',
-    'rules_create_actions'                                            => 'Set as many actions as you like.',
-
-
+    'rules_create_mandatory'                                  => 'Choose a descriptive title, and set when the rule should be fired.',
+    'rules_create_ruletriggerholder'                          => 'Add as many triggers as you like, but remember that ALL triggers must match before any actions are fired.',
+    'rules_create_test_rule_triggers'                         => 'Use this button to see which transactions would match your rule.',
+    'rules_create_actions'                                    => 'Set as many actions as you like.',
 
     // preferences
-    'preferences_index_tabs'                                          => 'More options are available behind these tabs.',
+    'preferences_index_tabs'                                  => 'More options are available behind these tabs.',
 
     // currencies
-    'currencies_index_intro'                                          => 'Firefly III supports multiple currencies, which you can change on this page.',
-    'currencies_index_default'                                        => 'Firefly III has one default currency.',
-    'currencies_index_buttons'                                        => 'Use these buttons to change the default currency or enable other currencies.',
+    'currencies_index_intro'                                  => 'Firefly III supports multiple currencies, which you can change on this page.',
+    'currencies_index_default'                                => 'Firefly III has one default currency.',
+    'currencies_index_buttons'                                => 'Use these buttons to change the default currency or enable other currencies.',
 
     // create currency
-    'currencies_create_code'                                          => 'This code should be ISO compliant (Google it for your new currency).',
+    'currencies_create_code'                                  => 'This code should be ISO compliant (Google it for your new currency).',
 ];

resources/lang/en_US/list.php

@@ -20,8 +20,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-
-
 declare(strict_types=1);
 
 return [
@@ -29,7 +27,7 @@ return [
     'icon'                    => 'Icon',
     'id'                      => 'ID',
     'create_date'             => 'Created at',
-    'primary_currency'         => 'Primary currency',
+    'primary_currency'        => 'Primary currency',
     'update_date'             => 'Updated at',
     'updated_at'              => 'Updated at',
     'balance_before'          => 'Balance before',
@@ -68,8 +66,6 @@ return [
     'balance_difference'      => 'Balance difference',
     'menu'                    => 'Menu',
 
-
-
     'repeat_freq'             => 'Repeats',
     'description'             => 'Description',
     'amount'                  => 'Amount',
@@ -136,8 +132,6 @@ return [
     'account_at_bunq'         => 'Account with bunq',
     'file_name'               => 'File name',
 
-
-
     'file_size'               => 'File size',
     'file_type'               => 'File type',
     'attached_to'             => 'Attached to',

resources/lang/en_US/pagination.php

@@ -20,11 +20,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-
-
 declare(strict_types=1);
 
-return [
-    'previous' => '&laquo; Previous',
-    'next'     => 'Next &raquo;',
-];
+return ['previous' => '&laquo; Previous', 'next'     => 'Next &raquo;'];

resources/lang/en_US/passwords.php

@@ -20,8 +20,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-
-
 declare(strict_types=1);
 
 return [

resources/lang/en_US/rules.php

@@ -23,59 +23,59 @@
 declare(strict_types=1);
 
 return [
-    'main_message'                                  => 'Action ":action", present in rule ":rule", could not be applied to transaction #:group: :error',
-    'find_or_create_tag_failed'                     => 'Could not find or create tag ":tag"',
-    'tag_already_added'                             => 'Tag ":tag" is already linked to this transaction',
-    'inspect_transaction'                           => 'Inspect transaction ":title" @ Firefly III',
-    'inspect_rule'                                  => 'Inspect rule ":title" @ Firefly III',
-    'journal_other_user'                            => 'This transaction doesn\'t belong to the user',
-    'no_such_journal'                               => 'This transaction doesn\'t exist',
-    'journal_already_no_budget'                     => 'This transaction has no budget, so it cannot be removed',
-    'journal_already_no_category'                   => 'This transaction had no category, so it cannot be removed',
-    'journal_already_no_notes'                      => 'This transaction had no notes, so they cannot be removed',
-    'journal_not_found'                             => 'Firefly III can\'t find the requested transaction',
-    'split_group'                                   => 'Firefly III cannot execute this action on a transaction with multiple splits',
-    'is_already_withdrawal'                         => 'This transaction is already a withdrawal',
-    'is_already_deposit'                            => 'This transaction is already a deposit',
-    'is_already_transfer'                           => 'This transaction is already a transfer',
-    'no_destination'                                => 'Could not find or create destination account ":name"',
-    'is_not_transfer'                               => 'This transaction is not a transfer',
-    'complex_error'                                 => 'Something complicated went wrong. Sorry about that. Please inspect the logs of Firefly III',
-    'no_valid_opposing'                             => 'Conversion failed because there is no valid account named ":account"',
-    'new_notes_empty'                               => 'The notes to be set are empty',
-    'unsupported_transaction_type_withdrawal'       => 'Firefly III cannot convert a ":type" to a withdrawal',
-    'unsupported_transaction_type_deposit'          => 'Firefly III cannot convert a ":type" to a deposit',
-    'unsupported_transaction_type_transfer'         => 'Firefly III cannot convert a ":type" to a transfer',
-    'already_has_source_asset'                      => 'This transaction already has ":name" as the source asset account',
-    'already_has_destination_asset'                 => 'This transaction already has ":name" as the destination asset account',
-    'already_has_destination'                       => 'This transaction already has ":name" as the destination account',
-    'already_has_source'                            => 'This transaction already has ":name" as the source account',
-    'already_linked_to_subscription'                => 'The transaction is already linked to subscription ":name"',
-    'already_linked_to_category'                    => 'The transaction is already linked to category ":name"',
-    'already_linked_to_budget'                      => 'The transaction is already linked to budget ":name"',
-    'cannot_find_subscription'                      => 'Firefly III can\'t find subscription ":name"',
-    'no_notes_to_move'                              => 'The transaction has no notes to move to the description field',
-    'no_tags_to_remove'                             => 'The transaction has no tags to remove',
-    'not_withdrawal'                                => 'The transaction is not a withdrawal',
-    'not_deposit'                                   => 'The transaction is not a deposit',
-    'cannot_find_tag'                               => 'Firefly III can\'t find tag ":tag"',
-    'cannot_find_asset'                             => 'Firefly III can\'t find asset account ":name"',
-    'cannot_find_accounts'                          => 'Firefly III can\'t find the source or destination account',
-    'cannot_find_source_transaction'                => 'Firefly III can\'t find the source transaction',
-    'cannot_find_destination_transaction'           => 'Firefly III can\'t find the destination transaction',
-    'cannot_find_source_transaction_account'        => 'Firefly III can\'t find the source transaction account',
-    'cannot_find_destination_transaction_account'   => 'Firefly III can\'t find the destination transaction account',
-    'cannot_find_piggy'                             => 'Firefly III can\'t find a piggy bank named ":name"',
-    'no_link_piggy'                                 => 'This transaction\'s accounts are not linked to the piggy bank, so no action will be taken',
-    'both_link_piggy'                               => 'This transaction\'s accounts are both linked to the piggy bank, so no action will be taken',
-    'already_linked'                                => 'This transaction is already linked to piggy bank ":name"',
-    'cannot_unlink_tag'                             => 'Tag ":tag" isn\'t linked to this transaction',
-    'cannot_find_budget'                            => 'Firefly III can\'t find budget ":name"',
-    'cannot_find_category'                          => 'Firefly III can\'t find category ":name"',
-    'cannot_set_budget'                             => 'Firefly III can\'t set budget ":name" to a transaction of type ":type"',
-    'journal_invalid_amount'                        => 'Firefly III can\'t set amount ":amount" because it is not a valid number.',
-    'cannot_remove_zero_piggy'                      => 'Cannot remove zero amount from piggy bank ":name"',
-    'cannot_remove_from_piggy'                      => 'Cannot remove :amount from piggy bank ":name"',
-    'cannot_add_zero_piggy'                         => 'Cannot add zero amount to piggy bank ":name"',
-    'cannot_add_to_piggy'                           => 'Cannot add :amount to piggy bank ":name"',
+    'main_message'                                => 'Action ":action", present in rule ":rule", could not be applied to transaction #:group: :error',
+    'find_or_create_tag_failed'                   => 'Could not find or create tag ":tag"',
+    'tag_already_added'                           => 'Tag ":tag" is already linked to this transaction',
+    'inspect_transaction'                         => 'Inspect transaction ":title" @ Firefly III',
+    'inspect_rule'                                => 'Inspect rule ":title" @ Firefly III',
+    'journal_other_user'                          => 'This transaction doesn\'t belong to the user',
+    'no_such_journal'                             => 'This transaction doesn\'t exist',
+    'journal_already_no_budget'                   => 'This transaction has no budget, so it cannot be removed',
+    'journal_already_no_category'                 => 'This transaction had no category, so it cannot be removed',
+    'journal_already_no_notes'                    => 'This transaction had no notes, so they cannot be removed',
+    'journal_not_found'                           => 'Firefly III can\'t find the requested transaction',
+    'split_group'                                 => 'Firefly III cannot execute this action on a transaction with multiple splits',
+    'is_already_withdrawal'                       => 'This transaction is already a withdrawal',
+    'is_already_deposit'                          => 'This transaction is already a deposit',
+    'is_already_transfer'                         => 'This transaction is already a transfer',
+    'no_destination'                              => 'Could not find or create destination account ":name"',
+    'is_not_transfer'                             => 'This transaction is not a transfer',
+    'complex_error'                               => 'Something complicated went wrong. Sorry about that. Please inspect the logs of Firefly III',
+    'no_valid_opposing'                           => 'Conversion failed because there is no valid account named ":account"',
+    'new_notes_empty'                             => 'The notes to be set are empty',
+    'unsupported_transaction_type_withdrawal'     => 'Firefly III cannot convert a ":type" to a withdrawal',
+    'unsupported_transaction_type_deposit'        => 'Firefly III cannot convert a ":type" to a deposit',
+    'unsupported_transaction_type_transfer'       => 'Firefly III cannot convert a ":type" to a transfer',
+    'already_has_source_asset'                    => 'This transaction already has ":name" as the source asset account',
+    'already_has_destination_asset'               => 'This transaction already has ":name" as the destination asset account',
+    'already_has_destination'                     => 'This transaction already has ":name" as the destination account',
+    'already_has_source'                          => 'This transaction already has ":name" as the source account',
+    'already_linked_to_subscription'              => 'The transaction is already linked to subscription ":name"',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
+    'cannot_find_subscription'                    => 'Firefly III can\'t find subscription ":name"',
+    'no_notes_to_move'                            => 'The transaction has no notes to move to the description field',
+    'no_tags_to_remove'                           => 'The transaction has no tags to remove',
+    'not_withdrawal'                              => 'The transaction is not a withdrawal',
+    'not_deposit'                                 => 'The transaction is not a deposit',
+    'cannot_find_tag'                             => 'Firefly III can\'t find tag ":tag"',
+    'cannot_find_asset'                           => 'Firefly III can\'t find asset account ":name"',
+    'cannot_find_accounts'                        => 'Firefly III can\'t find the source or destination account',
+    'cannot_find_source_transaction'              => 'Firefly III can\'t find the source transaction',
+    'cannot_find_destination_transaction'         => 'Firefly III can\'t find the destination transaction',
+    'cannot_find_source_transaction_account'      => 'Firefly III can\'t find the source transaction account',
+    'cannot_find_destination_transaction_account' => 'Firefly III can\'t find the destination transaction account',
+    'cannot_find_piggy'                           => 'Firefly III can\'t find a piggy bank named ":name"',
+    'no_link_piggy'                               => 'This transaction\'s accounts are not linked to the piggy bank, so no action will be taken',
+    'both_link_piggy'                             => 'This transaction\'s accounts are both linked to the piggy bank, so no action will be taken',
+    'already_linked'                              => 'This transaction is already linked to piggy bank ":name"',
+    'cannot_unlink_tag'                           => 'Tag ":tag" isn\'t linked to this transaction',
+    'cannot_find_budget'                          => 'Firefly III can\'t find budget ":name"',
+    'cannot_find_category'                        => 'Firefly III can\'t find category ":name"',
+    'cannot_set_budget'                           => 'Firefly III can\'t set budget ":name" to a transaction of type ":type"',
+    'journal_invalid_amount'                      => 'Firefly III can\'t set amount ":amount" because it is not a valid number.',
+    'cannot_remove_zero_piggy'                    => 'Cannot remove zero amount from piggy bank ":name"',
+    'cannot_remove_from_piggy'                    => 'Cannot remove :amount from piggy bank ":name"',
+    'cannot_add_zero_piggy'                       => 'Cannot add zero amount to piggy bank ":name"',
+    'cannot_add_to_piggy'                         => 'Cannot add :amount to piggy bank ":name"',
 ];

resources/lang/en_US/validation.php

@@ -20,189 +20,186 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-
 declare(strict_types=1);
 
 return [
-    'invalid_account_list' => 'Invalid account type list entry ":value"',
-    'invalid_transaction_type_list' => 'Invalid transaction type list',
-    'limit_exists'                   => 'There is already a budget limit (amount) for this budget and currency in the given period.',
-    'invalid_sort_instruction'       => 'The sort instruction is invalid for an object of type ":object".',
-    'invalid_sort_instruction_index' => 'The sort instruction at index #:index is invalid for an object of type ":object".',
-    'no_sort_instructions'           => 'There are no sort instructions defined for an object of type ":object".',
-    'webhook_budget_info'            => 'Cannot deliver budget information for transaction related webhooks.',
-    'webhook_account_info'           => 'Cannot deliver account information for budget related webhooks.',
-    'webhook_transaction_info'       => 'Cannot deliver transaction information for budget related webhooks.',
-    'invalid_account_type'           => 'A piggy bank can only be linked to asset accounts and liabilities',
-    'unique_currency_code' => 'This currency code is already in use',
-    'invalid_account_currency'       => 'This account does not use the currency you have selected',
-    'current_amount_too_much'        => 'The combined amount in "current_amount" cannot exceed the "target_amount".',
-    'filter_must_be_in'              => 'Filter ":filter" must be one of: :values',
-    'filter_not_string'              => 'Filter ":filter" is expected to be a string of text',
-    'bad_api_filter'                 => 'This API endpoint does not support ":filter" as a filter.',
-    'nog_logged_in'                  => 'You are not logged in.',
-    'prohibited'                     => 'You must not submit anything in field.',
-    'bad_webhook_combination'        => 'Webhook trigger ":trigger" cannot be combined with webhook response ":response".',
-    'unknown_webhook_trigger'        => 'Unknown webhook trigger ":trigger".',
-    'only_any_trigger'               => 'If you select the "Any event"-trigger, you may not select any other triggers.',
-    'bad_type_source'                => 'Firefly III can\'t determine the transaction type based on this source account.',
-    'bad_type_destination'           => 'Firefly III can\'t determine the transaction type based on this destination account.',
-    'missing_where'                  => 'Array is missing "where"-clause',
-    'missing_update'                 => 'Array is missing "update"-clause',
-    'invalid_where_key'              => 'JSON contains an invalid key for the "where"-clause',
-    'invalid_update_key'             => 'JSON contains an invalid key for the "update"-clause',
-    'invalid_query_data'             => 'There is invalid data in the %s:%s field of your query.',
-    'invalid_query_account_type'     => 'Your query contains accounts of different types, which is not allowed.',
-    'invalid_query_currency'         => 'Your query contains accounts that have different currency settings, which is not allowed.',
-    'iban'                           => 'This is not a valid IBAN.',
-    'zero_or_more'                   => 'The value cannot be negative.',
-    'more_than_zero'                 => 'The value must be more than zero.',
-    'more_than_zero_correct'         => 'The value must be zero or more.',
-    'no_asset_account'               => 'This is not an asset account.',
-    'date_or_time'                   => 'The value must be a valid date or time value (ISO 8601).',
-    'source_equals_destination'      => 'The source account equals the destination account.',
-    'unique_account_number_for_user' => 'It looks like this account number is already in use.',
-    'unique_user_group_for_user'     => 'It looks like this administration title is already in use.',
-    'unique_iban_for_user'           => 'It looks like this IBAN is already in use.',
-    'reconciled_forbidden_field'     => 'This transaction is already reconciled, you cannot change the ":field"',
-    'deleted_user'                   => 'Due to security constraints, you cannot register using this email address.',
-    'rule_trigger_value'             => 'This value is invalid for the selected trigger.',
-    'rule_action_expression'         => 'Invalid expression. :error',
-    'rule_action_value'              => 'This value is invalid for the selected action.',
-    'file_already_attached'          => 'Uploaded file ":name" is already attached to this object.',
-    'file_attached'                  => 'Successfully uploaded file ":name".',
-    'file_zero'                      => 'The file is zero bytes in size.',
-    'must_exist'                     => 'The ID in field :attribute does not exist in the database.',
-    'all_accounts_equal'             => 'All accounts in this field must be equal.',
-    'group_title_mandatory'          => 'A group title is mandatory when there is more than one transaction.',
-    'transaction_types_equal'        => 'All splits must be of the same type.',
-    'invalid_transaction_type'       => 'Invalid transaction type.',
-    'invalid_selection'              => 'Your selection is invalid.',
-    'belongs_user'                   => 'This value is linked to an object that does not seem to exist.',
-    'belongs_user_or_user_group'     => 'This value is linked to an object that does not seem to exist in your current financial administration.',
-    'no_access_group'                => 'The user has no access to this administration.',
-    'no_accepted_roles_defined'      => 'No access roles have been defined for this endpoint, access denied.',
-    'at_least_one_transaction'       => 'Need at least one transaction.',
-    'recurring_transaction_id'       => 'Need at least one transaction.',
-    'need_id_to_match'               => 'You need to submit this entry with an ID for the API to be able to match it.',
-    'too_many_unmatched'             => 'Too many submitted transactions cannot be matched to their respective database entries. Make sure existing entries have a valid ID.',
-    'id_does_not_match'              => 'Submitted ID #:id does not match expected ID. Make sure it matches or omit the field.',
-    'at_least_one_repetition'        => 'Need at least one repetition.',
-    'require_repeat_until'           => 'Require either a number of repetitions, or an end date (repeat_until). Not both.',
-    'require_currency_info'          => 'The content of this field is invalid without currency information.',
-    'require_currency_id_code'       => 'Please set either "transaction_currency_id" or "transaction_currency_code".',
-    'not_transfer_account'           => 'This account is not an account that can be used for transfers.',
-    'require_currency_amount'        => 'The content of this field is invalid without foreign amount information.',
-    'require_foreign_currency'       => 'This field requires a number',
-    'require_foreign_dest'           => 'This field value must match the currency of the destination account.',
-    'require_foreign_src'            => 'This field value must match the currency of the source account.',
-    'equal_description'              => 'Transaction description should not equal global description.',
-    'file_invalid_mime'              => 'File ":name" is of type ":mime" which is not accepted as a new upload.',
-    'file_too_large'                 => 'File ":name" is too large.',
-    'belongs_to_user'                => 'The value of :attribute is unknown.',
-    'accepted'                       => 'The :attribute must be accepted.',
-    'bic'                            => 'This is not a valid BIC.',
-    'at_least_one_trigger'           => 'Rule must have at least one trigger.',
-    'at_least_one_active_trigger'    => 'Rule must have at least one active trigger.',
-    'at_least_one_action'            => 'Rule must have at least one action.',
-    'at_least_one_active_action'     => 'Rule must have at least one active action.',
-    'base64'                         => 'This is not valid base64 encoded data.',
-    'model_id_invalid'               => 'The given ID seems invalid for this model.',
-    'less'                           => ':attribute must be less than 10,000,000',
-    'active_url'                     => 'The :attribute is not a valid URL.',
-    'after'                          => 'The :attribute must be a date after :date.',
-    'date_after'                     => 'The start date must be before the end date.',
-    'alpha'                          => 'The :attribute may only contain letters.',
-    'alpha_dash'                     => 'The :attribute may only contain letters, numbers, and dashes.',
-    'alpha_num'                      => 'The :attribute may only contain letters and numbers.',
-    'array'                          => 'The :attribute must be an array.',
-    'unique_for_user'                => 'There already is an entry with this :attribute.',
-    'before'                         => 'The :attribute must be a date before :date.',
-    'unique_object_for_user'         => 'This name is already in use.',
-    'unique_account_for_user'        => 'This account name is already in use.',
+    'invalid_account_list'            => 'Invalid account type list entry ":value"',
+    'invalid_transaction_type_list'   => 'Invalid transaction type list',
+    'limit_exists'                    => 'There is already a budget limit (amount) for this budget and currency in the given period.',
+    'invalid_sort_instruction'        => 'The sort instruction is invalid for an object of type ":object".',
+    'invalid_sort_instruction_index'  => 'The sort instruction at index #:index is invalid for an object of type ":object".',
+    'no_sort_instructions'            => 'There are no sort instructions defined for an object of type ":object".',
+    'webhook_budget_info'             => 'Cannot deliver budget information for transaction related webhooks.',
+    'webhook_account_info'            => 'Cannot deliver account information for budget related webhooks.',
+    'webhook_transaction_info'        => 'Cannot deliver transaction information for budget related webhooks.',
+    'invalid_account_type'            => 'A piggy bank can only be linked to asset accounts and liabilities',
+    'unique_currency_code'            => 'This currency code is already in use',
+    'invalid_account_currency'        => 'This account does not use the currency you have selected',
+    'current_amount_too_much'         => 'The combined amount in "current_amount" cannot exceed the "target_amount".',
+    'filter_must_be_in'               => 'Filter ":filter" must be one of: :values',
+    'filter_not_string'               => 'Filter ":filter" is expected to be a string of text',
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
+    'nog_logged_in'                   => 'You are not logged in.',
+    'prohibited'                      => 'You must not submit anything in field.',
+    'bad_webhook_combination'         => 'Webhook trigger ":trigger" cannot be combined with webhook response ":response".',
+    'unknown_webhook_trigger'         => 'Unknown webhook trigger ":trigger".',
+    'only_any_trigger'                => 'If you select the "Any event"-trigger, you may not select any other triggers.',
+    'bad_type_source'                 => 'Firefly III can\'t determine the transaction type based on this source account.',
+    'bad_type_destination'            => 'Firefly III can\'t determine the transaction type based on this destination account.',
+    'missing_where'                   => 'Array is missing "where"-clause',
+    'missing_update'                  => 'Array is missing "update"-clause',
+    'invalid_where_key'               => 'JSON contains an invalid key for the "where"-clause',
+    'invalid_update_key'              => 'JSON contains an invalid key for the "update"-clause',
+    'invalid_query_data'              => 'There is invalid data in the %s:%s field of your query.',
+    'invalid_query_account_type'      => 'Your query contains accounts of different types, which is not allowed.',
+    'invalid_query_currency'          => 'Your query contains accounts that have different currency settings, which is not allowed.',
+    'iban'                            => 'This is not a valid IBAN.',
+    'zero_or_more'                    => 'The value cannot be negative.',
+    'more_than_zero'                  => 'The value must be more than zero.',
+    'more_than_zero_correct'          => 'The value must be zero or more.',
+    'no_asset_account'                => 'This is not an asset account.',
+    'date_or_time'                    => 'The value must be a valid date or time value (ISO 8601).',
+    'source_equals_destination'       => 'The source account equals the destination account.',
+    'unique_account_number_for_user'  => 'It looks like this account number is already in use.',
+    'unique_user_group_for_user'      => 'It looks like this administration title is already in use.',
+    'unique_iban_for_user'            => 'It looks like this IBAN is already in use.',
+    'reconciled_forbidden_field'      => 'This transaction is already reconciled, you cannot change the ":field"',
+    'deleted_user'                    => 'Due to security constraints, you cannot register using this email address.',
+    'rule_trigger_value'              => 'This value is invalid for the selected trigger.',
+    'rule_action_expression'          => 'Invalid expression. :error',
+    'rule_action_value'               => 'This value is invalid for the selected action.',
+    'file_already_attached'           => 'Uploaded file ":name" is already attached to this object.',
+    'file_attached'                   => 'Successfully uploaded file ":name".',
+    'file_zero'                       => 'The file is zero bytes in size.',
+    'must_exist'                      => 'The ID in field :attribute does not exist in the database.',
+    'all_accounts_equal'              => 'All accounts in this field must be equal.',
+    'group_title_mandatory'           => 'A group title is mandatory when there is more than one transaction.',
+    'transaction_types_equal'         => 'All splits must be of the same type.',
+    'invalid_transaction_type'        => 'Invalid transaction type.',
+    'invalid_selection'               => 'Your selection is invalid.',
+    'belongs_user'                    => 'This value is linked to an object that does not seem to exist.',
+    'belongs_user_or_user_group'      => 'This value is linked to an object that does not seem to exist in your current financial administration.',
+    'no_access_group'                 => 'The user has no access to this administration.',
+    'no_accepted_roles_defined'       => 'No access roles have been defined for this endpoint, access denied.',
+    'at_least_one_transaction'        => 'Need at least one transaction.',
+    'recurring_transaction_id'        => 'Need at least one transaction.',
+    'need_id_to_match'                => 'You need to submit this entry with an ID for the API to be able to match it.',
+    'too_many_unmatched'              => 'Too many submitted transactions cannot be matched to their respective database entries. Make sure existing entries have a valid ID.',
+    'id_does_not_match'               => 'Submitted ID #:id does not match expected ID. Make sure it matches or omit the field.',
+    'at_least_one_repetition'         => 'Need at least one repetition.',
+    'require_repeat_until'            => 'Require either a number of repetitions, or an end date (repeat_until). Not both.',
+    'require_currency_info'           => 'The content of this field is invalid without currency information.',
+    'require_currency_id_code'        => 'Please set either "transaction_currency_id" or "transaction_currency_code".',
+    'not_transfer_account'            => 'This account is not an account that can be used for transfers.',
+    'require_currency_amount'         => 'The content of this field is invalid without foreign amount information.',
+    'require_foreign_currency'        => 'This field requires a number',
+    'require_foreign_dest'            => 'This field value must match the currency of the destination account.',
+    'require_foreign_src'             => 'This field value must match the currency of the source account.',
+    'equal_description'               => 'Transaction description should not equal global description.',
+    'file_invalid_mime'               => 'File ":name" is of type ":mime" which is not accepted as a new upload.',
+    'file_too_large'                  => 'File ":name" is too large.',
+    'belongs_to_user'                 => 'The value of :attribute is unknown.',
+    'accepted'                        => 'The :attribute must be accepted.',
+    'bic'                             => 'This is not a valid BIC.',
+    'at_least_one_trigger'            => 'Rule must have at least one trigger.',
+    'at_least_one_active_trigger'     => 'Rule must have at least one active trigger.',
+    'at_least_one_action'             => 'Rule must have at least one action.',
+    'at_least_one_active_action'      => 'Rule must have at least one active action.',
+    'base64'                          => 'This is not valid base64 encoded data.',
+    'model_id_invalid'                => 'The given ID seems invalid for this model.',
+    'less'                            => ':attribute must be less than 10,000,000',
+    'active_url'                      => 'The :attribute is not a valid URL.',
+    'after'                           => 'The :attribute must be a date after :date.',
+    'date_after'                      => 'The start date must be before the end date.',
+    'alpha'                           => 'The :attribute may only contain letters.',
+    'alpha_dash'                      => 'The :attribute may only contain letters, numbers, and dashes.',
+    'alpha_num'                       => 'The :attribute may only contain letters and numbers.',
+    'array'                           => 'The :attribute must be an array.',
+    'unique_for_user'                 => 'There already is an entry with this :attribute.',
+    'before'                          => 'The :attribute must be a date before :date.',
+    'unique_object_for_user'          => 'This name is already in use.',
+    'unique_account_for_user'         => 'This account name is already in use.',
 
+    'between.numeric'                 => 'The :attribute must be between :min and :max.',
+    'between.file'                    => 'The :attribute must be between :min and :max kilobytes.',
+    'between.string'                  => 'The :attribute must be between :min and :max characters.',
+    'between.array'                   => 'The :attribute must have between :min and :max items.',
+    'between_date'                    => 'The date must be between the given start and end date.',
+    'boolean'                         => 'The :attribute field must be true or false.',
+    'confirmed'                       => 'The :attribute confirmation does not match.',
+    'date'                            => 'The :attribute is not a valid date.',
+    'date_format'                     => 'The :attribute does not match the format :format.',
+    'different'                       => 'The :attribute and :other must be different.',
+    'digits'                          => 'The :attribute must be :digits digits.',
+    'digits_between'                  => 'The :attribute must be between :min and :max digits.',
+    'email'                           => 'The :attribute must be a valid email address.',
+    'filled'                          => 'The :attribute field is required.',
+    'exists'                          => 'The selected :attribute is invalid.',
+    'image'                           => 'The :attribute must be an image.',
+    'in'                              => 'The selected :attribute is invalid.',
+    'integer'                         => 'The :attribute must be an integer.',
+    'ip'                              => 'The :attribute must be a valid IP address.',
+    'json'                            => 'The :attribute must be a valid JSON string.',
+    'max.numeric'                     => 'The :attribute may not be greater than :max.',
+    'max.file'                        => 'The :attribute may not be greater than :max kilobytes.',
+    'max.string'                      => 'The :attribute may not be greater than :max characters.',
+    'max.array'                       => 'The :attribute may not have more than :max items.',
+    'mimes'                           => 'The :attribute must be a file of type: :values.',
+    'min.numeric'                     => 'The :attribute must be at least :min.',
+    'lte.numeric'                     => 'The :attribute must be less than or equal :value.',
+    'min.file'                        => 'The :attribute must be at least :min kilobytes.',
+    'min.string'                      => 'The :attribute must be at least :min characters.',
+    'min.array'                       => 'The :attribute must have at least :min items.',
+    'not_in'                          => 'The selected :attribute is invalid.',
+    'numeric'                         => 'The :attribute must be a number.',
+    'convert_to_itself'               => 'Cannot store currency exchange rate for ":code", because from and to currency are the same.',
+    'invalid_currency_code'           => 'Currency code ":code" is invalid',
+    'scientific_notation'             => 'The :attribute cannot use the scientific notation.',
+    'numeric_primary'                 => 'The primary currency amount must be a number.',
+    'numeric_destination'             => 'The destination amount must be a number.',
+    'numeric_source'                  => 'The source amount must be a number.',
+    'generic_invalid'                 => 'This value is invalid.',
+    'transaction_type_changed'        => 'If you change the type of the transaction, make sure the correct source/destination accounts are set.',
+    'regex'                           => 'The :attribute format is invalid.',
+    'required'                        => 'The :attribute field is required.',
+    'required_if'                     => 'The :attribute field is required when :other is :value.',
+    'required_unless'                 => 'The :attribute field is required unless :other is in :values.',
+    'required_with'                   => 'The :attribute field is required when :values is present.',
+    'required_with_all'               => 'The :attribute field is required when :values is present.',
+    'required_without'                => 'The :attribute field is required when :values is not present.',
+    'required_without_all'            => 'The :attribute field is required when none of :values are present.',
+    'same'                            => 'The :attribute and :other must match.',
+    'size.numeric'                    => 'The :attribute must be :size.',
+    'amount_min_over_max'             => 'The minimum amount cannot be larger than the maximum amount.',
+    'size.file'                       => 'The :attribute must be :size kilobytes.',
+    'size.string'                     => 'The :attribute must be :size characters.',
+    'size.array'                      => 'The :attribute must contain :size items.',
+    'unique'                          => 'The :attribute has already been taken.',
+    'string'                          => 'The :attribute must be a string.',
+    'url'                             => 'The :attribute format is invalid.',
+    'timezone'                        => 'The :attribute must be a valid zone.',
+    '2fa_code'                        => 'The :attribute field is invalid.',
+    'dimensions'                      => 'The :attribute has invalid image dimensions.',
+    'distinct'                        => 'The :attribute field has a duplicate value.',
+    'file'                            => 'The :attribute must be a file.',
+    'in_array'                        => 'The :attribute field does not exist in :other.',
+    'present'                         => 'The :attribute field must be present.',
+    'amount_zero'                     => 'The total amount cannot be zero.',
+    'current_target_amount'           => 'The current amount must be less than the target amount.',
+    'unique_piggy_bank_for_user'      => 'The name of the piggy bank must be unique.',
+    'unique_object_group'             => 'The group name must be unique',
+    'starts_with'                     => 'The value must start with :values.',
+    'unique_webhook'                  => 'You already have a webhook with this combination of URL, trigger, response and delivery.',
+    'unique_existing_webhook'         => 'You already have another webhook with this combination of URL, trigger, response and delivery.',
+    'same_account_type'               => 'Both accounts must be of the same account type',
+    'same_account_currency'           => 'Both accounts must have the same currency setting',
+    'piggy_no_change_currency'        => 'Because there are piggy banks linked to this account, you cannot change the currency of the account.',
 
-    'between.numeric'            => 'The :attribute must be between :min and :max.',
-    'between.file'               => 'The :attribute must be between :min and :max kilobytes.',
-    'between.string'             => 'The :attribute must be between :min and :max characters.',
-    'between.array'              => 'The :attribute must have between :min and :max items.',
-    'between_date'               => 'The date must be between the given start and end date.',
-    'boolean'                    => 'The :attribute field must be true or false.',
-    'confirmed'                  => 'The :attribute confirmation does not match.',
-    'date'                       => 'The :attribute is not a valid date.',
-    'date_format'                => 'The :attribute does not match the format :format.',
-    'different'                  => 'The :attribute and :other must be different.',
-    'digits'                     => 'The :attribute must be :digits digits.',
-    'digits_between'             => 'The :attribute must be between :min and :max digits.',
-    'email'                      => 'The :attribute must be a valid email address.',
-    'filled'                     => 'The :attribute field is required.',
-    'exists'                     => 'The selected :attribute is invalid.',
-    'image'                      => 'The :attribute must be an image.',
-    'in'                         => 'The selected :attribute is invalid.',
-    'integer'                    => 'The :attribute must be an integer.',
-    'ip'                         => 'The :attribute must be a valid IP address.',
-    'json'                       => 'The :attribute must be a valid JSON string.',
-    'max.numeric'                => 'The :attribute may not be greater than :max.',
-    'max.file'                   => 'The :attribute may not be greater than :max kilobytes.',
-    'max.string'                 => 'The :attribute may not be greater than :max characters.',
-    'max.array'                  => 'The :attribute may not have more than :max items.',
-    'mimes'                      => 'The :attribute must be a file of type: :values.',
-    'min.numeric'                => 'The :attribute must be at least :min.',
-    'lte.numeric'                => 'The :attribute must be less than or equal :value.',
-    'min.file'                   => 'The :attribute must be at least :min kilobytes.',
-    'min.string'                 => 'The :attribute must be at least :min characters.',
-    'min.array'                  => 'The :attribute must have at least :min items.',
-    'not_in'                     => 'The selected :attribute is invalid.',
-    'numeric'                    => 'The :attribute must be a number.',
-    'convert_to_itself'          => 'Cannot store currency exchange rate for ":code", because from and to currency are the same.',
-    'invalid_currency_code'      => 'Currency code ":code" is invalid',
-    'scientific_notation'        => 'The :attribute cannot use the scientific notation.',
-    'numeric_primary'            => 'The primary currency amount must be a number.',
-    'numeric_destination'        => 'The destination amount must be a number.',
-    'numeric_source'             => 'The source amount must be a number.',
-    'generic_invalid'            => 'This value is invalid.',
-    'transaction_type_changed'   => 'If you change the type of the transaction, make sure the correct source/destination accounts are set.',
-    'regex'                      => 'The :attribute format is invalid.',
-    'required'                   => 'The :attribute field is required.',
-    'required_if'                => 'The :attribute field is required when :other is :value.',
-    'required_unless'            => 'The :attribute field is required unless :other is in :values.',
-    'required_with'              => 'The :attribute field is required when :values is present.',
-    'required_with_all'          => 'The :attribute field is required when :values is present.',
-    'required_without'           => 'The :attribute field is required when :values is not present.',
-    'required_without_all'       => 'The :attribute field is required when none of :values are present.',
-    'same'                       => 'The :attribute and :other must match.',
-    'size.numeric'               => 'The :attribute must be :size.',
-    'amount_min_over_max'        => 'The minimum amount cannot be larger than the maximum amount.',
-    'size.file'                  => 'The :attribute must be :size kilobytes.',
-    'size.string'                => 'The :attribute must be :size characters.',
-    'size.array'                 => 'The :attribute must contain :size items.',
-    'unique'                     => 'The :attribute has already been taken.',
-    'string'                     => 'The :attribute must be a string.',
-    'url'                        => 'The :attribute format is invalid.',
-    'timezone'                   => 'The :attribute must be a valid zone.',
-    '2fa_code'                   => 'The :attribute field is invalid.',
-    'dimensions'                 => 'The :attribute has invalid image dimensions.',
-    'distinct'                   => 'The :attribute field has a duplicate value.',
-    'file'                       => 'The :attribute must be a file.',
-    'in_array'                   => 'The :attribute field does not exist in :other.',
-    'present'                    => 'The :attribute field must be present.',
-    'amount_zero'                => 'The total amount cannot be zero.',
-    'current_target_amount'      => 'The current amount must be less than the target amount.',
-    'unique_piggy_bank_for_user' => 'The name of the piggy bank must be unique.',
-    'unique_object_group'        => 'The group name must be unique',
-    'starts_with'                => 'The value must start with :values.',
-    'unique_webhook'             => 'You already have a webhook with this combination of URL, trigger, response and delivery.',
-    'unique_existing_webhook'    => 'You already have another webhook with this combination of URL, trigger, response and delivery.',
-    'same_account_type'          => 'Both accounts must be of the same account type',
-    'same_account_currency'      => 'Both accounts must have the same currency setting',
-    'piggy_no_change_currency'   => 'Because there are piggy banks linked to this account, you cannot change the currency of the account.',
-
-
-    'secure_password'             => 'This is not a secure password. Please try again. For more information, visit https://bit.ly/FF3-password',
-    'valid_recurrence_rep_type'   => 'Invalid repetition type for recurring transactions.',
-    'valid_recurrence_rep_moment' => 'Invalid repetition moment for this type of repetition.',
-    'invalid_account_info'        => 'Invalid account information.',
-    'attributes'                  => [
+    'secure_password'                 => 'This is not a secure password. Please try again. For more information, visit https://bit.ly/FF3-password',
+    'valid_recurrence_rep_type'       => 'Invalid repetition type for recurring transactions.',
+    'valid_recurrence_rep_moment'     => 'Invalid repetition moment for this type of repetition.',
+    'invalid_account_info'            => 'Invalid account information.',
+    'attributes'                      => [
         'email'                   => 'email address',
         'description'             => 'description',
         'amount'                  => 'amount',
@@ -241,58 +238,57 @@ return [
     ],
 
     // validation of accounts:
-    'withdrawal_source_need_data' => 'Need to get a valid source account ID and/or valid source account name to continue.',
-    'withdrawal_source_bad_data'  => '[a] Could not find a valid source account when searching for ID ":id" or name ":name".',
-    'withdrawal_dest_need_data'   => '[a] Need to get a valid destination account ID and/or valid destination account name to continue.',
-    'withdrawal_dest_bad_data'    => 'Could not find a valid destination account when searching for ID ":id" or name ":name".',
+    'withdrawal_source_need_data'     => 'Need to get a valid source account ID and/or valid source account name to continue.',
+    'withdrawal_source_bad_data'      => '[a] Could not find a valid source account when searching for ID ":id" or name ":name".',
+    'withdrawal_dest_need_data'       => '[a] Need to get a valid destination account ID and/or valid destination account name to continue.',
+    'withdrawal_dest_bad_data'        => 'Could not find a valid destination account when searching for ID ":id" or name ":name".',
 
-    'withdrawal_dest_iban_exists' => 'This destination account IBAN is already in use by an asset account or a liability and cannot be used as a withdrawal destination.',
-    'deposit_src_iban_exists'     => 'This source account IBAN is already in use by an asset account or a liability and cannot be used as a deposit source.',
+    'withdrawal_dest_iban_exists'     => 'This destination account IBAN is already in use by an asset account or a liability and cannot be used as a withdrawal destination.',
+    'deposit_src_iban_exists'         => 'This source account IBAN is already in use by an asset account or a liability and cannot be used as a deposit source.',
 
-    'reconciliation_source_bad_data' => 'Could not find a valid reconciliation account when searching for ID ":id" or name ":name".',
+    'reconciliation_source_bad_data'  => 'Could not find a valid reconciliation account when searching for ID ":id" or name ":name".',
 
-    'generic_source_bad_data' => '[e] Could not find a valid source account when searching for ID ":id" or name ":name".',
+    'generic_source_bad_data'         => '[e] Could not find a valid source account when searching for ID ":id" or name ":name".',
 
-    'deposit_source_need_data' => 'Need to get a valid source account ID and/or valid source account name to continue.',
-    'deposit_source_bad_data'  => '[b] Could not find a valid source account when searching for ID ":id" or name ":name".',
-    'deposit_dest_need_data'   => '[b] Need to get a valid destination account ID and/or valid destination account name to continue.',
-    'deposit_dest_bad_data'    => 'Could not find a valid destination account when searching for ID ":id" or name ":name".',
-    'deposit_dest_wrong_type'  => 'The submitted destination account is not of the right type.',
+    'deposit_source_need_data'        => 'Need to get a valid source account ID and/or valid source account name to continue.',
+    'deposit_source_bad_data'         => '[b] Could not find a valid source account when searching for ID ":id" or name ":name".',
+    'deposit_dest_need_data'          => '[b] Need to get a valid destination account ID and/or valid destination account name to continue.',
+    'deposit_dest_bad_data'           => 'Could not find a valid destination account when searching for ID ":id" or name ":name".',
+    'deposit_dest_wrong_type'         => 'The submitted destination account is not of the right type.',
 
+    'transfer_source_need_data'       => 'Need to get a valid source account ID and/or valid source account name to continue.',
+    'transfer_source_bad_data'        => '[c] Could not find a valid source account when searching for ID ":id" or name ":name".',
+    'transfer_dest_need_data'         => '[c] Need to get a valid destination account ID and/or valid destination account name to continue.',
+    'transfer_dest_bad_data'          => 'Could not find a valid destination account when searching for ID ":id" or name ":name".',
+    'need_id_in_edit'                 => 'Each split must have transaction_journal_id (either valid ID or 0).',
 
-    'transfer_source_need_data' => 'Need to get a valid source account ID and/or valid source account name to continue.',
-    'transfer_source_bad_data'  => '[c] Could not find a valid source account when searching for ID ":id" or name ":name".',
-    'transfer_dest_need_data'   => '[c] Need to get a valid destination account ID and/or valid destination account name to continue.',
-    'transfer_dest_bad_data'    => 'Could not find a valid destination account when searching for ID ":id" or name ":name".',
-    'need_id_in_edit'           => 'Each split must have transaction_journal_id (either valid ID or 0).',
+    'ob_source_need_data'             => 'Need to get a valid source account ID and/or valid source account name to continue.',
+    'lc_source_need_data'             => 'Need to get a valid source account ID to continue.',
+    'ob_dest_need_data'               => '[d] Need to get a valid destination account ID and/or valid destination account name to continue.',
+    'ob_dest_bad_data'                => 'Could not find a valid destination account when searching for ID ":id" or name ":name".',
+    'reconciliation_either_account'   => 'To submit a reconciliation, you must submit either a source or a destination account. Not both, not neither.',
 
-    'ob_source_need_data'           => 'Need to get a valid source account ID and/or valid source account name to continue.',
-    'lc_source_need_data'           => 'Need to get a valid source account ID to continue.',
-    'ob_dest_need_data'             => '[d] Need to get a valid destination account ID and/or valid destination account name to continue.',
-    'ob_dest_bad_data'              => 'Could not find a valid destination account when searching for ID ":id" or name ":name".',
-    'reconciliation_either_account' => 'To submit a reconciliation, you must submit either a source or a destination account. Not both, not neither.',
+    'generic_invalid_source'          => 'You can\'t use this account as the source account.',
+    'generic_invalid_destination'     => 'You can\'t use this account as the destination account.',
 
-    'generic_invalid_source'      => 'You can\'t use this account as the source account.',
-    'generic_invalid_destination' => 'You can\'t use this account as the destination account.',
+    'generic_no_source'               => 'You must submit source account information or submit a transaction journal ID.',
+    'generic_no_destination'          => 'You must submit destination account information or submit a transaction journal ID.',
 
-    'generic_no_source'      => 'You must submit source account information or submit a transaction journal ID.',
-    'generic_no_destination' => 'You must submit destination account information or submit a transaction journal ID.',
-
-    'gte.numeric'  => 'The :attribute must be greater than or equal to :value.',
-    'gt.numeric'   => 'The :attribute must be greater than :value.',
-    'gte.file'     => 'The :attribute must be greater than or equal to :value kilobytes.',
-    'gte.string'   => 'The :attribute must be greater than or equal to :value characters.',
-    'gte.array'    => 'The :attribute must have :value items or more.',
-    'missing_with' => 'The :attribute cannot be combined with another field.',
+    'gte.numeric'                     => 'The :attribute must be greater than or equal to :value.',
+    'gt.numeric'                      => 'The :attribute must be greater than :value.',
+    'gte.file'                        => 'The :attribute must be greater than or equal to :value kilobytes.',
+    'gte.string'                      => 'The :attribute must be greater than or equal to :value characters.',
+    'gte.array'                       => 'The :attribute must have :value items or more.',
+    'missing_with'                    => 'The :attribute cannot be combined with another field.',
 
     'amount_required_for_auto_budget' => 'The amount is required.',
     'auto_budget_amount_positive'     => 'The amount must be more than zero.',
 
-    'auto_budget_period_mandatory' => 'The auto budget period is a mandatory field.',
+    'auto_budget_period_mandatory'    => 'The auto budget period is a mandatory field.',
 
     // no access to administration:
-    'no_auth_user_group'           => 'You have to be logged in to access this administration.',
-    'no_access_user_group'         => 'You do not have the correct access rights for this administration.',
-    'administration_owner_rename'  => 'You can\'t rename your standard administration.',
-    'existing_mfa_code'            => 'Please enter a valid code',
+    'no_auth_user_group'              => 'You have to be logged in to access this administration.',
+    'no_access_user_group'            => 'You do not have the correct access rights for this administration.',
+    'administration_owner_rename'     => 'You can\'t rename your standard administration.',
+    'existing_mfa_code'               => 'Please enter a valid code',
 ];

resources/views/layout/default.twig

@@ -11,8 +11,6 @@
     <meta name="csrf-token" content="{{ csrf_token() }}">
     <meta name="robots" content="noindex, nofollow, noarchive, noodp, NoImageIndex, noydir">
     <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="color-scheme" content="light dark">
-
     <title>
         {% if pageTitle %}
             {{ pageTitle }} »
@@ -39,6 +37,7 @@
     <link href="v1/lib/adminlte/css/AdminLTE.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css"
           nonce="{{ JS_NONCE }}">
     {% if 'browser' == darkMode %}
+        <meta name="color-scheme" content="light dark">
         <script nonce="{{ JS_NONCE }}">
             // If `prefers-color-scheme` is not supported, fall back to light mode.
             // In this case, light.css will be downloaded with `highest` priority.
@@ -58,12 +57,14 @@
               nonce="{{ JS_NONCE }}" media="(prefers-color-scheme: light)">
     {% endif %}
     {% if 'dark' == darkMode %}
+        <meta name="color-scheme" content="dark">
         <link href="v1/css/daterangepicker-dark.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css"
               nonce="{{ JS_NONCE }}">
         <link href="v1/lib/adminlte/css/skins/skin-dark.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css"
               nonce="{{ JS_NONCE }}">
     {% endif %}
     {% if 'light' == darkMode %}
+        <meta name="color-scheme" content="light">
         <link href="v1/css/daterangepicker-light.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css"
               nonce="{{ JS_NONCE }}">
         <link href="v1/lib/adminlte/css/skins/skin-light.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css"

resources/views/layout/empty.twig

@@ -9,7 +9,6 @@
     <meta name="csrf-token" content="{{ csrf_token() }}">
     <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
     <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="color-scheme" content="light dark">
 
     {# CSS things #}
 
@@ -20,6 +19,7 @@
     {# the theme #}
     <link href="v1/lib/adminlte/css/AdminLTE.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">
     {% if 'browser' == darkMode %}
+        <meta name="color-scheme" content="light dark">
         <script nonce="{{ JS_NONCE }}">
             // If `prefers-color-scheme` is not supported, fall back to light mode.
             // In this case, light.css will be downloaded with `highest` priority.
@@ -35,9 +35,11 @@
         <link href="v1/lib/adminlte/css/skins/skin-light.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}" media="(prefers-color-scheme: light)">
     {% endif %}
     {% if 'dark' == darkMode %}
+        <meta name="color-scheme" content="dark">
         <link href="v1/lib/adminlte/css/skins/skin-dark.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">
     {% endif %}
     {% if 'light' == darkMode %}
+        <meta name="color-scheme" content="light">
         <link href="v1/lib/adminlte/css/skins/skin-light.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">
     {% endif %}
 

resources/views/layout/guest.twig

@@ -5,8 +5,6 @@
     <meta charset="UTF-8">
     <meta name="robots" content="noindex, nofollow, noarchive, noodp, NoImageIndex, noydir">
     <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="color-scheme" content="light dark">
-
     <title>Firefly III
 
         {% if title != "Firefly" and title != "" %}
@@ -30,6 +28,7 @@
     {# the theme #}
     <link href="v1/lib/adminlte/css/AdminLTE.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">
     {% if 'browser' == darkMode %}
+        <meta name="color-scheme" content="light dark">
         <script nonce="{{ JS_NONCE }}">
             // If `prefers-color-scheme` is not supported, fall back to light mode.
             // In this case, light.css will be downloaded with `highest` priority.
@@ -45,9 +44,11 @@
         <link href="v1/lib/adminlte/css/skins/skin-light.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}" media="(prefers-color-scheme: light)">
     {% endif %}
     {% if 'dark' == darkMode %}
+        <meta name="color-scheme" content="dark">
         <link href="v1/lib/adminlte/css/skins/skin-dark.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">
     {% endif %}
     {% if 'light' == darkMode %}
+        <meta name="color-scheme" content="light">
         <link href="v1/lib/adminlte/css/skins/skin-light.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">
     {% endif %}
 

resources/views/settings/configuration/index.twig

@@ -70,6 +70,14 @@ Technical stuff
                             {{ 'setting_use_running_balance_explain'|_ }}
                         </p>
                         {{ ExpandedForm.checkbox('use_running_balance','1', useRunningBalance) }}
+
+                        <h4>
+                            {{ 'setting_enable_batch_processing'|_ }}
+                        </h4>
+                        <p>
+                            {{ 'setting_enable_batch_processing_explain'|_ }}
+                        </p>
+                        {{ ExpandedForm.checkbox('enable_batch_processing','1', enableBatchProcessing) }}
                     </div>
                 </div>
             </div>

routes/api.php

@@ -730,6 +730,19 @@ Route::group(
     }
 );
 
+// Batch API routes:
+Route::group(
+    [
+        'middleware' => ['auth:api,sanctum', 'bindings'],
+        'namespace'  => 'FireflyIII\Api\V1\Controllers\System',
+        'prefix'     => 'v1/batch',
+        'as'         => 'api.v1.batch.',
+    ],
+    static function (): void {
+        Route::post('finish', ['uses' => 'BatchController@finishBatch', 'as' => 'finish']);
+    }
+);
+
 // USER
 
 // Preference API routes:
@@ -743,8 +756,8 @@ Route::group(
         Route::get('', ['uses' => 'PreferencesController@index', 'as' => 'index']);
         Route::post('', ['uses' => 'PreferencesController@store', 'as' => 'store']);
         // Route::get('{preferenceList}', ['uses' => 'PreferencesController@showList', 'as' => 'show-list'])->where('preferenceList', ',+');
-        Route::get('{preference}', ['uses' => 'PreferencesController@show', 'as' => 'show']);
-        Route::put('{preference}', ['uses' => 'PreferencesController@update', 'as' => 'update']);
+        Route::get('{preferenceName}', ['uses' => 'PreferencesController@show', 'as' => 'show']);
+        Route::put('{preferenceName}', ['uses' => 'PreferencesController@update', 'as' => 'update']);
     }
 );