Auto commit for release 'develop' on 2024-04-25

app/Api/V2/Controllers/Autocomplete/AccountController.php

@@ -55,11 +55,7 @@ class AccountController extends Controller
             function ($request, $next) {
                 $this->repository      = app(AccountRepositoryInterface::class);
                 $this->adminRepository = app(AdminAccountRepositoryInterface::class);
-
-                $userGroup             = $this->validateUserGroup($request);
-                if (null !== $userGroup) {
-                    $this->adminRepository->setUserGroup($userGroup);
-                }
+                $this->adminRepository->setUserGroup($this->validateUserGroup($request));
 
                 return $next($request);
             }
@@ -85,7 +81,7 @@ class AccountController extends Controller
         $types           = $data['types'];
         $query           = $data['query'];
         $date            = $this->parameters->get('date') ?? today(config('app.timezone'));
-        $result          = $this->adminRepository->searchAccount((string)$query, $types, $data['limit']);
+        $result          = $this->adminRepository->searchAccount((string) $query, $types, $data['limit']);
         $defaultCurrency = app('amount')->getDefaultCurrency();
         $groupedResult   = [];
         $allItems        = [];
@@ -99,19 +95,19 @@ class AccountController extends Controller
                 $balance         = app('steam')->balance($account, $date);
                 $nameWithBalance = sprintf('%s (%s)', $account->name, app('amount')->formatAnything($currency, $balance, false));
             }
-            $type            = (string)trans(sprintf('firefly.%s', $account->accountType->type));
+            $type            = (string) trans(sprintf('firefly.%s', $account->accountType->type));
             $groupedResult[$type] ??= [
                 'group ' => $type,
                 'items'  => [],
             ];
             $allItems[]      = [
-                'id'                      => (string)$account->id,
-                'value'                   => (string)$account->id,
+                'id'                      => (string) $account->id,
+                'value'                   => (string) $account->id,
                 'name'                    => $account->name,
                 'name_with_balance'       => $nameWithBalance,
                 'label'                   => $nameWithBalance,
                 'type'                    => $account->accountType->type,
-                'currency_id'             => (string)$currency->id,
+                'currency_id'             => (string) $currency->id,
                 'currency_name'           => $currency->name,
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
@@ -123,8 +119,8 @@ class AccountController extends Controller
             $allItems,
             static function (array $left, array $right): int {
                 $order    = [AccountType::ASSET, AccountType::REVENUE, AccountType::EXPENSE];
-                $posLeft  = (int)array_search($left['type'], $order, true);
-                $posRight = (int)array_search($right['type'], $order, true);
+                $posLeft  = (int) array_search($left['type'], $order, true);
+                $posRight = (int) array_search($right['type'], $order, true);
 
                 return $posLeft - $posRight;
             }

app/Api/V2/Controllers/Autocomplete/CategoryController.php

@@ -45,11 +45,7 @@ class CategoryController extends Controller
         $this->middleware(
             function ($request, $next) {
                 $this->repository = app(CategoryRepositoryInterface::class);
-
-                $userGroup        = $this->validateUserGroup($request);
-                if (null !== $userGroup) {
-                    $this->repository->setUserGroup($userGroup);
-                }
+                $this->repository->setUserGroup($this->validateUserGroup($request));
 
                 return $next($request);
             }

app/Api/V2/Controllers/Autocomplete/TagController.php

@@ -45,11 +45,7 @@ class TagController extends Controller
         $this->middleware(
             function ($request, $next) {
                 $this->repository = app(TagRepositoryInterface::class);
-
-                $userGroup        = $this->validateUserGroup($request);
-                if (null !== $userGroup) {
-                    $this->repository->setUserGroup($userGroup);
-                }
+                $this->repository->setUserGroup($this->validateUserGroup($request));
 
                 return $next($request);
             }

app/Api/V2/Controllers/Autocomplete/TransactionController.php

@@ -45,11 +45,7 @@ class TransactionController extends Controller
         $this->middleware(
             function ($request, $next) {
                 $this->repository = app(JournalRepositoryInterface::class);
-
-                $userGroup        = $this->validateUserGroup($request);
-                if (null !== $userGroup) {
-                    $this->repository->setUserGroup($userGroup);
-                }
+                $this->repository->setUserGroup($this->validateUserGroup($request));
 
                 return $next($request);
             }

app/Api/V2/Controllers/Chart/AccountController.php

@@ -55,8 +55,7 @@ class AccountController extends Controller
         $this->middleware(
             function ($request, $next) {
                 $this->repository = app(AccountRepositoryInterface::class);
-                $userGroup        = $this->validateUserGroup($request);
-                $this->repository->setUserGroup($userGroup);
+                $this->repository->setUserGroup($this->validateUserGroup($request));
 
                 return $next($request);
             }

app/Api/V2/Controllers/Chart/BudgetController.php

@@ -64,12 +64,9 @@ class BudgetController extends Controller
                 $this->blRepository  = app(BudgetLimitRepositoryInterface::class);
                 $this->opsRepository = app(OperationsRepositoryInterface::class);
                 $this->currency      = app('amount')->getDefaultCurrency();
-
                 $userGroup           = $this->validateUserGroup($request);
-                if (null !== $userGroup) {
-                    $this->repository->setUserGroup($userGroup);
-                    $this->opsRepository->setUserGroup($userGroup);
-                }
+                $this->repository->setUserGroup($userGroup);
+                $this->opsRepository->setUserGroup($userGroup);
 
                 return $next($request);
             }
@@ -124,11 +121,11 @@ class BudgetController extends Controller
         foreach ($rows as $row) {
             $current  = [
                 'label'                          => $budget->name,
-                'currency_id'                    => (string)$row['currency_id'],
+                'currency_id'                    => (string) $row['currency_id'],
                 'currency_code'                  => $row['currency_code'],
                 'currency_name'                  => $row['currency_name'],
                 'currency_decimal_places'        => $row['currency_decimal_places'],
-                'native_currency_id'             => (string)$row['native_currency_id'],
+                'native_currency_id'             => (string) $row['native_currency_id'],
                 'native_currency_code'           => $row['native_currency_code'],
                 'native_currency_name'           => $row['native_currency_name'],
                 'native_currency_decimal_places' => $row['native_currency_decimal_places'],
@@ -189,12 +186,12 @@ class BudgetController extends Controller
         foreach ($array as $currencyId => $block) {
             $this->currencies[$currencyId] ??= TransactionCurrency::find($currencyId);
             $return[$currencyId]           ??= [
-                'currency_id'                    => (string)$currencyId,
+                'currency_id'                    => (string) $currencyId,
                 'currency_code'                  => $block['currency_code'],
                 'currency_name'                  => $block['currency_name'],
                 'currency_symbol'                => $block['currency_symbol'],
-                'currency_decimal_places'        => (int)$block['currency_decimal_places'],
-                'native_currency_id'             => (string)$this->currency->id,
+                'currency_decimal_places'        => (int) $block['currency_decimal_places'],
+                'native_currency_id'             => (string) $this->currency->id,
                 'native_currency_code'           => $this->currency->code,
                 'native_currency_name'           => $this->currency->name,
                 'native_currency_symbol'         => $this->currency->symbol,

app/Api/V2/Controllers/Chart/CategoryController.php

@@ -57,10 +57,7 @@ class CategoryController extends Controller
             function ($request, $next) {
                 $this->accountRepos  = app(AccountRepositoryInterface::class);
                 $this->currencyRepos = app(CurrencyRepositoryInterface::class);
-                $userGroup           = $this->validateUserGroup($request);
-                if (null !== $userGroup) {
-                    $this->accountRepos->setUserGroup($userGroup);
-                }
+                $this->accountRepos->setUserGroup($this->validateUserGroup($request));
 
                 return $next($request);
             }
@@ -100,25 +97,25 @@ class CategoryController extends Controller
 
         /** @var array $journal */
         foreach ($journals as $journal) {
-            $currencyId                    = (int)$journal['currency_id'];
+            $currencyId                    = (int) $journal['currency_id'];
             $currency                      = $currencies[$currencyId] ?? $this->currencyRepos->find($currencyId);
             $currencies[$currencyId]       = $currency;
-            $categoryName                  = null === $journal['category_name'] ? (string)trans('firefly.no_category') : $journal['category_name'];
+            $categoryName                  = null === $journal['category_name'] ? (string) trans('firefly.no_category') : $journal['category_name'];
             $amount                        = app('steam')->positive($journal['amount']);
             $nativeAmount                  = $converter->convert($default, $currency, $journal['date'], $amount);
             $key                           = sprintf('%s-%s', $categoryName, $currency->code);
-            if ((int)$journal['foreign_currency_id'] === $default->id) {
+            if ((int) $journal['foreign_currency_id'] === $default->id) {
                 $nativeAmount = app('steam')->positive($journal['foreign_amount']);
             }
             // create arrays
             $return[$key] ??= [
                 'label'                          => $categoryName,
-                'currency_id'                    => (string)$currency->id,
+                'currency_id'                    => (string) $currency->id,
                 'currency_code'                  => $currency->code,
                 'currency_name'                  => $currency->name,
                 'currency_symbol'                => $currency->symbol,
                 'currency_decimal_places'        => $currency->decimal_places,
-                'native_currency_id'             => (string)$default->id,
+                'native_currency_id'             => (string) $default->id,
                 'native_currency_code'           => $default->code,
                 'native_currency_name'           => $default->name,
                 'native_currency_symbol'         => $default->symbol,
@@ -138,7 +135,7 @@ class CategoryController extends Controller
 
         // order by native amount
         usort($return, static function (array $a, array $b) {
-            return (float)$a['native_amount'] < (float)$b['native_amount'] ? 1 : -1;
+            return (float) $a['native_amount'] < (float) $b['native_amount'] ? 1 : -1;
         });
         $converter->summarize();
 

app/Api/V2/Controllers/Model/Account/UpdateController.php

@@ -45,11 +45,7 @@ class UpdateController extends Controller
         $this->middleware(
             function ($request, $next) {
                 $this->repository = app(AccountRepositoryInterface::class);
-                // new way of user group validation
-                $userGroup        = $this->validateUserGroup($request);
-                if (null !== $userGroup) {
-                    $this->repository->setUserGroup($userGroup);
-                }
+                $this->repository->setUserGroup($this->validateUserGroup($request));
 
                 return $next($request);
             }

app/Api/V2/Controllers/Model/Bill/IndexController.php

@@ -46,12 +46,7 @@ class IndexController extends Controller
         $this->middleware(
             function ($request, $next) {
                 $this->repository = app(BillRepositoryInterface::class);
-
-                // new way of user group validation
-                $userGroup        = $this->validateUserGroup($request);
-                if (null !== $userGroup) {
-                    $this->repository->setUserGroup($userGroup);
-                }
+                $this->repository->setUserGroup($this->validateUserGroup($request));
 
                 return $next($request);
             }

app/Api/V2/Controllers/Model/Bill/ShowController.php

@@ -46,12 +46,7 @@ class ShowController extends Controller
         $this->middleware(
             function ($request, $next) {
                 $this->repository = app(BillRepositoryInterface::class);
-
-                // new way of user group validation
-                $userGroup        = $this->validateUserGroup($request);
-                if (null !== $userGroup) {
-                    $this->repository->setUserGroup($userGroup);
-                }
+                $this->repository->setUserGroup($this->validateUserGroup($request));
 
                 return $next($request);
             }

app/Api/V2/Controllers/Model/Bill/SumController.php

@@ -45,11 +45,7 @@ class SumController extends Controller
         $this->middleware(
             function ($request, $next) {
                 $this->repository = app(BillRepositoryInterface::class);
-
-                $userGroup        = $this->validateUserGroup($request);
-                if (null !== $userGroup) {
-                    $this->repository->setUserGroup($userGroup);
-                }
+                $this->repository->setUserGroup($this->validateUserGroup($request));
 
                 return $next($request);
             }

app/Api/V2/Controllers/Model/PiggyBank/IndexController.php

@@ -46,11 +46,7 @@ class IndexController extends Controller
         $this->middleware(
             function ($request, $next) {
                 $this->repository = app(PiggyBankRepositoryInterface::class);
-
-                $userGroup        = $this->validateUserGroup($request);
-                if (null !== $userGroup) {
-                    $this->repository->setUserGroup($userGroup);
-                }
+                $this->repository->setUserGroup($this->validateUserGroup($request));
 
                 return $next($request);
             }

app/Api/V2/Controllers/Summary/NetWorthController.php

@@ -52,10 +52,8 @@ class NetWorthController extends Controller
                 $this->repository = app(AccountRepositoryInterface::class);
                 // new way of user group validation
                 $userGroup        = $this->validateUserGroup($request);
-                if (null !== $userGroup) {
-                    $this->netWorth->setUserGroup($userGroup);
-                    $this->repository->setUserGroup($userGroup);
-                }
+                $this->netWorth->setUserGroup($userGroup);
+                $this->repository->setUserGroup($userGroup);
 
                 return $next($request);
             }

app/Console/Commands/Integrity/CreateGroupMemberships.php

@@ -80,7 +80,7 @@ class CreateGroupMemberships extends Command
         // check if membership exists
         $userGroup  = UserGroup::where('title', $user->email)->first();
         if (null === $userGroup) {
-            $userGroup = UserGroup::create(['title' => $user->email, 'default_administration' => true]);
+            $userGroup = UserGroup::create(['title' => $user->email]);
         }
 
         $userRole   = UserRole::where('title', UserRoleEnum::OWNER->value)->first();

app/Http/Controllers/HomeController.php

@@ -151,8 +151,9 @@ class HomeController extends Controller
         }
 
         /** @var Carbon $start */
-        /** @var Carbon $end */
         $start          = session('start', today(config('app.timezone'))->startOfMonth());
+
+        /** @var Carbon $end */
         $end            = session('end', today(config('app.timezone'))->endOfMonth());
         $accounts       = $repository->getAccountsById($frontpageArray);
         $today          = today(config('app.timezone'));

app/Jobs/MailError.php

@@ -130,12 +130,12 @@ class MailError extends Job implements ShouldQueue
         }
         if (file_exists($file)) {
             Log::debug(sprintf('Read file in "%s"', $file));
-            $limits = json_decode(file_get_contents($file), true);
+            $limits = json_decode((string)file_get_contents($file), true);
         }
         // limit reached?
         foreach ($types as $type => $info) {
             Log::debug(sprintf('Now checking limit "%s"', $type), $info);
-            if (!isset($limits[$type])) {
+            if (!array_key_exists($type, $limits)) {
                 Log::debug(sprintf('Limit "%s" reset to zero, did not exist yet.', $type));
                 $limits[$type] = [
                     'time' => time(),

app/Models/UserGroup.php

@@ -98,7 +98,7 @@ class UserGroup extends Model
 {
     use ReturnsIntegerIdTrait;
 
-    protected $fillable = ['title', 'default_administration'];
+    protected $fillable = ['title'];
 
     /**
      * Route binder. Converts the key in the URL to the specified object (or throw 404).

app/Support/Authentication/RemoteUserProvider.php

@@ -80,9 +80,10 @@ class RemoteUserProvider implements UserProvider
                 $roleObject = Role::where('name', 'owner')->first();
                 $user->roles()->attach($roleObject);
             }
-            // make sure the user gets an administration as well.
-            CreateGroupMemberships::createGroupMembership($user);
         }
+        // make sure the user gets an administration as well.
+        CreateGroupMemberships::createGroupMembership($user);
+
         app('log')->debug(sprintf('Going to return user #%d (%s)', $user->id, $user->email));
 
         return $user;

app/Support/Http/Api/ValidatesUserGroupTrait.php

@@ -81,7 +81,7 @@ trait ValidatesUserGroupTrait
             throw new AuthorizationException((string) trans('validation.belongs_user_or_user_group'));
         }
         Log::debug(sprintf('validateUserGroup: validate access of user to group #%d ("%s").', $groupId, $group->title));
-        $roles       = property_exists($this, 'acceptedRoles') ? $this->acceptedRoles : [];
+        $roles       = property_exists($this, 'acceptedRoles') ? $this->acceptedRoles : []; // @phpstan-ignore-line
         if (0 === count($roles)) {
             Log::debug('validateUserGroup: no roles defined, so no access.');
 

app/Support/Request/ConvertsDataTypes.php

@@ -159,9 +159,7 @@ trait ConvertsDataTypes
 
         if (method_exists($this, 'validateUserGroup')) { // @phpstan-ignore-line
             $userGroup = $this->validateUserGroup($this);
-            if (null !== $userGroup) {
-                $repository->setUserGroup($userGroup);
-            }
+            $repository->setUserGroup($userGroup);
         }
 
         // set administration ID

changelog.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 6.1.15 - 2024-04-24
+
+### Fixed
+
+- [Issue 8812](https://github.com/firefly-iii/firefly-iii/issues/8812) (Login with `AUTHENTICATION_GUARD=remote_user_guard` fails due to missing UserGroup) reported by @nebulade
+
 ## 6.1.14 - 2024-04-24
 
 ### Changed

composer.lock

@@ -1670,16 +1670,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.4.0",
+            "version": "v11.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "c1dc67c28811dc5be524a30b18f29ce62126716a"
+                "reference": "e3c24268f1404805e15099b9f035fe310cb30753"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/c1dc67c28811dc5be524a30b18f29ce62126716a",
-                "reference": "c1dc67c28811dc5be524a30b18f29ce62126716a",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/e3c24268f1404805e15099b9f035fe310cb30753",
+                "reference": "e3c24268f1404805e15099b9f035fe310cb30753",
                 "shasum": ""
             },
             "require": {
@@ -1871,20 +1871,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-04-16T14:38:51+00:00"
+            "time": "2024-04-23T15:11:31+00:00"
         },
         {
             "name": "laravel/passport",
-            "version": "v12.1.0",
+            "version": "v12.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/passport.git",
-                "reference": "ff4742c71c58a4941b8738496ba96dabdf5e395b"
+                "reference": "b24c6462835a16163141fbe588533d16603212b7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/passport/zipball/ff4742c71c58a4941b8738496ba96dabdf5e395b",
-                "reference": "ff4742c71c58a4941b8738496ba96dabdf5e395b",
+                "url": "https://api.github.com/repos/laravel/passport/zipball/b24c6462835a16163141fbe588533d16603212b7",
+                "reference": "b24c6462835a16163141fbe588533d16603212b7",
                 "shasum": ""
             },
             "require": {
@@ -1947,20 +1947,20 @@
                 "issues": "https://github.com/laravel/passport/issues",
                 "source": "https://github.com/laravel/passport"
             },
-            "time": "2024-04-15T18:49:04+00:00"
+            "time": "2024-04-17T17:56:14+00:00"
         },
         {
             "name": "laravel/prompts",
-            "version": "v0.1.19",
+            "version": "v0.1.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/prompts.git",
-                "reference": "0ab75ac3434d9f610c5691758a6146a3d1940c18"
+                "reference": "bf9a360c484976692de0f3792f30066f4f4b34a2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/0ab75ac3434d9f610c5691758a6146a3d1940c18",
-                "reference": "0ab75ac3434d9f610c5691758a6146a3d1940c18",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/bf9a360c484976692de0f3792f30066f4f4b34a2",
+                "reference": "bf9a360c484976692de0f3792f30066f4f4b34a2",
                 "shasum": ""
             },
             "require": {
@@ -2002,9 +2002,9 @@
             ],
             "support": {
                 "issues": "https://github.com/laravel/prompts/issues",
-                "source": "https://github.com/laravel/prompts/tree/v0.1.19"
+                "source": "https://github.com/laravel/prompts/tree/v0.1.20"
             },
-            "time": "2024-04-16T14:20:35+00:00"
+            "time": "2024-04-18T00:45:25+00:00"
         },
         {
             "name": "laravel/sanctum",
@@ -5189,16 +5189,16 @@
         },
         {
             "name": "spatie/backtrace",
-            "version": "1.5.3",
+            "version": "1.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/backtrace.git",
-                "reference": "483f76a82964a0431aa836b6ed0edde0c248e3ab"
+                "reference": "8373b9d51638292e3bfd736a9c19a654111b4a23"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/backtrace/zipball/483f76a82964a0431aa836b6ed0edde0c248e3ab",
-                "reference": "483f76a82964a0431aa836b6ed0edde0c248e3ab",
+                "url": "https://api.github.com/repos/spatie/backtrace/zipball/8373b9d51638292e3bfd736a9c19a654111b4a23",
+                "reference": "8373b9d51638292e3bfd736a9c19a654111b4a23",
                 "shasum": ""
             },
             "require": {
@@ -5206,6 +5206,7 @@
             },
             "require-dev": {
                 "ext-json": "*",
+                "laravel/serializable-closure": "^1.3",
                 "phpunit/phpunit": "^9.3",
                 "spatie/phpunit-snapshot-assertions": "^4.2",
                 "symfony/var-dumper": "^5.1"
@@ -5235,7 +5236,7 @@
                 "spatie"
             ],
             "support": {
-                "source": "https://github.com/spatie/backtrace/tree/1.5.3"
+                "source": "https://github.com/spatie/backtrace/tree/1.6.1"
             },
             "funding": [
                 {
@@ -5247,7 +5248,7 @@
                     "type": "other"
                 }
             ],
-            "time": "2023-06-28T12:59:17+00:00"
+            "time": "2024-04-24T13:22:11+00:00"
         },
         {
             "name": "spatie/flare-client-php",
@@ -5403,16 +5404,16 @@
         },
         {
             "name": "spatie/laravel-html",
-            "version": "3.7.0",
+            "version": "3.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-html.git",
-                "reference": "df15763c190954ee46a74e0bf5b4b5bbf2e1f170"
+                "reference": "f1dcd290b9feebf50ad6b5c8e5627b0bf87b7ebe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-html/zipball/df15763c190954ee46a74e0bf5b4b5bbf2e1f170",
-                "reference": "df15763c190954ee46a74e0bf5b4b5bbf2e1f170",
+                "url": "https://api.github.com/repos/spatie/laravel-html/zipball/f1dcd290b9feebf50ad6b5c8e5627b0bf87b7ebe",
+                "reference": "f1dcd290b9feebf50ad6b5c8e5627b0bf87b7ebe",
                 "shasum": ""
             },
             "require": {
@@ -5469,7 +5470,7 @@
                 "spatie"
             ],
             "support": {
-                "source": "https://github.com/spatie/laravel-html/tree/3.7.0"
+                "source": "https://github.com/spatie/laravel-html/tree/3.8.0"
             },
             "funding": [
                 {
@@ -5477,7 +5478,7 @@
                     "type": "custom"
                 }
             ],
-            "time": "2024-03-23T11:28:29+00:00"
+            "time": "2024-04-24T12:52:13+00:00"
         },
         {
             "name": "spatie/laravel-ignition",
@@ -10761,16 +10762,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "10.5.19",
+            "version": "10.5.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "c726f0de022368f6ed103e452a765d3304a996a4"
+                "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c726f0de022368f6ed103e452a765d3304a996a4",
-                "reference": "c726f0de022368f6ed103e452a765d3304a996a4",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/547d314dc24ec1e177720d45c6263fb226cc2ae3",
+                "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3",
                 "shasum": ""
             },
             "require": {
@@ -10842,7 +10843,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.19"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.20"
             },
             "funding": [
                 {
@@ -10858,7 +10859,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-17T14:06:18+00:00"
+            "time": "2024-04-24T06:32:35+00:00"
         },
         {
             "name": "sebastian/cli-parser",

config/debugbar.php

@@ -62,7 +62,7 @@ return [
     |
     */
 
-    'editor'                  => env('DEBUGBAR_EDITOR') ?: env('IGNITION_EDITOR', 'phpstorm'),
+    'editor'                  => env('DEBUGBAR_EDITOR') ?? env('IGNITION_EDITOR', 'phpstorm'),
 
     /*
     |--------------------------------------------------------------------------

config/firefly.php

@@ -117,7 +117,7 @@ return [
         'expression_engine' => false,
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => '6.1.14',
+    'version'                      => 'develop/2024-04-25',
     'api_version'                  => '2.0.14',
     'db_version'                   => 24,
 

package-lock.json

@@ -2402,9 +2402,9 @@
             }
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.16.2.tgz",
-            "integrity": "sha512-VGodkwtEuZ+ENPz/CpDSl091koMv8ao5jHVMbG1vNK+sbx/48/wVzP84M5xSfDAC69mAKKoEkSo+ym9bXYRK9w==",
+            "version": "4.16.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.16.4.tgz",
+            "integrity": "sha512-GkhjAaQ8oUTOKE4g4gsZ0u8K/IHU1+2WQSgS1TwTcYvL+sjbaQjNHFXbOJ6kgqGHIO1DfUhI/Sphi9GkRT9K+Q==",
             "cpu": [
                 "arm"
             ],
@@ -2415,9 +2415,9 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.16.2.tgz",
-            "integrity": "sha512-5/W1xyIdc7jw6c/f1KEtg1vYDBWnWCsLiipK41NiaWGLG93eH2edgE6EgQJ3AGiPERhiOLUqlDSfjRK08C9xFg==",
+            "version": "4.16.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.16.4.tgz",
+            "integrity": "sha512-Bvm6D+NPbGMQOcxvS1zUl8H7DWlywSXsphAeOnVeiZLQ+0J6Is8T7SrjGTH29KtYkiY9vld8ZnpV3G2EPbom+w==",
             "cpu": [
                 "arm64"
             ],
@@ -2428,9 +2428,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.16.2.tgz",
-            "integrity": "sha512-vOAKMqZSTbPfyPVu1jBiy+YniIQd3MG7LUnqV0dA6Q5tyhdqYtxacTHP1+S/ksKl6qCtMG1qQ0grcIgk/19JEA==",
+            "version": "4.16.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.16.4.tgz",
+            "integrity": "sha512-i5d64MlnYBO9EkCOGe5vPR/EeDwjnKOGGdd7zKFhU5y8haKhQZTN2DgVtpODDMxUr4t2K90wTUJg7ilgND6bXw==",
             "cpu": [
                 "arm64"
             ],
@@ -2441,9 +2441,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.16.2.tgz",
-            "integrity": "sha512-aIJVRUS3Dnj6MqocBMrcXlatKm64O3ITeQAdAxVSE9swyhNyV1dwnRgw7IGKIkDQofatd8UqMSyUxuFEa42EcA==",
+            "version": "4.16.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.16.4.tgz",
+            "integrity": "sha512-WZupV1+CdUYehaZqjaFTClJI72fjJEgTXdf4NbW69I9XyvdmztUExBtcI2yIIU6hJtYvtwS6pkTkHJz+k08mAQ==",
             "cpu": [
                 "x64"
             ],
@@ -2454,9 +2454,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.16.2.tgz",
-            "integrity": "sha512-/bjfUiXwy3P5vYr6/ezv//Yle2Y0ak3a+Av/BKoi76nFryjWCkki8AuVoPR7ZU/ckcvAWFo77OnFK14B9B5JsA==",
+            "version": "4.16.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.16.4.tgz",
+            "integrity": "sha512-ADm/xt86JUnmAfA9mBqFcRp//RVRt1ohGOYF6yL+IFCYqOBNwy5lbEK05xTsEoJq+/tJzg8ICUtS82WinJRuIw==",
             "cpu": [
                 "arm"
             ],
@@ -2467,9 +2467,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.16.2.tgz",
-            "integrity": "sha512-S24b+tJHwpq2TNRz9T+r71FjMvyBBApY8EkYxz8Cwi/rhH6h+lu/iDUxyc9PuHf9UvyeBFYkWWcrDahai/NCGw==",
+            "version": "4.16.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.16.4.tgz",
+            "integrity": "sha512-tJfJaXPiFAG+Jn3cutp7mCs1ePltuAgRqdDZrzb1aeE3TktWWJ+g7xK9SNlaSUFw6IU4QgOxAY4rA+wZUT5Wfg==",
             "cpu": [
                 "arm"
             ],
@@ -2480,9 +2480,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.16.2.tgz",
-            "integrity": "sha512-UN7VAXLyeyGbCQWiOtQN7BqmjTDw1ON2Oos4lfk0YR7yNhFEJWZiwGtvj9Ay4lsT/ueT04sh80Sg2MlWVVZ+Ug==",
+            "version": "4.16.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.16.4.tgz",
+            "integrity": "sha512-7dy1BzQkgYlUTapDTvK997cgi0Orh5Iu7JlZVBy1MBURk7/HSbHkzRnXZa19ozy+wwD8/SlpJnOOckuNZtJR9w==",
             "cpu": [
                 "arm64"
             ],
@@ -2493,9 +2493,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.16.2.tgz",
-            "integrity": "sha512-ZBKvz3+rIhQjusKMccuJiPsStCrPOtejCHxTe+yWp3tNnuPWtyCh9QLGPKz6bFNFbwbw28E2T6zDgzJZ05F1JQ==",
+            "version": "4.16.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.16.4.tgz",
+            "integrity": "sha512-zsFwdUw5XLD1gQe0aoU2HVceI6NEW7q7m05wA46eUAyrkeNYExObfRFQcvA6zw8lfRc5BHtan3tBpo+kqEOxmg==",
             "cpu": [
                 "arm64"
             ],
@@ -2506,9 +2506,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.16.2.tgz",
-            "integrity": "sha512-LjMMFiVBRL3wOe095vHAekL4b7nQqf4KZEpdMWd3/W+nIy5o9q/8tlVKiqMbfieDypNXLsxM9fexOxd9Qcklyg==",
+            "version": "4.16.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.16.4.tgz",
+            "integrity": "sha512-p8C3NnxXooRdNrdv6dBmRTddEapfESEUflpICDNKXpHvTjRRq1J82CbU5G3XfebIZyI3B0s074JHMWD36qOW6w==",
             "cpu": [
                 "ppc64"
             ],
@@ -2519,9 +2519,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.16.2.tgz",
-            "integrity": "sha512-ohkPt0lKoCU0s4B6twro2aft+QROPdUiWwOjPNTzwTsBK5w+2+iT9kySdtOdq0gzWJAdiqsV4NFtXOwGZmIsHA==",
+            "version": "4.16.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.16.4.tgz",
+            "integrity": "sha512-Lh/8ckoar4s4Id2foY7jNgitTOUQczwMWNYi+Mjt0eQ9LKhr6sK477REqQkmy8YHY3Ca3A2JJVdXnfb3Rrwkng==",
             "cpu": [
                 "riscv64"
             ],
@@ -2532,9 +2532,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.16.2.tgz",
-            "integrity": "sha512-jm2lvLc+/gqXfndlpDw05jKvsl/HKYxUEAt1h5UXcMFVpO4vGpoWmJVUfKDtTqSaHcCNw1his1XjkgR9aort3w==",
+            "version": "4.16.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.16.4.tgz",
+            "integrity": "sha512-1xwwn9ZCQYuqGmulGsTZoKrrn0z2fAur2ujE60QgyDpHmBbXbxLaQiEvzJWDrscRq43c8DnuHx3QorhMTZgisQ==",
             "cpu": [
                 "s390x"
             ],
@@ -2545,9 +2545,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.16.2.tgz",
-            "integrity": "sha512-oc5/SlITI/Vj/qL4UM+lXN7MERpiy1HEOnrE+SegXwzf7WP9bzmZd6+MDljCEZTdSY84CpvUv9Rq7bCaftn1+g==",
+            "version": "4.16.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.16.4.tgz",
+            "integrity": "sha512-LuOGGKAJ7dfRtxVnO1i3qWc6N9sh0Em/8aZ3CezixSTM+E9Oq3OvTsvC4sm6wWjzpsIlOCnZjdluINKESflJLA==",
             "cpu": [
                 "x64"
             ],
@@ -2558,9 +2558,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.16.2.tgz",
-            "integrity": "sha512-/2VWEBG6mKbS2itm7hzPwhIPaxfZh/KLWrYg20pCRLHhNFtF+epLgcBtwy3m07bl/k86Q3PFRAf2cX+VbZbwzQ==",
+            "version": "4.16.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.16.4.tgz",
+            "integrity": "sha512-ch86i7KkJKkLybDP2AtySFTRi5fM3KXp0PnHocHuJMdZwu7BuyIKi35BE9guMlmTpwwBTB3ljHj9IQXnTCD0vA==",
             "cpu": [
                 "x64"
             ],
@@ -2571,9 +2571,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.16.2.tgz",
-            "integrity": "sha512-Wg7ANh7+hSilF0lG3e/0Oy8GtfTIfEk1327Bw8juZOMOoKmJLs3R+a4JDa/4cHJp2Gs7QfCDTepXXcyFD0ubBg==",
+            "version": "4.16.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.16.4.tgz",
+            "integrity": "sha512-Ma4PwyLfOWZWayfEsNQzTDBVW8PZ6TUUN1uFTBQbF2Chv/+sjenE86lpiEwj2FiviSmSZ4Ap4MaAfl1ciF4aSA==",
             "cpu": [
                 "arm64"
             ],
@@ -2584,9 +2584,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.16.2.tgz",
-            "integrity": "sha512-J/jCDKVMWp0Y2ELnTjpQFYUCUWv1Jr+LdFrJVZtdqGyjDo0PHPa7pCamjHvJel6zBFM3doFFqAr7cmXYWBAbfw==",
+            "version": "4.16.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.16.4.tgz",
+            "integrity": "sha512-9m/ZDrQsdo/c06uOlP3W9G2ENRVzgzbSXmXHT4hwVaDQhYcRpi9bgBT0FTG9OhESxwK0WjQxYOSfv40cU+T69w==",
             "cpu": [
                 "ia32"
             ],
@@ -2597,9 +2597,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.16.2.tgz",
-            "integrity": "sha512-3nIf+SJMs2ZzrCh+SKNqgLVV9hS/UY0UjT1YU8XQYFGLiUfmHYJ/5trOU1XSvmHjV5gTF/K3DjrWxtyzKKcAHA==",
+            "version": "4.16.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.16.4.tgz",
+            "integrity": "sha512-YunpoOAyGLDseanENHmbFvQSfVL5BxW3k7hhy0eN4rb3gS/ct75dVD0EXOWIqFT/nE8XYW6LP6vz6ctKRi0k9A==",
             "cpu": [
                 "x64"
             ],
@@ -2943,39 +2943,39 @@
             }
         },
         "node_modules/@vue/compiler-core": {
-            "version": "3.4.24",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.24.tgz",
-            "integrity": "sha512-vbW/tgbwJYj62N/Ww99x0zhFTkZDTcGh3uwJEuadZ/nF9/xuFMC4693P9r+3sxGXISABpDKvffY5ApH9pmdd1A==",
+            "version": "3.4.25",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.25.tgz",
+            "integrity": "sha512-Y2pLLopaElgWnMNolgG8w3C5nNUVev80L7hdQ5iIKPtMJvhVpG0zhnBG/g3UajJmZdvW0fktyZTotEHD1Srhbg==",
             "dev": true,
             "dependencies": {
                 "@babel/parser": "^7.24.4",
-                "@vue/shared": "3.4.24",
+                "@vue/shared": "3.4.25",
                 "entities": "^4.5.0",
                 "estree-walker": "^2.0.2",
                 "source-map-js": "^1.2.0"
             }
         },
         "node_modules/@vue/compiler-dom": {
-            "version": "3.4.24",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.24.tgz",
-            "integrity": "sha512-4XgABML/4cNndVsQndG6BbGN7+EoisDwi3oXNovqL/4jdNhwvP8/rfRMTb6FxkxIxUUtg6AI1/qZvwfSjxJiWA==",
+            "version": "3.4.25",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.25.tgz",
+            "integrity": "sha512-Ugz5DusW57+HjllAugLci19NsDK+VyjGvmbB2TXaTcSlQxwL++2PETHx/+Qv6qFwNLzSt7HKepPe4DcTE3pBWg==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-core": "3.4.24",
-                "@vue/shared": "3.4.24"
+                "@vue/compiler-core": "3.4.25",
+                "@vue/shared": "3.4.25"
             }
         },
         "node_modules/@vue/compiler-sfc": {
-            "version": "3.4.24",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.24.tgz",
-            "integrity": "sha512-nRAlJUK02FTWfA2nuvNBAqsDZuERGFgxZ8sGH62XgFSvMxO2URblzulExsmj4gFZ8e+VAyDooU9oAoXfEDNxTA==",
+            "version": "3.4.25",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.25.tgz",
+            "integrity": "sha512-m7rryuqzIoQpOBZ18wKyq05IwL6qEpZxFZfRxlNYuIPDqywrXQxgUwLXIvoU72gs6cRdY6wHD0WVZIFE4OEaAQ==",
             "dev": true,
             "dependencies": {
                 "@babel/parser": "^7.24.4",
-                "@vue/compiler-core": "3.4.24",
-                "@vue/compiler-dom": "3.4.24",
-                "@vue/compiler-ssr": "3.4.24",
-                "@vue/shared": "3.4.24",
+                "@vue/compiler-core": "3.4.25",
+                "@vue/compiler-dom": "3.4.25",
+                "@vue/compiler-ssr": "3.4.25",
+                "@vue/shared": "3.4.25",
                 "estree-walker": "^2.0.2",
                 "magic-string": "^0.30.10",
                 "postcss": "^8.4.38",
@@ -2983,13 +2983,13 @@
             }
         },
         "node_modules/@vue/compiler-ssr": {
-            "version": "3.4.24",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.24.tgz",
-            "integrity": "sha512-ZsAtr4fhaUFnVcDqwW3bYCSDwq+9Gk69q2r/7dAHDrOMw41kylaMgOP4zRnn6GIEJkQznKgrMOGPMFnLB52RbQ==",
+            "version": "3.4.25",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.25.tgz",
+            "integrity": "sha512-H2ohvM/Pf6LelGxDBnfbbXFPyM4NE3hrw0e/EpwuSiYu8c819wx+SVGdJ65p/sFrYDd6OnSDxN1MB2mN07hRSQ==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-dom": "3.4.24",
-                "@vue/shared": "3.4.24"
+                "@vue/compiler-dom": "3.4.25",
+                "@vue/shared": "3.4.25"
             }
         },
         "node_modules/@vue/component-compiler-utils": {
@@ -3064,9 +3064,9 @@
             "integrity": "sha512-oJ4F3TnvpXaQwZJNF3ZK+kLPHKarDmJjJ6jyzVNDKH9md1dptjC7lWR//jrGuLdek/U6iltWxqAnYOu8gCiOvA=="
         },
         "node_modules/@vue/shared": {
-            "version": "3.4.24",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.24.tgz",
-            "integrity": "sha512-BW4tajrJBM9AGAknnyEw5tO2xTmnqgup0VTnDAMcxYmqOX0RG0b9aSUGAbEKolD91tdwpA6oCwbltoJoNzpItw==",
+            "version": "3.4.25",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.25.tgz",
+            "integrity": "sha512-k0yappJ77g2+KNrIaF0FFnzwLvUBLUYr8VOwz+/6vLsmItFp51AcxLL7Ey3iPd7BIRyWPOcqUjMnm7OkahXllA==",
             "dev": true
         },
         "node_modules/@webassemblyjs/ast": {
@@ -3373,9 +3373,9 @@
             }
         },
         "node_modules/alpinejs": {
-            "version": "3.13.9",
-            "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.13.9.tgz",
-            "integrity": "sha512-BTEJ3fcUpqKlB+aFYSWGVEp8IP3vA96x7wUaNSdb5SJxV5i7s+/Bduxy9D6TokcqpW5MygsnG1eBEFfr4AnQSw==",
+            "version": "3.13.10",
+            "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.13.10.tgz",
+            "integrity": "sha512-86RB307VWICex0vG15Eq0x058cNNsvS57ohrjN6n/TJAVSFV+zXOK/E34nNHDHc6Poq+yTNCLqEzPqEkRBTMRQ==",
             "dependencies": {
                 "@vue/reactivity": "~3.1.1"
             }
@@ -5095,9 +5095,9 @@
             "dev": true
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.4.746",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.746.tgz",
-            "integrity": "sha512-jeWaIta2rIG2FzHaYIhSuVWqC6KJYo7oSBX4Jv7g+aVujKztfvdpf+n6MGwZdC5hQXbax4nntykLH2juIQrfPg==",
+            "version": "1.4.748",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.748.tgz",
+            "integrity": "sha512-VWqjOlPZn70UZ8FTKUOkUvBLeTQ0xpty66qV0yJcAGY2/CthI4xyW9aEozRVtuwv3Kpf5xTesmJUcPwuJmgP4A==",
             "dev": true
         },
         "node_modules/elliptic": {
@@ -8991,9 +8991,9 @@
             }
         },
         "node_modules/rollup": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.16.2.tgz",
-            "integrity": "sha512-sxDP0+pya/Yi5ZtptF4p3avI+uWCIf/OdrfdH2Gbv1kWddLKk0U7WE3PmQokhi5JrektxsK3sK8s4hzAmjqahw==",
+            "version": "4.16.4",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.16.4.tgz",
+            "integrity": "sha512-kuaTJSUbz+Wsb2ATGvEknkI12XV40vIiHmLuFlejoo7HtDok/O5eDDD0UpCVY5bBX5U5RYo8wWP83H7ZsqVEnA==",
             "dev": true,
             "dependencies": {
                 "@types/estree": "1.0.5"
@@ -9006,22 +9006,22 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.16.2",
-                "@rollup/rollup-android-arm64": "4.16.2",
-                "@rollup/rollup-darwin-arm64": "4.16.2",
-                "@rollup/rollup-darwin-x64": "4.16.2",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.16.2",
-                "@rollup/rollup-linux-arm-musleabihf": "4.16.2",
-                "@rollup/rollup-linux-arm64-gnu": "4.16.2",
-                "@rollup/rollup-linux-arm64-musl": "4.16.2",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.16.2",
-                "@rollup/rollup-linux-riscv64-gnu": "4.16.2",
-                "@rollup/rollup-linux-s390x-gnu": "4.16.2",
-                "@rollup/rollup-linux-x64-gnu": "4.16.2",
-                "@rollup/rollup-linux-x64-musl": "4.16.2",
-                "@rollup/rollup-win32-arm64-msvc": "4.16.2",
-                "@rollup/rollup-win32-ia32-msvc": "4.16.2",
-                "@rollup/rollup-win32-x64-msvc": "4.16.2",
+                "@rollup/rollup-android-arm-eabi": "4.16.4",
+                "@rollup/rollup-android-arm64": "4.16.4",
+                "@rollup/rollup-darwin-arm64": "4.16.4",
+                "@rollup/rollup-darwin-x64": "4.16.4",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.16.4",
+                "@rollup/rollup-linux-arm-musleabihf": "4.16.4",
+                "@rollup/rollup-linux-arm64-gnu": "4.16.4",
+                "@rollup/rollup-linux-arm64-musl": "4.16.4",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.16.4",
+                "@rollup/rollup-linux-riscv64-gnu": "4.16.4",
+                "@rollup/rollup-linux-s390x-gnu": "4.16.4",
+                "@rollup/rollup-linux-x64-gnu": "4.16.4",
+                "@rollup/rollup-linux-x64-musl": "4.16.4",
+                "@rollup/rollup-win32-arm64-msvc": "4.16.4",
+                "@rollup/rollup-win32-ia32-msvc": "4.16.4",
+                "@rollup/rollup-win32-x64-msvc": "4.16.4",
                 "fsevents": "~2.3.2"
             }
         },

public/v2/i18n/de.json

@@ -10,17 +10,17 @@
         "title": "Titel"
     },
     "list": {
-        "drag_and_drop": "Drag and drop",
+        "drag_and_drop": "Ziehen und Ablegen",
         "active": "Aktiv?",
         "name": "Name",
         "type": "Typ",
-        "number": "Account number",
+        "number": "Kontonummer",
         "liability_type": "Verbindlichkeitsart",
-        "current_balance": "Current balance",
-        "last_activity": "Last activity",
-        "amount_due": "Amount due",
-        "balance_difference": "Balance difference",
-        "menu": "Menu"
+        "current_balance": "Aktueller Kontostand",
+        "last_activity": "Letzte Aktivit\u00e4t",
+        "amount_due": "F\u00e4lliger Betrag",
+        "balance_difference": "Saldendifferenz",
+        "menu": "Men\u00fc"
     },
     "validation": {
         "bad_type_source": "Firefly III kann die Buchungsart anhand dieses Quellkontos nicht ermitteln.",
@@ -30,11 +30,11 @@
         "spent": "Ausgegeben",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Ihre Funktion: {{role}}",
-        "administration_role_owner": "Owner",
+        "administration_role_owner": "Inhaber",
         "administration_role_ro": "Schreibgesch\u00fctzt",
         "administration_role_mng_trx": "Buchungen verwalten",
         "administration_role_mng_meta": "Klassifizierungs- und Metadaten verwalten",
-        "administration_role_mng_budgets": "Manage budgets",
+        "administration_role_mng_budgets": "Budgets verwalten",
         "administration_role_mng_piggies": "Sparschweine verwalten",
         "administration_role_mng_subscriptions": "Abonnements verwalten",
         "administration_role_mng_rules": "Regeln verwalten",

public/v2/i18n/de_DE.json

@@ -10,17 +10,17 @@
         "title": "Titel"
     },
     "list": {
-        "drag_and_drop": "Drag and drop",
+        "drag_and_drop": "Ziehen und Ablegen",
         "active": "Aktiv?",
         "name": "Name",
         "type": "Typ",
-        "number": "Account number",
+        "number": "Kontonummer",
         "liability_type": "Verbindlichkeitsart",
-        "current_balance": "Current balance",
-        "last_activity": "Last activity",
-        "amount_due": "Amount due",
-        "balance_difference": "Balance difference",
-        "menu": "Menu"
+        "current_balance": "Aktueller Kontostand",
+        "last_activity": "Letzte Aktivit\u00e4t",
+        "amount_due": "F\u00e4lliger Betrag",
+        "balance_difference": "Saldendifferenz",
+        "menu": "Men\u00fc"
     },
     "validation": {
         "bad_type_source": "Firefly III kann die Buchungsart anhand dieses Quellkontos nicht ermitteln.",
@@ -30,11 +30,11 @@
         "spent": "Ausgegeben",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Ihre Funktion: {{role}}",
-        "administration_role_owner": "Owner",
+        "administration_role_owner": "Inhaber",
         "administration_role_ro": "Schreibgesch\u00fctzt",
         "administration_role_mng_trx": "Buchungen verwalten",
         "administration_role_mng_meta": "Klassifizierungs- und Metadaten verwalten",
-        "administration_role_mng_budgets": "Manage budgets",
+        "administration_role_mng_budgets": "Budgets verwalten",
         "administration_role_mng_piggies": "Sparschweine verwalten",
         "administration_role_mng_subscriptions": "Abonnements verwalten",
         "administration_role_mng_rules": "Regeln verwalten",

public/v2/i18n/fr.json

@@ -10,16 +10,16 @@
         "title": "Titre"
     },
     "list": {
-        "drag_and_drop": "Drag and drop",
+        "drag_and_drop": "Glisser-d\u00e9poser",
         "active": "Actif ?",
         "name": "Nom",
         "type": "Type",
-        "number": "Account number",
+        "number": "N\u00b0 de compte",
         "liability_type": "Type de passif",
-        "current_balance": "Current balance",
-        "last_activity": "Last activity",
-        "amount_due": "Amount due",
-        "balance_difference": "Balance difference",
+        "current_balance": "Solde actuel",
+        "last_activity": "Activit\u00e9 r\u00e9cente",
+        "amount_due": "Montant d\u00fb",
+        "balance_difference": "Diff\u00e9rence de solde",
         "menu": "Menu"
     },
     "validation": {

public/v2/i18n/fr_FR.json

@@ -10,16 +10,16 @@
         "title": "Titre"
     },
     "list": {
-        "drag_and_drop": "Drag and drop",
+        "drag_and_drop": "Glisser-d\u00e9poser",
         "active": "Actif ?",
         "name": "Nom",
         "type": "Type",
-        "number": "Account number",
+        "number": "N\u00b0 de compte",
         "liability_type": "Type de passif",
-        "current_balance": "Current balance",
-        "last_activity": "Last activity",
-        "amount_due": "Amount due",
-        "balance_difference": "Balance difference",
+        "current_balance": "Solde actuel",
+        "last_activity": "Activit\u00e9 r\u00e9cente",
+        "amount_due": "Montant d\u00fb",
+        "balance_difference": "Diff\u00e9rence de solde",
         "menu": "Menu"
     },
     "validation": {

public/v2/i18n/ru.json

@@ -10,17 +10,17 @@
         "title": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a"
     },
     "list": {
-        "drag_and_drop": "Drag and drop",
+        "drag_and_drop": "\u041f\u0435\u0440\u0435\u0442\u0430\u0441\u043a\u0438\u0432\u0430\u043d\u0438\u0435",
         "active": "\u0410\u043a\u0442\u0438\u0432\u0435\u043d?",
         "name": "\u0418\u043c\u044f",
         "type": "\u0422\u0438\u043f",
-        "number": "Account number",
+        "number": "\u041d\u043e\u043c\u0435\u0440 \u0441\u0447\u0435\u0442\u0430",
         "liability_type": "\u0422\u0438\u043f \u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0435\u043d\u043d\u043e\u0441\u0442\u0438",
-        "current_balance": "Current balance",
-        "last_activity": "Last activity",
-        "amount_due": "Amount due",
-        "balance_difference": "Balance difference",
-        "menu": "Menu"
+        "current_balance": "\u0422\u0435\u043a\u0443\u0449\u0438\u0439 \u0431\u0430\u043b\u0430\u043d\u0441",
+        "last_activity": "\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u044f\u044f \u0430\u043a\u0442\u0438\u0432\u043d\u043e\u0441\u0442\u044c",
+        "amount_due": "\u0421\u0443\u043c\u043c\u0430 \u0434\u043e\u043b\u0433\u0430",
+        "balance_difference": "\u0420\u0430\u0437\u043d\u0438\u0446\u0430 \u0431\u0430\u043b\u0430\u043d\u0441\u0430",
+        "menu": "\u041c\u0435\u043d\u044e"
     },
     "validation": {
         "bad_type_source": "Firefly III \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0438\u0442\u044c \u0442\u0438\u043f \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438 \u043d\u0430 \u043e\u0441\u043d\u043e\u0432\u0435 \u044d\u0442\u043e\u0433\u043e \u0438\u0441\u0445\u043e\u0434\u043d\u043e\u0433\u043e \u0441\u0447\u0435\u0442\u0430.",

public/v2/i18n/ru_RU.json

@@ -10,17 +10,17 @@
         "title": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a"
     },
     "list": {
-        "drag_and_drop": "Drag and drop",
+        "drag_and_drop": "\u041f\u0435\u0440\u0435\u0442\u0430\u0441\u043a\u0438\u0432\u0430\u043d\u0438\u0435",
         "active": "\u0410\u043a\u0442\u0438\u0432\u0435\u043d?",
         "name": "\u0418\u043c\u044f",
         "type": "\u0422\u0438\u043f",
-        "number": "Account number",
+        "number": "\u041d\u043e\u043c\u0435\u0440 \u0441\u0447\u0435\u0442\u0430",
         "liability_type": "\u0422\u0438\u043f \u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0435\u043d\u043d\u043e\u0441\u0442\u0438",
-        "current_balance": "Current balance",
-        "last_activity": "Last activity",
-        "amount_due": "Amount due",
-        "balance_difference": "Balance difference",
-        "menu": "Menu"
+        "current_balance": "\u0422\u0435\u043a\u0443\u0449\u0438\u0439 \u0431\u0430\u043b\u0430\u043d\u0441",
+        "last_activity": "\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u044f\u044f \u0430\u043a\u0442\u0438\u0432\u043d\u043e\u0441\u0442\u044c",
+        "amount_due": "\u0421\u0443\u043c\u043c\u0430 \u0434\u043e\u043b\u0433\u0430",
+        "balance_difference": "\u0420\u0430\u0437\u043d\u0438\u0446\u0430 \u0431\u0430\u043b\u0430\u043d\u0441\u0430",
+        "menu": "\u041c\u0435\u043d\u044e"
     },
     "validation": {
         "bad_type_source": "Firefly III \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0438\u0442\u044c \u0442\u0438\u043f \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438 \u043d\u0430 \u043e\u0441\u043d\u043e\u0432\u0435 \u044d\u0442\u043e\u0433\u043e \u0438\u0441\u0445\u043e\u0434\u043d\u043e\u0433\u043e \u0441\u0447\u0435\u0442\u0430.",

public/v2/i18n/zh-cn.json

@@ -10,17 +10,17 @@
         "title": "\u6807\u9898"
     },
     "list": {
-        "drag_and_drop": "Drag and drop",
+        "drag_and_drop": "\u62d6\u653e",
         "active": "\u662f\u5426\u542f\u7528\uff1f",
         "name": "\u540d\u79f0",
         "type": "\u7c7b\u578b",
-        "number": "Account number",
+        "number": "\u8d26\u6237\u53f7\u7801",
         "liability_type": "\u503a\u52a1\u7c7b\u578b",
-        "current_balance": "Current balance",
-        "last_activity": "Last activity",
-        "amount_due": "Amount due",
-        "balance_difference": "Balance difference",
-        "menu": "Menu"
+        "current_balance": "\u5f53\u524d\u4f59\u989d",
+        "last_activity": "\u6700\u540e\u6d3b\u52a8",
+        "amount_due": "\u5230\u671f\u91d1\u989d",
+        "balance_difference": "\u4f59\u989d\u5dee",
+        "menu": "\u83dc\u5355"
     },
     "validation": {
         "bad_type_source": "Firefly III \u65e0\u6cd5\u786e\u5b9a\u57fa\u4e8e\u6b64\u6e90\u8d26\u6237\u7684\u4ea4\u6613\u7c7b\u578b\u3002",
@@ -28,22 +28,22 @@
     },
     "firefly": {
         "spent": "\u652f\u51fa",
-        "administration_owner": "Administration owner: {{email}}",
-        "administration_you": "Your role: {{role}}",
-        "administration_role_owner": "Owner",
-        "administration_role_ro": "Read-only",
-        "administration_role_mng_trx": "Manage transactions",
-        "administration_role_mng_meta": "Manage classification and meta-data",
-        "administration_role_mng_budgets": "Manage budgets",
-        "administration_role_mng_piggies": "Manage piggy banks",
-        "administration_role_mng_subscriptions": "Manage subscriptions",
-        "administration_role_mng_rules": "Manage rules",
-        "administration_role_mng_recurring": "Manage recurring transactions ",
-        "administration_role_mng_webhooks": "Manage webhooks",
-        "administration_role_mng_currencies": "Manage currencies",
-        "administration_role_view_reports": "View reports",
-        "administration_role_full": "Full access",
-        "new_administration_created": "New financial administration \"{{title}}\" has been created",
+        "administration_owner": "\u7ba1\u7406\u5458\u5f52\u5c5e: {{email}}",
+        "administration_you": "\u4f60\u7684\u89d2\u8272: {{role}}",
+        "administration_role_owner": "\u6240\u6709\u8005",
+        "administration_role_ro": "\u53ea\u8bfb",
+        "administration_role_mng_trx": "\u7ba1\u7406\u4ea4\u6613",
+        "administration_role_mng_meta": "\u7ba1\u7406\u5206\u7c7b\u548c\u5143\u6570\u636e",
+        "administration_role_mng_budgets": "\u7ba1\u7406\u9884\u7b97",
+        "administration_role_mng_piggies": "\u7ba1\u7406\u5b58\u94b1\u7f50",
+        "administration_role_mng_subscriptions": "\u7ba1\u7406\u8ba2\u9605",
+        "administration_role_mng_rules": "\u7ba1\u7406\u89c4\u5219",
+        "administration_role_mng_recurring": "\u7ba1\u7406\u5b9a\u671f\u4ea4\u6613 ",
+        "administration_role_mng_webhooks": "\u7ba1\u7406 Webhooks",
+        "administration_role_mng_currencies": "\u7ba1\u7406\u5e01\u79cd",
+        "administration_role_view_reports": "\u67e5\u770b\u62a5\u8868",
+        "administration_role_full": "\u5b8c\u5168\u8bbf\u95ee",
+        "new_administration_created": "\u65b0\u7684\u8d22\u52a1\u7ba1\u7406\u5458 \"{{title}}\" \u5df2\u521b\u5efa",
         "left": "\u5269\u4f59",
         "paid": "\u5df2\u4ed8\u6b3e",
         "errors_submission_v2": "\u60a8\u63d0\u4ea4\u7684\u5185\u5bb9\u6709\u8bef\uff0c\u8bf7\u68c0\u67e5\u9519\u8bef\u4fe1\u606f: {{errorMessage}}",

public/v2/i18n/zh_CN.json

@@ -10,17 +10,17 @@
         "title": "\u6807\u9898"
     },
     "list": {
-        "drag_and_drop": "Drag and drop",
+        "drag_and_drop": "\u62d6\u653e",
         "active": "\u662f\u5426\u542f\u7528\uff1f",
         "name": "\u540d\u79f0",
         "type": "\u7c7b\u578b",
-        "number": "Account number",
+        "number": "\u8d26\u6237\u53f7\u7801",
         "liability_type": "\u503a\u52a1\u7c7b\u578b",
-        "current_balance": "Current balance",
-        "last_activity": "Last activity",
-        "amount_due": "Amount due",
-        "balance_difference": "Balance difference",
-        "menu": "Menu"
+        "current_balance": "\u5f53\u524d\u4f59\u989d",
+        "last_activity": "\u6700\u540e\u6d3b\u52a8",
+        "amount_due": "\u5230\u671f\u91d1\u989d",
+        "balance_difference": "\u4f59\u989d\u5dee",
+        "menu": "\u83dc\u5355"
     },
     "validation": {
         "bad_type_source": "Firefly III \u65e0\u6cd5\u786e\u5b9a\u57fa\u4e8e\u6b64\u6e90\u8d26\u6237\u7684\u4ea4\u6613\u7c7b\u578b\u3002",
@@ -28,22 +28,22 @@
     },
     "firefly": {
         "spent": "\u652f\u51fa",
-        "administration_owner": "Administration owner: {{email}}",
-        "administration_you": "Your role: {{role}}",
-        "administration_role_owner": "Owner",
-        "administration_role_ro": "Read-only",
-        "administration_role_mng_trx": "Manage transactions",
-        "administration_role_mng_meta": "Manage classification and meta-data",
-        "administration_role_mng_budgets": "Manage budgets",
-        "administration_role_mng_piggies": "Manage piggy banks",
-        "administration_role_mng_subscriptions": "Manage subscriptions",
-        "administration_role_mng_rules": "Manage rules",
-        "administration_role_mng_recurring": "Manage recurring transactions ",
-        "administration_role_mng_webhooks": "Manage webhooks",
-        "administration_role_mng_currencies": "Manage currencies",
-        "administration_role_view_reports": "View reports",
-        "administration_role_full": "Full access",
-        "new_administration_created": "New financial administration \"{{title}}\" has been created",
+        "administration_owner": "\u7ba1\u7406\u5458\u5f52\u5c5e: {{email}}",
+        "administration_you": "\u4f60\u7684\u89d2\u8272: {{role}}",
+        "administration_role_owner": "\u6240\u6709\u8005",
+        "administration_role_ro": "\u53ea\u8bfb",
+        "administration_role_mng_trx": "\u7ba1\u7406\u4ea4\u6613",
+        "administration_role_mng_meta": "\u7ba1\u7406\u5206\u7c7b\u548c\u5143\u6570\u636e",
+        "administration_role_mng_budgets": "\u7ba1\u7406\u9884\u7b97",
+        "administration_role_mng_piggies": "\u7ba1\u7406\u5b58\u94b1\u7f50",
+        "administration_role_mng_subscriptions": "\u7ba1\u7406\u8ba2\u9605",
+        "administration_role_mng_rules": "\u7ba1\u7406\u89c4\u5219",
+        "administration_role_mng_recurring": "\u7ba1\u7406\u5b9a\u671f\u4ea4\u6613 ",
+        "administration_role_mng_webhooks": "\u7ba1\u7406 Webhooks",
+        "administration_role_mng_currencies": "\u7ba1\u7406\u5e01\u79cd",
+        "administration_role_view_reports": "\u67e5\u770b\u62a5\u8868",
+        "administration_role_full": "\u5b8c\u5168\u8bbf\u95ee",
+        "new_administration_created": "\u65b0\u7684\u8d22\u52a1\u7ba1\u7406\u5458 \"{{title}}\" \u5df2\u521b\u5efa",
         "left": "\u5269\u4f59",
         "paid": "\u5df2\u4ed8\u6b3e",
         "errors_submission_v2": "\u60a8\u63d0\u4ea4\u7684\u5185\u5bb9\u6709\u8bef\uff0c\u8bf7\u68c0\u67e5\u9519\u8bef\u4fe1\u606f: {{errorMessage}}",

resources/lang/de_DE/firefly.php

@@ -1428,17 +1428,17 @@ return [
     'other_users_in_admin'                                => 'Andere Benutzer in dieser Verwaltung',
     'administrations_create_breadcrumb'                   => 'Neue Finanzverwaltung erstellen',
     'administrations_page_create_sub_title'               => 'Neue Finanzverwaltung erstellen',
-    'basic_administration_information'                    => 'Basic administration information',
+    'basic_administration_information'                    => 'Allgemeine Verwaltungsinformationen',
     'new_administration_created'                          => 'Neue Finanzverwaltung „{{title}}” wurde erstellt',
     'edit_administration_breadcrumb'                      => 'Finanzverwaltung „:title” bearbeiten',
     'administrations_page_edit_sub_title'                 => 'Finanzverwaltung „:title” bearbeiten',
 
     // roles
-    'administration_role_owner'                           => 'Owner',
+    'administration_role_owner'                           => 'Inhaber',
     'administration_role_ro'                              => 'Schreibgeschützt',
     'administration_role_mng_trx'                         => 'Buchungen verwalten',
     'administration_role_mng_meta'                        => 'Klassifizierungs- und Metadaten verwalten',
-    'administration_role_mng_budgets'                     => 'Manage budgets',
+    'administration_role_mng_budgets'                     => 'Budgets verwalten',
     'administration_role_mng_piggies'                     => 'Sparschweine verwalten',
     'administration_role_mng_subscriptions'               => 'Abonnements verwalten',
     'administration_role_mng_rules'                       => 'Regeln verwalten',
@@ -1961,19 +1961,19 @@ return [
     'interest_calc_quarterly'                             => 'Vierteljährlich',
     'initial_balance_account'                             => 'Anfangsguthaben von „:account”',
     'list_options'                                        => 'Listenoptionen',
-    'account_column_opt_drag_and_drop'                    => 'Drag and drop',
-    'account_column_opt_active'                           => 'Active',
+    'account_column_opt_drag_and_drop'                    => 'Ziehen und Ablegen',
+    'account_column_opt_active'                           => 'Aktiv',
     'account_column_opt_name'                             => 'Name',
     'account_column_opt_type'                             => 'Type',
-    'account_column_opt_liability_type'                   => 'Liability type',
+    'account_column_opt_liability_type'                   => 'Haftungsart',
     'account_column_opt_liability_direction'              => 'Liability direction',
     'account_column_opt_liability_interest'               => 'Liability interest',
-    'account_column_opt_number'                           => 'Account number',
-    'account_column_opt_current_balance'                  => 'Current balance',
-    'account_column_opt_amount_due'                       => 'Amount due',
-    'account_column_opt_last_activity'                    => 'Last activity',
-    'account_column_opt_balance_difference'               => 'Balance difference',
-    'account_column_opt_menu'                             => 'Menu',
+    'account_column_opt_number'                           => 'Kontonummer',
+    'account_column_opt_current_balance'                  => 'Aktueller Kontostand',
+    'account_column_opt_amount_due'                       => 'Fälliger Betrag',
+    'account_column_opt_last_activity'                    => 'Letzte Aktivität',
+    'account_column_opt_balance_difference'               => 'Saldendifferenz',
+    'account_column_opt_menu'                             => 'Menü',
 
     // categories:
     'new_category'                                        => 'Neue Kategorie',

resources/lang/de_DE/list.php

@@ -67,13 +67,13 @@ return [
     'source'                  => 'Quelle',
     'next_expected_match'     => 'Nächste erwartete Übereinstimmung',
     'automatch'               => 'Automatisch erkennen?',
-    'drag_and_drop'           => 'Drag and drop',
-    'number'                  => 'Account number',
-    'current_balance'         => 'Current balance',
-    'last_activity'           => 'Last activity',
-    'amount_due'              => 'Amount due',
-    'balance_difference'      => 'Balance difference',
-    'menu'                    => 'Menu',
+    'drag_and_drop'           => 'Ziehen und Ablegen',
+    'number'                  => 'Kontonummer',
+    'current_balance'         => 'Aktueller Kontostand',
+    'last_activity'           => 'Letzte Aktivität',
+    'amount_due'              => 'Fälliger Betrag',
+    'balance_difference'      => 'Saldendifferenz',
+    'menu'                    => 'Menü',
 
     /*
  * PLEASE DO NOT EDIT THIS FILE DIRECTLY.

resources/lang/fr_FR/firefly.php

@@ -1961,18 +1961,18 @@ return [
     'interest_calc_quarterly'                             => 'Par trimestre',
     'initial_balance_account'                             => 'Solde initial du compte :account',
     'list_options'                                        => 'Lister les options',
-    'account_column_opt_drag_and_drop'                    => 'Drag and drop',
-    'account_column_opt_active'                           => 'Active',
-    'account_column_opt_name'                             => 'Name',
+    'account_column_opt_drag_and_drop'                    => 'Glisser-déposer',
+    'account_column_opt_active'                           => 'Actif',
+    'account_column_opt_name'                             => 'Nom',
     'account_column_opt_type'                             => 'Type',
-    'account_column_opt_liability_type'                   => 'Liability type',
-    'account_column_opt_liability_direction'              => 'Liability direction',
-    'account_column_opt_liability_interest'               => 'Liability interest',
-    'account_column_opt_number'                           => 'Account number',
-    'account_column_opt_current_balance'                  => 'Current balance',
-    'account_column_opt_amount_due'                       => 'Amount due',
-    'account_column_opt_last_activity'                    => 'Last activity',
-    'account_column_opt_balance_difference'               => 'Balance difference',
+    'account_column_opt_liability_type'                   => 'Type de passif',
+    'account_column_opt_liability_direction'              => 'Sens du passif',
+    'account_column_opt_liability_interest'               => 'Intérêt du passif',
+    'account_column_opt_number'                           => 'N° de compte',
+    'account_column_opt_current_balance'                  => 'Solde actuel',
+    'account_column_opt_amount_due'                       => 'Montant dû',
+    'account_column_opt_last_activity'                    => 'Activité récente',
+    'account_column_opt_balance_difference'               => 'Différence de solde',
     'account_column_opt_menu'                             => 'Menu',
 
     // categories:

resources/lang/fr_FR/list.php

@@ -67,12 +67,12 @@ return [
     'source'                  => 'Source',
     'next_expected_match'     => 'Prochaine association attendue',
     'automatch'               => 'Correspondance automatique ?',
-    'drag_and_drop'           => 'Drag and drop',
-    'number'                  => 'Account number',
-    'current_balance'         => 'Current balance',
-    'last_activity'           => 'Last activity',
-    'amount_due'              => 'Amount due',
-    'balance_difference'      => 'Balance difference',
+    'drag_and_drop'           => 'Glisser-déposer',
+    'number'                  => 'N° de compte',
+    'current_balance'         => 'Solde actuel',
+    'last_activity'           => 'Activité récente',
+    'amount_due'              => 'Montant dû',
+    'balance_difference'      => 'Différence de solde',
     'menu'                    => 'Menu',
 
     /*

resources/lang/ru_RU/firefly.php

@@ -1961,19 +1961,19 @@ return [
     'interest_calc_quarterly'                             => 'За квартал',
     'initial_balance_account'                             => 'Начальный баланс для счёта :account',
     'list_options'                                        => 'Список настроек',
-    'account_column_opt_drag_and_drop'                    => 'Drag and drop',
-    'account_column_opt_active'                           => 'Active',
-    'account_column_opt_name'                             => 'Name',
-    'account_column_opt_type'                             => 'Type',
-    'account_column_opt_liability_type'                   => 'Liability type',
-    'account_column_opt_liability_direction'              => 'Liability direction',
-    'account_column_opt_liability_interest'               => 'Liability interest',
-    'account_column_opt_number'                           => 'Account number',
-    'account_column_opt_current_balance'                  => 'Current balance',
-    'account_column_opt_amount_due'                       => 'Amount due',
-    'account_column_opt_last_activity'                    => 'Last activity',
-    'account_column_opt_balance_difference'               => 'Balance difference',
-    'account_column_opt_menu'                             => 'Menu',
+    'account_column_opt_drag_and_drop'                    => 'Перетаскивание',
+    'account_column_opt_active'                           => 'Активный',
+    'account_column_opt_name'                             => 'Название',
+    'account_column_opt_type'                             => 'Тип',
+    'account_column_opt_liability_type'                   => 'Тип ответственности',
+    'account_column_opt_liability_direction'              => 'Направление ответственности',
+    'account_column_opt_liability_interest'               => 'Процент ответственности',
+    'account_column_opt_number'                           => 'Номер счета',
+    'account_column_opt_current_balance'                  => 'Текущий баланс',
+    'account_column_opt_amount_due'                       => 'Сумма долга',
+    'account_column_opt_last_activity'                    => 'Последняя активность',
+    'account_column_opt_balance_difference'               => 'Разница баланса',
+    'account_column_opt_menu'                             => 'Меню',
 
     // categories:
     'new_category'                                        => 'Новая категория',

resources/lang/ru_RU/list.php

@@ -67,13 +67,13 @@ return [
     'source'                  => 'Источник',
     'next_expected_match'     => 'Следующий ожидаемый результат',
     'automatch'               => 'Автоподбор?',
-    'drag_and_drop'           => 'Drag and drop',
-    'number'                  => 'Account number',
-    'current_balance'         => 'Current balance',
-    'last_activity'           => 'Last activity',
-    'amount_due'              => 'Amount due',
-    'balance_difference'      => 'Balance difference',
-    'menu'                    => 'Menu',
+    'drag_and_drop'           => 'Перетаскивание',
+    'number'                  => 'Номер счета',
+    'current_balance'         => 'Текущий баланс',
+    'last_activity'           => 'Последняя активность',
+    'amount_due'              => 'Сумма долга',
+    'balance_difference'      => 'Разница баланса',
+    'menu'                    => 'Меню',
 
     /*
  * PLEASE DO NOT EDIT THIS FILE DIRECTLY.

resources/lang/zh_CN/firefly.php

@@ -1420,34 +1420,34 @@ return [
     // Financial administrations
     'administration_index'                                => '财务管理',
     'administrations_index_menu'                          => '财务管理',
-    'administrations_breadcrumb'                          => 'Financial administrations',
-    'administrations_page_title'                          => 'Financial administrations',
-    'administrations_page_sub_title'                      => 'Overview',
-    'create_administration'                               => 'Create new administration',
-    'administration_owner'                                => 'Administration owner: {{email}}',
-    'administration_you'                                  => 'Your role: {{role}}',
-    'other_users_in_admin'                                => 'Other users in this administration',
-    'administrations_create_breadcrumb'                   => 'Create new financial administration',
-    'administrations_page_create_sub_title'               => 'Create new financial administration',
-    'basic_administration_information'                    => 'Basic administration information',
-    'new_administration_created'                          => 'New financial administration "{{title}}" has been created',
-    'edit_administration_breadcrumb'                      => 'Edit financial administration ":title"',
-    'administrations_page_edit_sub_title'                 => 'Edit financial administration ":title"',
+    'administrations_breadcrumb'                          => '财务管理',
+    'administrations_page_title'                          => '财务管理',
+    'administrations_page_sub_title'                      => '概览',
+    'create_administration'                               => '创建新的管理',
+    'administration_owner'                                => '管理员归属: {{email}}',
+    'administration_you'                                  => '你的角色: {{role}}',
+    'other_users_in_admin'                                => '其他的管理员账户',
+    'administrations_create_breadcrumb'                   => '创建新的财务管理',
+    'administrations_page_create_sub_title'               => '创建新的财务管理',
+    'basic_administration_information'                    => '基础管理员信息',
+    'new_administration_created'                          => '新的财务管理员 "{{title}}" 已创建',
+    'edit_administration_breadcrumb'                      => '编辑财务管理员 ":title"',
+    'administrations_page_edit_sub_title'                 => '编辑财务管理员 ":title"',
 
     // roles
-    'administration_role_owner'                           => 'Owner',
-    'administration_role_ro'                              => 'Read-only',
-    'administration_role_mng_trx'                         => 'Manage transactions',
-    'administration_role_mng_meta'                        => 'Manage classification and meta-data',
-    'administration_role_mng_budgets'                     => 'Manage budgets',
-    'administration_role_mng_piggies'                     => 'Manage piggy banks',
-    'administration_role_mng_subscriptions'               => 'Manage subscriptions',
-    'administration_role_mng_rules'                       => 'Manage rules',
-    'administration_role_mng_recurring'                   => 'Manage recurring transactions ',
-    'administration_role_mng_webhooks'                    => 'Manage webhooks',
-    'administration_role_mng_currencies'                  => 'Manage currencies',
-    'administration_role_view_reports'                    => 'View reports',
-    'administration_role_full'                            => 'Full access',
+    'administration_role_owner'                           => '所有者',
+    'administration_role_ro'                              => '只读',
+    'administration_role_mng_trx'                         => '管理交易',
+    'administration_role_mng_meta'                        => '管理分类和元数据',
+    'administration_role_mng_budgets'                     => '管理预算',
+    'administration_role_mng_piggies'                     => '管理存钱罐',
+    'administration_role_mng_subscriptions'               => '管理订阅',
+    'administration_role_mng_rules'                       => '管理规则',
+    'administration_role_mng_recurring'                   => '管理定期交易 ',
+    'administration_role_mng_webhooks'                    => '管理 Webhooks',
+    'administration_role_mng_currencies'                  => '管理币种',
+    'administration_role_view_reports'                    => '查看报表',
+    'administration_role_full'                            => '完全访问',
 
     // profile:
     'purge_data_title'                                    => '从 Frefly III 清除数据',
@@ -1962,19 +1962,19 @@ return [
     'interest_calc_quarterly'                             => '每季度',
     'initial_balance_account'                             => '初始余额账户“:account”',
     'list_options'                                        => '列表选项',
-    'account_column_opt_drag_and_drop'                    => 'Drag and drop',
-    'account_column_opt_active'                           => 'Active',
-    'account_column_opt_name'                             => 'Name',
-    'account_column_opt_type'                             => 'Type',
-    'account_column_opt_liability_type'                   => 'Liability type',
-    'account_column_opt_liability_direction'              => 'Liability direction',
-    'account_column_opt_liability_interest'               => 'Liability interest',
-    'account_column_opt_number'                           => 'Account number',
-    'account_column_opt_current_balance'                  => 'Current balance',
-    'account_column_opt_amount_due'                       => 'Amount due',
-    'account_column_opt_last_activity'                    => 'Last activity',
-    'account_column_opt_balance_difference'               => 'Balance difference',
-    'account_column_opt_menu'                             => 'Menu',
+    'account_column_opt_drag_and_drop'                    => '拖放',
+    'account_column_opt_active'                           => '启用',
+    'account_column_opt_name'                             => '名称',
+    'account_column_opt_type'                             => '类别',
+    'account_column_opt_liability_type'                   => '债务类型',
+    'account_column_opt_liability_direction'              => '赔偿责任方向',
+    'account_column_opt_liability_interest'               => '债务利息',
+    'account_column_opt_number'                           => '账户号码',
+    'account_column_opt_current_balance'                  => '当前余额',
+    'account_column_opt_amount_due'                       => '到期金额',
+    'account_column_opt_last_activity'                    => '最后活动',
+    'account_column_opt_balance_difference'               => '余额差',
+    'account_column_opt_menu'                             => '菜单',
 
     // categories:
     'new_category'                                        => '新分类',
@@ -2158,7 +2158,7 @@ return [
     'logout'                                              => '退出登录',
     'logout_other_sessions'                               => '退出所有其他已登录设备',
     'toggleNavigation'                                    => '切换导览',
-    'toggle_dropdown'                                     => 'Toggle dropdown',
+    'toggle_dropdown'                                     => '切换下拉列表',
     'searchPlaceholder'                                   => '搜索…',
     'version'                                             => '版本',
     'dashboard'                                           => '仪表盘',

resources/lang/zh_CN/list.php

@@ -67,13 +67,13 @@ return [
     'source'                  => '来源',
     'next_expected_match'     => '预期下次支付',
     'automatch'               => '自动匹配？',
-    'drag_and_drop'           => 'Drag and drop',
-    'number'                  => 'Account number',
-    'current_balance'         => 'Current balance',
-    'last_activity'           => 'Last activity',
-    'amount_due'              => 'Amount due',
-    'balance_difference'      => 'Balance difference',
-    'menu'                    => 'Menu',
+    'drag_and_drop'           => '拖放',
+    'number'                  => '账户号码',
+    'current_balance'         => '当前余额',
+    'last_activity'           => '最后活动',
+    'amount_due'              => '到期金额',
+    'balance_difference'      => '余额差',
+    'menu'                    => '菜单',
 
     /*
  * PLEASE DO NOT EDIT THIS FILE DIRECTLY.

resources/lang/zh_CN/validation.php

@@ -68,8 +68,8 @@ return [
     'invalid_selection'               => '您的选择无效',
     'belongs_user'                    => '此值关联至一个似乎不存在的对象。',
     'belongs_user_or_user_group'      => '此值关联至当前财务管理中一个似乎不存在的对象。',
-    'no_access_group'                 => 'The user has no access to this user group.',
-    'no_accepted_roles_defined'       => 'No access roles have been defined for this endpoint, access denied.',
+    'no_access_group'                 => '用户没有访问此用户组的权限。',
+    'no_accepted_roles_defined'       => '此端点没有定义访问角色，访问被拒绝。',
     'at_least_one_transaction'        => '至少需要一笔交易',
     'recurring_transaction_id'        => '至少需要一笔交易。',
     'need_id_to_match'                => '您需要提交一个含有ID的条目，API才能匹配。',
@@ -302,7 +302,7 @@ return [
 
     // no access to administration:
     'no_access_user_group'            => '您没有管理员访问权限',
-    'administration_owner_rename'     => 'You can\'t rename your standard administration.',
+    'administration_owner_rename'     => '您不能重命名您的标准管理员',
 ];
 
 /*