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

app/Api/V2/Controllers/UserGroup/UpdateController.php

@@ -54,9 +54,11 @@ class UpdateController extends Controller
         );
     }
 
-    public function useUserGroup(UserGroup $userGroup): JsonResponse {
+    public function useUserGroup(UserGroup $userGroup): JsonResponse
+    {
         // group validation is already in place, so can just update the user.
         $this->repository->useUserGroup($userGroup);
+
         return response()->json([], 204);
     }
 

app/Console/Commands/Correction/CorrectDatabase.php

@@ -73,7 +73,7 @@ class CorrectDatabase extends Command
             // new!
             'firefly-iii:unify-group-accounts',
             'firefly-iii:trigger-credit-recalculation',
-            'firefly-iii:migrate-preferences'
+            'firefly-iii:migrate-preferences',
         ];
         foreach ($commands as $command) {
             $this->friendlyLine(sprintf('Now executing command "%s"', $command));

app/Console/Commands/Correction/MigratePreferences.php

@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /*
  * MigratePreferences.php
  * Copyright (c) 2024 james@firefly-iii.org.
@@ -49,6 +51,7 @@ class MigratePreferences extends Command
     {
         $items = config('firefly.admin_specific_prefs');
         $users = User::get();
+
         /** @var User $user */
         foreach ($users as $user) {
             $count = 0;
@@ -60,7 +63,7 @@ class MigratePreferences extends Command
                 if (null !== $preference->user_group_id) {
                     $preference->user_group_id = $user->user_group_id;
                     $preference->save();
-                    $count++;
+                    ++$count;
                 }
             }
             if ($count > 0) {
@@ -68,7 +71,6 @@ class MigratePreferences extends Command
             }
         }
 
-
         return CommandAlias::SUCCESS;
     }
 }

app/Console/Commands/Integrity/CreateGroupMemberships.php

@@ -90,7 +90,8 @@ class CreateGroupMemberships extends Command
         }
         $membership = GroupMembership::where('user_id', $user->id)
             ->where('user_group_id', $userGroup->id)
-                                     ->where('user_role_id', $userRole->id)->first();
+            ->where('user_role_id', $userRole->id)->first()
+        ;
         if (null === $membership) {
             GroupMembership::create(
                 [
@@ -105,5 +106,4 @@ class CreateGroupMemberships extends Command
             $user->save();
         }
     }
-
 }

app/Models/Preference.php

@@ -86,8 +86,9 @@ class Preference extends Model
             // some preferences do not have an administration ID.
             // some need it, to make sure the correct one is selected.
             $userGroupId = (int)$user->user_group_id;
-            $userGroupId = $userGroupId === 0 ? null : $userGroupId;
+            $userGroupId = 0 === $userGroupId ? null : $userGroupId;
-            /** @var Preference|null $preference */
+
+            /** @var null|Preference $preference */
             $preference  = null;
             $items       = config('firefly.admin_specific_prefs');
             if (null !== $userGroupId && in_array($value, $items, true)) {

app/Repositories/UserGroup/UserGroupRepository.php

@@ -289,7 +289,8 @@ class UserGroupRepository implements UserGroupRepositoryInterface
         return $roles;
     }
 
-    #[\Override] public function useUserGroup(UserGroup $userGroup): void
+    #[\Override]
+    public function useUserGroup(UserGroup $userGroup): void
     {
         $this->user->user_group_id = $userGroup->id;
         $this->user->save();

app/Rules/IsDefaultUserGroupName.php

@@ -24,12 +24,9 @@ declare(strict_types=1);
 
 namespace FireflyIII\Rules;
 
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Models\UserGroup;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
-use FireflyIII\Repositories\UserGroup\UserGroupRepositoryInterface;
 use FireflyIII\User;
-use FireflyIII\Validation\AccountValidator;
 use Illuminate\Contracts\Validation\ValidationRule;
 
 /**
@@ -38,7 +35,9 @@ use Illuminate\Contracts\Validation\ValidationRule;
 class IsDefaultUserGroupName implements ValidationRule
 {
     private UserGroup $userGroup;
-    public function __construct(UserGroup $userGroup) {
+
+    public function __construct(UserGroup $userGroup)
+    {
         $this->userGroup = $userGroup;
     }
 
@@ -52,6 +51,7 @@ class IsDefaultUserGroupName implements ValidationRule
         // are you owner of this group and the name is the same? fail.
         /** @var User $user */
         $user      = auth()->user();
+
         /** @var UserRepositoryInterface $userRepos */
         $userRepos = app(UserRepositoryInterface::class);
 

app/Support/Preferences.php

@@ -44,11 +44,12 @@ class Preferences
         }
 
         return Preference::where('user_id', $user->id)
-                         ->where(function (Builder $q) use ($user) {
+            ->where(function (Builder $q) use ($user): void {
                 $q->whereNull('user_group_id');
                 $q->orWhere('user_group_id', $user->user_group_id);
             })
-                         ->get();
+            ->get()
+        ;
     }
 
     public function get(string $name, null|array|bool|int|string $default = null): ?Preference
@@ -152,14 +153,14 @@ class Preferences
     public function getArrayForUser(User $user, array $list): array
     {
         $result      = [];
-        $preferences = Preference
+        $preferences = Preference::where('user_id', $user->id)
-            ::where('user_id', $user->id)
+            ->where(function (Builder $q) use ($user): void {
-            ->where(function (Builder $q) use ($user) {
                 $q->whereNull('user_group_id');
                 $q->orWhere('user_group_id', $user->user_group_id);
             })
             ->whereIn('name', $list)
-            ->get(['id', 'name', 'data']);
+            ->get(['id', 'name', 'data'])
+        ;
 
         /** @var Preference $preference */
         foreach ($preferences as $preference) {
@@ -235,6 +236,7 @@ class Preferences
         if (in_array($preferenceName, $items, true)) {
             $groupId = (int)$user->user_group_id;
         }
+
         return $groupId;
     }
 }

app/Transformers/PreferenceTransformer.php

@@ -35,7 +35,8 @@ class PreferenceTransformer extends AbstractTransformer
      */
     public function transform(Preference $preference): array
     {
-        $userGroupId = $preference->user_group_id === 0 ? null : $preference->user_group_id;
+        $userGroupId = 0 === $preference->user_group_id ? null : $preference->user_group_id;
+
         return [
             'id'            => $preference->id,
             'created_at'    => $preference->created_at->toAtomString(),

composer.lock

@@ -8897,23 +8897,23 @@
     "packages-dev": [
         {
             "name": "barryvdh/laravel-debugbar",
-            "version": "v3.12.4",
+            "version": "v3.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-debugbar.git",
-                "reference": "e7a9a217512d8f1d07448fd241ce2ac0922ddc2c"
+                "reference": "354a42f3e0b083cdd6f9da5a9d1c0c63b074547a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/e7a9a217512d8f1d07448fd241ce2ac0922ddc2c",
+                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/354a42f3e0b083cdd6f9da5a9d1c0c63b074547a",
-                "reference": "e7a9a217512d8f1d07448fd241ce2ac0922ddc2c",
+                "reference": "354a42f3e0b083cdd6f9da5a9d1c0c63b074547a",
                 "shasum": ""
             },
             "require": {
                 "illuminate/routing": "^9|^10|^11",
                 "illuminate/session": "^9|^10|^11",
                 "illuminate/support": "^9|^10|^11",
-                "maximebf/debugbar": "~1.21.0",
+                "maximebf/debugbar": "~1.22.0",
                 "php": "^8.0",
                 "symfony/finder": "^6|^7"
             },
@@ -8926,7 +8926,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.10-dev"
+                    "dev-master": "3.13-dev"
                 },
                 "laravel": {
                     "providers": [
@@ -8965,7 +8965,7 @@
             ],
             "support": {
                 "issues": "https://github.com/barryvdh/laravel-debugbar/issues",
-                "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.12.4"
+                "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.13.0"
             },
             "funding": [
                 {
@@ -8977,7 +8977,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-04-01T09:14:15+00:00"
+            "time": "2024-04-01T16:39:30+00:00"
         },
         {
             "name": "barryvdh/laravel-ide-helper",
@@ -9606,25 +9606,27 @@
         },
         {
             "name": "maximebf/debugbar",
-            "version": "v1.21.3",
+            "version": "v1.22.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/maximebf/php-debugbar.git",
-                "reference": "0b407703b08ea0cf6ebc61e267cc96ff7000911b"
+                "reference": "d7b6e1dc2dc85c01ed63ab158b00a7f46abdebcc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/0b407703b08ea0cf6ebc61e267cc96ff7000911b",
+                "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/d7b6e1dc2dc85c01ed63ab158b00a7f46abdebcc",
-                "reference": "0b407703b08ea0cf6ebc61e267cc96ff7000911b",
+                "reference": "d7b6e1dc2dc85c01ed63ab158b00a7f46abdebcc",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1|^8",
+                "php": "^7.2|^8",
                 "psr/log": "^1|^2|^3",
                 "symfony/var-dumper": "^4|^5|^6|^7"
             },
             "require-dev": {
-                "phpunit/phpunit": ">=7.5.20 <10.0",
+                "dbrekelmans/bdi": "^1",
+                "phpunit/phpunit": "^8|^9",
+                "symfony/panther": "^1|^2.1",
                 "twig/twig": "^1.38|^2.7|^3.0"
             },
             "suggest": {
@@ -9635,7 +9637,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.21-dev"
+                    "dev-master": "1.22-dev"
                 }
             },
             "autoload": {
@@ -9666,9 +9668,9 @@
             ],
             "support": {
                 "issues": "https://github.com/maximebf/php-debugbar/issues",
-                "source": "https://github.com/maximebf/php-debugbar/tree/v1.21.3"
+                "source": "https://github.com/maximebf/php-debugbar/tree/v1.22.1"
             },
-            "time": "2024-03-12T14:23:07+00:00"
+            "time": "2024-04-01T10:44:20+00:00"
         },
         {
             "name": "mockery/mockery",

config/firefly.php

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

database/migrations/2024_04_01_174351_expand_preferences_table.php

@@ -1,12 +1,13 @@
 <?php
 
+declare(strict_types=1);
+
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration
+return new class () extends Migration {
-{
     /**
      * Run the migrations.
      */
@@ -31,8 +32,5 @@ return new class extends Migration
     /**
      * Reverse the migrations.
      */
-    public function down(): void
+    public function down(): void {}
-    {
-        //
-    }
 };

public/v2/i18n/nl.json

@@ -3,7 +3,7 @@
         "html_language": "nl",
         "date_time_fns": "d MMMM yyyy @ HH:mm:ss",
         "month_and_day_fns": "d MMMM y",
-        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
+        "date_time_fns_short": "d MMMM yyyy @ HH:mm"
     },
     "validation": {
         "bad_type_source": "Firefly III kan het transactietype niet bepalen op basis van deze bronrekening.",

public/v2/i18n/nl_NL.json

@@ -3,7 +3,7 @@
         "html_language": "nl",
         "date_time_fns": "d MMMM yyyy @ HH:mm:ss",
         "month_and_day_fns": "d MMMM y",
-        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
+        "date_time_fns_short": "d MMMM yyyy @ HH:mm"
     },
     "validation": {
         "bad_type_source": "Firefly III kan het transactietype niet bepalen op basis van deze bronrekening.",

resources/lang/bg_BG/firefly.php

@@ -1426,6 +1426,12 @@ return [
     '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"',
 
     // roles
     'administration_role_owner'                            => 'Owner',

resources/lang/bg_BG/validation.php

@@ -300,6 +300,7 @@ return [
 
     // no access to 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.',
 ];
 
 /*

resources/lang/ca_ES/firefly.php

@@ -1426,6 +1426,12 @@ return [
     '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"',
 
     // roles
     'administration_role_owner'                            => 'Owner',

resources/lang/ca_ES/validation.php

@@ -300,6 +300,7 @@ return [
 
     // no access to administration:
     'no_access_user_group'            => 'No tens accés a aquesta administració.',
+    'administration_owner_rename'     => 'You can\'t rename your standard administration.',
 ];
 
 /*

resources/lang/cs_CZ/firefly.php

@@ -1426,6 +1426,12 @@ return [
     '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"',
 
     // roles
     'administration_role_owner'                            => 'Owner',

resources/lang/cs_CZ/validation.php

@@ -300,6 +300,7 @@ return [
 
     // no access to 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.',
 ];
 
 /*

resources/lang/da_DK/firefly.php

@@ -1426,6 +1426,12 @@ return [
     '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"',
 
     // roles
     'administration_role_owner'                            => 'Owner',

resources/lang/da_DK/validation.php

@@ -300,6 +300,7 @@ return [
 
     // no access to administration:
     'no_access_user_group'            => 'Du har ikke de korrekte adgangsrettigheder for denne administration.',
+    'administration_owner_rename'     => 'You can\'t rename your standard administration.',
 ];
 
 /*

resources/lang/de_DE/firefly.php

@@ -1424,23 +1424,29 @@ return [
     'administrations_page_sub_title'                       => 'Übersicht',
     'create_administration'                                => 'Create new administration',
     'administration_owner'                                 => 'Administration owner: {{email}}',
-    'administration_you'                                  => 'Your role: {{role}}',
+    'administration_you'                                   => 'Ihre Funktion: {{role}}',
-    'other_users_in_admin'                                => 'Other users in this administration',
+    'other_users_in_admin'                                 => 'Andere Benutzer in dieser Verwaltung',
+    '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"',
 
     // roles
     'administration_role_owner'                            => 'Owner',
-    'administration_role_ro'                              => 'Read-only',
+    'administration_role_ro'                               => 'Schreibgeschützt',
-    'administration_role_mng_trx'                         => 'Manage transactions',
+    'administration_role_mng_trx'                          => 'Buchungen verwalten',
-    'administration_role_mng_meta'                        => 'Manage classification and meta-data',
+    'administration_role_mng_meta'                         => 'Klassifizierungs- und Metadaten verwalten',
     'administration_role_mng_budgets'                      => 'Manage budgets',
-    'administration_role_mng_piggies'                     => 'Manage piggy banks',
+    'administration_role_mng_piggies'                      => 'Sparschweine verwalten',
-    'administration_role_mng_subscriptions'               => 'Manage subscriptions',
+    'administration_role_mng_subscriptions'                => 'Abonnements verwalten',
-    'administration_role_mng_rules'                       => 'Manage rules',
+    'administration_role_mng_rules'                        => 'Regeln verwalten',
-    'administration_role_mng_recurring'                   => 'Manage recurring transactions ',
+    'administration_role_mng_recurring'                    => 'Daueraufträge verwalten ',
-    'administration_role_mng_webhooks'                    => 'Manage webhooks',
+    'administration_role_mng_webhooks'                     => 'Webhooks verwalten',
-    'administration_role_mng_currencies'                  => 'Manage currencies',
+    'administration_role_mng_currencies'                   => 'Währungen verwalten',
-    'administration_role_view_reports'                    => 'View reports',
+    'administration_role_view_reports'                     => 'Berichte anzeigen',
-    'administration_role_full'                            => 'Full access',
+    'administration_role_full'                             => 'Vollständiger Zugriff',
 
     // profile:
     'purge_data_title'                                     => 'Daten aus Firefly III vernichten',

resources/lang/de_DE/validation.php

@@ -300,6 +300,7 @@ return [
 
     // no access to administration:
     'no_access_user_group'            => 'Für diese Verwaltung haben Sie nicht die erforderlichen Zugriffsrechte.',
+    'administration_owner_rename'     => 'You can\'t rename your standard administration.',
 ];
 
 /*

resources/lang/el_GR/firefly.php

@@ -1426,6 +1426,12 @@ return [
     '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"',
 
     // roles
     'administration_role_owner'                            => 'Owner',

resources/lang/el_GR/validation.php

@@ -300,6 +300,7 @@ return [
 
     // no access to administration:
     'no_access_user_group'            => 'Δεν έχετε τα σωστά δικαιώματα πρόσβασης για αυτή τη διαχείριση.',
+    'administration_owner_rename'     => 'You can\'t rename your standard administration.',
 ];
 
 /*

resources/lang/en_GB/firefly.php

@@ -1426,6 +1426,12 @@ return [
     '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"',
 
     // roles
     'administration_role_owner'                            => 'Owner',

resources/lang/en_GB/validation.php

@@ -300,6 +300,7 @@ return [
 
     // no access to 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.',
 ];
 
 /*

resources/lang/es_ES/firefly.php

@@ -1426,6 +1426,12 @@ return [
     '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"',
 
     // roles
     'administration_role_owner'                            => 'Owner',

resources/lang/es_ES/validation.php

@@ -300,6 +300,7 @@ return [
 
     // no access to administration:
     'no_access_user_group'            => 'No tiene permisos para esta administración.',
+    'administration_owner_rename'     => 'You can\'t rename your standard administration.',
 ];
 
 /*

resources/lang/fi_FI/firefly.php

@@ -1426,6 +1426,12 @@ return [
     '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"',
 
     // roles
     'administration_role_owner'                            => 'Owner',

resources/lang/fi_FI/validation.php

@@ -300,6 +300,7 @@ return [
 
     // no access to 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.',
 ];
 
 /*

resources/lang/fr_FR/firefly.php

@@ -1419,28 +1419,34 @@ return [
     // Financial administrations
     'administration_index'                                 => 'Administration financière',
     'administrations_index_menu'                           => 'Administration(s) financière(s)',
-    'administrations_breadcrumb'                          => 'Financial administrations',
+    'administrations_breadcrumb'                           => 'Administrations financières',
-    'administrations_page_title'                          => 'Financial administrations',
+    'administrations_page_title'                           => 'Administrations financières',
-    'administrations_page_sub_title'                      => 'Overview',
+    'administrations_page_sub_title'                       => 'Vue d\'ensemble',
-    'create_administration'                               => 'Create new administration',
+    'create_administration'                                => 'Créer une nouvelle administration',
-    'administration_owner'                                => 'Administration owner: {{email}}',
+    'administration_owner'                                 => 'Propriétaire de l\'administration : {{email}}',
-    'administration_you'                                  => 'Your role: {{role}}',
+    'administration_you'                                   => 'Votre rôle : {{role}}',
-    'other_users_in_admin'                                => 'Other users in this administration',
+    'other_users_in_admin'                                 => 'Autres utilisateurs dans cette 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"',
 
     // roles
-    'administration_role_owner'                           => 'Owner',
+    'administration_role_owner'                            => 'Propriétaire',
-    'administration_role_ro'                              => 'Read-only',
+    'administration_role_ro'                               => 'Lecture seule',
-    'administration_role_mng_trx'                         => 'Manage transactions',
+    'administration_role_mng_trx'                          => 'Gérer les opérations',
-    'administration_role_mng_meta'                        => 'Manage classification and meta-data',
+    'administration_role_mng_meta'                         => 'Gérer la classification et les métadonnées',
-    'administration_role_mng_budgets'                     => 'Manage budgets',
+    'administration_role_mng_budgets'                      => 'Gérer les budgets',
-    'administration_role_mng_piggies'                     => 'Manage piggy banks',
+    'administration_role_mng_piggies'                      => 'Gérer les tirelires',
-    'administration_role_mng_subscriptions'               => 'Manage subscriptions',
+    'administration_role_mng_subscriptions'                => 'Gérer les abonnements',
-    'administration_role_mng_rules'                       => 'Manage rules',
+    'administration_role_mng_rules'                        => 'Gérer les règles',
-    'administration_role_mng_recurring'                   => 'Manage recurring transactions ',
+    'administration_role_mng_recurring'                    => 'Gérer les opérations périodiques ',
-    'administration_role_mng_webhooks'                    => 'Manage webhooks',
+    'administration_role_mng_webhooks'                     => 'Gérer les webhooks',
-    'administration_role_mng_currencies'                  => 'Manage currencies',
+    'administration_role_mng_currencies'                   => 'Gérer les devises',
-    'administration_role_view_reports'                    => 'View reports',
+    'administration_role_view_reports'                     => 'Afficher les rapports',
-    'administration_role_full'                            => 'Full access',
+    'administration_role_full'                             => 'Accès complet',
 
     // profile:
     'purge_data_title'                                     => 'Purger des données de Firefly III',

resources/lang/fr_FR/validation.php

@@ -300,6 +300,7 @@ return [
 
     // no access to administration:
     'no_access_user_group'            => 'Vous n\'avez pas les droits d\'accès corrects pour cette administration.',
+    'administration_owner_rename'     => 'You can\'t rename your standard administration.',
 ];
 
 /*

resources/lang/hu_HU/firefly.php

@@ -1426,6 +1426,12 @@ return [
     '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"',
 
     // roles
     'administration_role_owner'                            => 'Owner',

resources/lang/hu_HU/validation.php

@@ -300,6 +300,7 @@ return [
 
     // no access to 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.',
 ];
 
 /*

resources/lang/id_ID/firefly.php

@@ -1426,6 +1426,12 @@ return [
     '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"',
 
     // roles
     'administration_role_owner'                            => 'Owner',

resources/lang/id_ID/validation.php

@@ -300,6 +300,7 @@ return [
 
     // no access to 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.',
 ];
 
 /*

resources/lang/it_IT/firefly.php

@@ -1426,6 +1426,12 @@ return [
     '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"',
 
     // roles
     'administration_role_owner'                            => 'Owner',

resources/lang/it_IT/validation.php

@@ -300,6 +300,7 @@ return [
 
     // no access to administration:
     'no_access_user_group'            => 'Non hai i diritti di accesso corretti per questa amministrazione.',
+    'administration_owner_rename'     => 'You can\'t rename your standard administration.',
 ];
 
 /*

resources/lang/ja_JP/firefly.php

@@ -1426,6 +1426,12 @@ return [
     '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"',
 
     // roles
     'administration_role_owner'                            => 'Owner',

resources/lang/ja_JP/validation.php

@@ -300,6 +300,7 @@ return [
 
     // no access to administration:
     'no_access_user_group'            => 'この管理のための適切なアクセス権がありません。',
+    'administration_owner_rename'     => 'You can\'t rename your standard administration.',
 ];
 
 /*

resources/lang/ko_KR/firefly.php

@@ -1426,6 +1426,12 @@ return [
     '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"',
 
     // roles
     'administration_role_owner'                            => 'Owner',

resources/lang/ko_KR/validation.php

@@ -300,6 +300,7 @@ return [
 
     // no access to administration:
     'no_access_user_group'            => '이 관리에 대한 올바른 액세스 권한이 없습니다.',
+    'administration_owner_rename'     => 'You can\'t rename your standard administration.',
 ];
 
 /*

resources/lang/nb_NO/firefly.php

@@ -1426,6 +1426,12 @@ return [
     '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"',
 
     // roles
     'administration_role_owner'                            => 'Owner',

resources/lang/nb_NO/validation.php

@@ -300,6 +300,7 @@ return [
 
     // no access to administration:
     'no_access_user_group'            => 'Du har ikke rettigheter til denne handlingen.',
+    'administration_owner_rename'     => 'You can\'t rename your standard administration.',
 ];
 
 /*

resources/lang/nl_NL/config.php

@@ -64,7 +64,7 @@ return [
     // 'date_time'               => '%B %e, %Y, @ %T',
     'date_time_js'             => 'D MMMM YYYY @ HH:mm:ss',
     'date_time_fns'            => 'd MMMM yyyy @ HH:mm:ss',
-    'date_time_fns_short'      => 'MMMM do, yyyy @ HH:mm',
+    'date_time_fns_short'      => 'd MMMM yyyy @ HH:mm',
 
     // 'specific_day'            => '%e %B %Y',
     'specific_day_js'          => 'D MMMM YYYY',

resources/lang/nl_NL/errors.php

@@ -42,7 +42,7 @@ return [
     'fatal_error'             => 'Er is een fatale fout opgetreden. Controleer de logbestanden in "storage/logs" of gebruik "docker logs -f [container]" om te zien wat er gebeurde.',
     'maintenance_mode'        => 'Firefly III is in onderhoudsmodus.',
     'be_right_back'           => 'Zo terug!',
-    'check_back'              => 'Firefly III is down for some necessary maintenance. Please check back in a second. If you happen to see this message on the demo site, just wait a few minutes. The database is reset every few hours.',
+    'check_back'              => 'Firefly III is offline voor hoognodig onderhoud. Kom later terug. Als je dit bericht op de demo site ziet, wacht dan een paar minuten. De database wordt elke paar uur gereset.',
     'error_occurred'          => 'Oeps! Er is een fout opgetreden.',
     'db_error_occurred'       => 'Oeps! Er is een database-fout opgetreden.',
     'error_not_recoverable'   => 'Helaas was deze fout niet te herstellen :(. Firefly III is stuk. De fout is:',

resources/lang/nl_NL/firefly.php

@@ -113,7 +113,7 @@ return [
     'two_factor_forgot'                                    => 'Ik kan geen codes meer genereren.',
     'two_factor_lost_header'                               => 'Kan je geen codes meer genereren?',
     'two_factor_lost_intro'                                => 'Als je ook je backupcodes kwijt bent heb je pech gehad. Dit kan je niet via de web-interface fixen. Je kan kiezen.',
-    'two_factor_lost_fix_self'                            => 'If you run your own instance of Firefly III, read <a href="https://docs.firefly-iii.org/references/faq/firefly-iii/using/#i-lost-my-2fa-token-generator-or-2fa-has-stopped-working">this entry in the FAQ</a> for instructions.',
+    'two_factor_lost_fix_self'                             => 'Als dit jouw Firefly III-installatie is, lees dan <a href="https://docs.firefly-iii.org/references/faq/firefly-iii/using/#i-lost-my-2fa-token-generator-or-2fa-has-stopped-working">deze entry in de FAQ</a>.',
     'two_factor_lost_fix_owner'                            => 'Zo niet, stuur dan een e-mail naar <a href="mailto::site_owner">:site_owner</a> en vraag of ze je authenticatie in twee stappen willen resetten.',
     'mfa_backup_code'                                      => 'Je hebt een backupcode gebruikt om in te loggen op Firefly III. Deze kan je niet meer gebruiken dus streep hem weg.',
     'pref_two_factor_new_backup_codes'                     => 'Nieuwe backupcodes genereren',
@@ -317,8 +317,8 @@ return [
     'update_new_version_alert'                             => 'Er is een nieuwe versie van Firefly III beschikbaar. Je gebruikt :your_version, de nieuwste versie is :new_version die werd uitgebracht op :date.',
     'update_version_beta'                                  => 'Dit is een BETA versie. Er kunnen bugs in zitten.',
     'update_version_alpha'                                 => 'Dit is een ALPHA versie. Er kunnen bugs in zitten.',
-    'update_current_dev_older'                            => 'You are running development release ":version", which is older than the latest release :new_version. Please update!',
+    'update_current_dev_older'                             => 'Je gebruikt ontwikkelversie ":version", die ouder is dan de nieuwste versie :new_version. Doe een update!',
-    'update_current_dev_newer'                            => 'You are running development release ":version", which is newer than the latest release :new_version.',
+    'update_current_dev_newer'                             => 'Je gebruikt de ontwikkelversie ":version", die nieuwer is dan de nieuwste versie :new_version.',
     'update_current_version_alert'                         => 'Je gebruikt :version, de nieuwste beschikbare versie.',
     'update_newer_version_alert'                           => 'Je gebruikt :your_version, wat nieuwer is dan de nieuwste versie, :new_version.',
     'update_check_error'                                   => 'Er is een fout opgetreden bij het controleren op updates: :error',
@@ -1419,13 +1419,19 @@ return [
     // Financial administrations
     'administration_index'                                 => 'Financiële administratie',
     'administrations_index_menu'                           => 'Financiële administratie(s)',
-    'administrations_breadcrumb'                          => 'Financial administrations',
+    'administrations_breadcrumb'                           => 'Grootboeken',
-    'administrations_page_title'                          => 'Financial administrations',
+    'administrations_page_title'                           => 'Grootboeken',
-    'administrations_page_sub_title'                      => 'Overview',
+    'administrations_page_sub_title'                       => 'Overzicht',
-    'create_administration'                               => 'Create new administration',
+    'create_administration'                                => 'Maak nieuw grootboek',
-    'administration_owner'                                => 'Administration owner: {{email}}',
+    'administration_owner'                                 => 'Grootboekeigenaar: {{email}}',
-    'administration_you'                                  => 'Your role: {{role}}',
+    'administration_you'                                   => 'Jouw rol: {{role}}',
-    'other_users_in_admin'                                => 'Other users in this administration',
+    'other_users_in_admin'                                 => 'Andere gebruikers van dit grootboek',
+    '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"',
 
     // roles
     'administration_role_owner'                            => 'Owner',

resources/lang/nl_NL/rules.php

@@ -70,5 +70,5 @@ return [
     'cannot_find_budget'                          => 'Firefly III kan budget ":name" niet vinden',
     'cannot_find_category'                        => 'Firefly III kan categorie ":name" niet vinden',
     'cannot_set_budget'                           => 'Firefly III kan budget ":name" niet instellen op een transactie van het type ":type"',
-    'journal_invalid_amount'                      => 'Firefly III can\'t set amount ":amount" because it is not a valid number.',
+    'journal_invalid_amount'                      => 'Firefly III kan bedrag ":amount" niet instellen omdat dit geen geldig getal is.',
 ];

resources/lang/nl_NL/validation.php

@@ -55,11 +55,11 @@ return [
     'reconciled_forbidden_field'      => 'Deze transactie is al afgestemd, dus je kan ":field" niet wijzigen',
     'deleted_user'                    => 'Je kan je niet registreren met dit e-mailadres.',
     'rule_trigger_value'              => 'Deze waarde is niet geldig voor de geselecteerde trigger.',
-    'rule_action_expression'          => 'Invalid expression. :error',
+    'rule_action_expression'          => 'Ongeldige expressie (foutmelding in het Engels): :error',
     'rule_action_value'               => 'Deze waarde is niet geldig voor de geselecteerde actie.',
     'file_already_attached'           => 'Het geuploade bestand ":name" is al gelinkt aan deze transactie.',
     'file_attached'                   => 'Bestand ":name" is succesvol geüpload.',
-    'file_zero'                       => 'The file is zero bytes in size.',
+    'file_zero'                       => 'Het bestand is nul bytes.',
     'must_exist'                      => 'Het ID in veld :attribute bestaat niet.',
     'all_accounts_equal'              => 'Alle rekeningen in dit veld moeten gelijk zijn.',
     'group_title_mandatory'           => 'Een groepstitel is verplicht wanneer er meer dan één transactie is.',
@@ -197,7 +197,7 @@ return [
  *
  */
 
-    'secure_password'                 => 'This is not a secure password. Please try again. For more information, visit https://bit.ly/FF3-password',
+    'secure_password'                 => 'Dit is geen veilig wachtwoord. Probeer het nog een keer. Zie ook: https://bit.ly/FF3-password',
     'valid_recurrence_rep_type'       => 'Dit is geen geldige herhaling voor periodieke transacties.',
     'valid_recurrence_rep_moment'     => 'Ongeldig herhaalmoment voor dit type herhaling.',
     'invalid_account_info'            => 'Ongeldige rekeninginformatie.',
@@ -300,6 +300,7 @@ return [
 
     // no access to administration:
     'no_access_user_group'            => 'Je hebt niet de juiste toegangsrechten voor deze administratie.',
+    'administration_owner_rename'     => 'Je kan je standaardgrootboek niet hernoemen.',
 ];
 
 /*

resources/lang/nn_NO/firefly.php

@@ -1426,6 +1426,12 @@ return [
     '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"',
 
     // roles
     'administration_role_owner'                            => 'Owner',

resources/lang/nn_NO/validation.php

@@ -300,6 +300,7 @@ return [
 
     // no access to administration:
     'no_access_user_group'            => 'Du har ikkje rettigheter til denne handlinga.',
+    'administration_owner_rename'     => 'You can\'t rename your standard administration.',
 ];
 
 /*

resources/lang/pl_PL/firefly.php

@@ -1426,6 +1426,12 @@ return [
     '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"',
 
     // roles
     'administration_role_owner'                            => 'Owner',

resources/lang/pl_PL/validation.php

@@ -300,6 +300,7 @@ return [
 
     // no access to administration:
     'no_access_user_group'            => 'Nie masz odpowiednich praw dostępu dla tej administracji.',
+    'administration_owner_rename'     => 'You can\'t rename your standard administration.',
 ];
 
 /*

resources/lang/pt_BR/firefly.php

@@ -1426,6 +1426,12 @@ return [
     '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"',
 
     // roles
     'administration_role_owner'                            => 'Owner',

resources/lang/pt_BR/validation.php

@@ -300,6 +300,7 @@ return [
 
     // no access to administration:
     'no_access_user_group'            => 'Você não direitos de acesso suficientes para esta administração.',
+    'administration_owner_rename'     => 'You can\'t rename your standard administration.',
 ];
 
 /*

resources/lang/pt_PT/firefly.php

@@ -1426,6 +1426,12 @@ return [
     '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"',
 
     // roles
     'administration_role_owner'                            => 'Owner',

resources/lang/pt_PT/validation.php

@@ -300,6 +300,7 @@ return [
 
     // no access to administration:
     'no_access_user_group'            => 'Não tem as permissões de acesso necessárias para esta administração.',
+    'administration_owner_rename'     => 'You can\'t rename your standard administration.',
 ];
 
 /*

resources/lang/ro_RO/firefly.php

@@ -1426,6 +1426,12 @@ return [
     '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"',
 
     // roles
     'administration_role_owner'                            => 'Owner',

resources/lang/ro_RO/validation.php

@@ -300,6 +300,7 @@ return [
 
     // no access to administration:
     'no_access_user_group'            => 'Nu aveți drepturile de acces corecte pentru această administrare.',
+    'administration_owner_rename'     => 'You can\'t rename your standard administration.',
 ];
 
 /*

resources/lang/ru_RU/firefly.php

@@ -1426,6 +1426,12 @@ return [
     '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"',
 
     // roles
     'administration_role_owner'                            => 'Owner',

resources/lang/ru_RU/validation.php

@@ -300,6 +300,7 @@ return [
 
     // no access to administration:
     'no_access_user_group'            => 'У вас нет необходимых прав доступа для данного административного действия.',
+    'administration_owner_rename'     => 'You can\'t rename your standard administration.',
 ];
 
 /*

resources/lang/sk_SK/firefly.php

@@ -1426,6 +1426,12 @@ return [
     '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"',
 
     // roles
     'administration_role_owner'                            => 'Owner',

resources/lang/sk_SK/validation.php

@@ -300,6 +300,7 @@ return [
 
     // no access to 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.',
 ];
 
 /*

resources/lang/sl_SI/firefly.php

@@ -1422,22 +1422,28 @@ return [
     'administrations_breadcrumb'                           => 'Finančna administracija',
     'administrations_page_title'                           => 'Finančna administracija',
     'administrations_page_sub_title'                       => 'Pregled',
-    'create_administration'                               => 'Create new administration',
+    'create_administration'                                => 'Ustvari novo administracijo',
-    'administration_owner'                                => 'Administration owner: {{email}}',
+    'administration_owner'                                 => 'Lastnik administracije: {{email}}',
     'administration_you'                                   => 'Vaša vloga: {{role}}',
-    'other_users_in_admin'                                => 'Other users in this administration',
+    'other_users_in_admin'                                 => 'Drugi uporabniki v tej administraciji',
+    '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"',
 
     // roles
     'administration_role_owner'                            => 'Lastnik',
     'administration_role_ro'                               => 'Samo za branje',
-    'administration_role_mng_trx'                         => 'Manage transactions',
+    'administration_role_mng_trx'                          => 'Upravljanje transakcij',
-    'administration_role_mng_meta'                        => 'Manage classification and meta-data',
+    'administration_role_mng_meta'                         => 'Upravljanje klasifikacij in metapodatkov',
-    'administration_role_mng_budgets'                     => 'Manage budgets',
+    'administration_role_mng_budgets'                      => 'Upravljaj proračune',
-    'administration_role_mng_piggies'                     => 'Manage piggy banks',
+    'administration_role_mng_piggies'                      => 'Upravljaj hranilnike',
     'administration_role_mng_subscriptions'                => 'Upravljanje naročnin',
     'administration_role_mng_rules'                        => 'Upravljaj pravila',
     'administration_role_mng_recurring'                    => 'Upravljaj ponavljajoče transakcije',
-    'administration_role_mng_webhooks'                    => 'Manage webhooks',
+    'administration_role_mng_webhooks'                     => 'Upravljaj webhooke',
     'administration_role_mng_currencies'                   => 'Upravljanje valut',
     'administration_role_view_reports'                     => 'Prikaz poročil',
     'administration_role_full'                             => 'Neomejen dostop',

resources/lang/sl_SI/validation.php

@@ -300,6 +300,7 @@ return [
 
     // no access to administration:
     'no_access_user_group'            => 'Nimate ustreznih pravic dostopa do te administracije.',
+    'administration_owner_rename'     => 'You can\'t rename your standard administration.',
 ];
 
 /*

resources/lang/sv_SE/firefly.php

@@ -1426,6 +1426,12 @@ return [
     'administration_owner'                                 => 'Administration owner: {{email}}',
     'administration_you'                                   => 'Din roll: {{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"',
 
     // roles
     'administration_role_owner'                            => 'Owner',

resources/lang/sv_SE/validation.php

@@ -300,6 +300,7 @@ return [
 
     // no access to 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.',
 ];
 
 /*

resources/lang/th_TH/firefly.php

@@ -1426,6 +1426,12 @@ return [
     '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"',
 
     // roles
     'administration_role_owner'                            => 'Owner',

resources/lang/th_TH/validation.php

@@ -300,6 +300,7 @@ return [
 
     // no access to 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.',
 ];
 
 /*

resources/lang/tr_TR/firefly.php

@@ -1427,6 +1427,12 @@ return [
     '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"',
 
     // roles
     'administration_role_owner'                            => 'Owner',

resources/lang/tr_TR/validation.php

@@ -300,6 +300,7 @@ return [
 
     // no access to 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.',
 ];
 
 /*

resources/lang/uk_UA/firefly.php

@@ -1426,6 +1426,12 @@ return [
     '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"',
 
     // roles
     'administration_role_owner'                            => 'Owner',

resources/lang/uk_UA/validation.php

@@ -300,6 +300,7 @@ return [
 
     // no access to administration:
     'no_access_user_group'            => 'У Вас немає необхідних прав доступу для цих налаштувань.',
+    'administration_owner_rename'     => 'You can\'t rename your standard administration.',
 ];
 
 /*

resources/lang/vi_VN/firefly.php

@@ -1426,6 +1426,12 @@ return [
     '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"',
 
     // roles
     'administration_role_owner'                            => 'Owner',

resources/lang/vi_VN/validation.php

@@ -300,6 +300,7 @@ return [
 
     // no access to 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.',
 ];
 
 /*

resources/lang/zh_CN/firefly.php

@@ -1427,6 +1427,12 @@ return [
     '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"',
 
     // roles
     'administration_role_owner'                            => 'Owner',

resources/lang/zh_CN/validation.php

@@ -300,6 +300,7 @@ return [
 
     // no access to administration:
     'no_access_user_group'            => '您没有管理员访问权限',
+    'administration_owner_rename'     => 'You can\'t rename your standard administration.',
 ];
 
 /*

resources/lang/zh_TW/firefly.php

@@ -1426,6 +1426,12 @@ return [
     '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"',
 
     // roles
     'administration_role_owner'                            => 'Owner',

resources/lang/zh_TW/validation.php

@@ -300,6 +300,7 @@ return [
 
     // no access to 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.',
 ];
 
 /*

routes/web.php

@@ -151,26 +151,31 @@ Route::group(
         Route::get('show/{account}/all', ['uses' => 'Account\ShowController@showAll', 'as' => 'show.all']);
         Route::get('show/{account}/{start_date?}/{end_date?}', ['uses' => 'Account\ShowController@show', 'as' => 'show'])
             ->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
 
         // reconcile routes:
         Route::get('reconcile/{account}/index/{start_date?}/{end_date?}', ['uses' => 'Account\ReconcileController@reconcile', 'as' => 'reconcile'])
             ->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::post('reconcile/{account}/submit/{start_date?}/{end_date?}', ['uses' => 'Account\ReconcileController@submit', 'as' => 'reconcile.submit'])
             ->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
 
         // reconcile JSON routes
         Route::get('reconcile/{account}/overview/{start_date?}/{end_date?}', ['uses' => 'Json\ReconcileController@overview', 'as' => 'reconcile.overview'])
             ->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get(
             'reconcile/{account}/transactions/{start_date?}/{end_date?}',
             ['uses' => 'Json\ReconcileController@transactions', 'as' => 'reconcile.transactions']
         )
             ->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
     }
 );
 
@@ -248,7 +253,8 @@ Route::group(
         Route::get('list/no-budget/all', ['uses' => 'Budget\ShowController@noBudgetAll', 'as' => 'no-budget-all']);
         Route::get('list/no-budget/{start_date?}/{end_date?}', ['uses' => 'Budget\ShowController@noBudget', 'as' => 'no-budget'])
             ->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
 
         // reorder budgets
         Route::post('reorder', ['uses' => 'Budget\IndexController@reorder', 'as' => 'reorder']);
@@ -256,7 +262,8 @@ Route::group(
         // index
         Route::get('{start_date?}/{end_date?}', ['uses' => 'Budget\IndexController@index', 'as' => 'index'])
             ->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
     }
 );
 
@@ -266,7 +273,8 @@ Route::group(
     static function (): void {
         Route::get('create/{budget}/{start_date}/{end_date}', ['uses' => 'Budget\BudgetLimitController@create', 'as' => 'create'])
             ->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::post('store', ['uses' => 'Budget\BudgetLimitController@store', 'as' => 'store']);
 
         Route::post('delete/{budgetLimit}', ['uses' => 'Budget\BudgetLimitController@delete', 'as' => 'delete']);
@@ -298,13 +306,15 @@ Route::group(
         Route::get('show/{category}/all', ['uses' => 'Category\ShowController@showAll', 'as' => 'show.all']);
         Route::get('show/{category}/{start_date?}/{end_date?}', ['uses' => 'Category\ShowController@show', 'as' => 'show'])
             ->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
 
         // no category controller:
         Route::get('list/no-category/all', ['uses' => 'Category\NoCategoryController@showAll', 'as' => 'no-category.all']);
         Route::get('list/no-category/{start_date?}/{end_date?}', ['uses' => 'Category\NoCategoryController@show', 'as' => 'no-category'])
             ->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
     }
 );
 
@@ -332,10 +342,12 @@ Route::group(
         Route::get('revenue', ['uses' => 'AccountController@revenueAccounts', 'as' => 'revenue']);
         Route::get('report/{accountList}/{start_date}/{end_date}', ['uses' => 'AccountController@report', 'as' => 'report'])
             ->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get('period/{account}/{start_date}/{end_date}', ['uses' => 'AccountController@period', 'as' => 'period'])
             ->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
 
         Route::get('income-category/{account}/all/all', ['uses' => 'AccountController@incomeCategoryAll', 'as' => 'income-category-all']);
         Route::get('expense-category/{account}/all/all', ['uses' => 'AccountController@expenseCategoryAll', 'as' => 'expense-category-all']);
@@ -343,13 +355,16 @@ Route::group(
 
         Route::get('income-category/{account}/{start_date}/{end_date}', ['uses' => 'AccountController@incomeCategory', 'as' => 'income-category'])
             ->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get('expense-category/{account}/{start_date}/{end_date}', ['uses' => 'AccountController@expenseCategory', 'as' => 'expense-category'])
             ->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get('expense-budget/{account}/{start_date}/{end_date}', ['uses' => 'AccountController@expenseBudget', 'as' => 'expense-budget'])
             ->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
     }
 );
 
@@ -369,10 +384,12 @@ Route::group(
         Route::get('frontpage', ['uses' => 'BudgetController@frontpage', 'as' => 'frontpage']);
         Route::get('period/0/{currency}/{accountList}/{start_date}/{end_date}', ['uses' => 'BudgetController@periodNoBudget', 'as' => 'period.no-budget'])
             ->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get('period/{budget}/{currency}/{accountList}/{start_date}/{end_date}', ['uses' => 'BudgetController@period', 'as' => 'period'])
             ->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get('budget/{budget}/{budgetLimit}', ['uses' => 'BudgetController@budgetLimit', 'as' => 'budget-limit']);
         Route::get('budget/{budget}', ['uses' => 'BudgetController@budget', 'as' => 'budget']);
 
@@ -387,22 +404,26 @@ Route::group(
             ['uses' => 'BudgetReportController@categoryExpense', 'as' => 'category-expense']
         )
             ->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get(
             'budget/expense/{accountList}/{budgetList}/{start_date}/{end_date}',
             ['uses' => 'BudgetReportController@budgetExpense', 'as' => 'budget-expense']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get(
             'source-account/expense/{accountList}/{budgetList}/{start_date}/{end_date}',
             ['uses' => 'BudgetReportController@sourceAccountExpense', 'as' => 'source-account-expense']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get(
             'destination-account/expense/{accountList}/{budgetList}/{start_date}/{end_date}',
             ['uses' => 'BudgetReportController@destinationAccountExpense', 'as' => 'destination-account-expense']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get('operations/{accountList}/{budget}/{start_date}/{end_date}', ['uses' => 'BudgetReportController@mainChart', 'as' => 'main']);
     }
 );
@@ -419,51 +440,61 @@ Route::group(
             'report-period/0/{accountList}/{start_date}/{end_date}',
             ['uses' => 'CategoryController@reportPeriodNoCategory', 'as' => 'period.no-category']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get('report-period/{category}/{accountList}/{start_date}/{end_date}', ['uses' => 'CategoryController@reportPeriod', 'as' => 'period'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
 
         Route::get(
             'category/expense/{accountList}/{categoryList}/{start_date}/{end_date}',
             ['uses' => 'CategoryReportController@categoryExpense', 'as' => 'category-expense']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get(
             'category/income/{accountList}/{categoryList}/{start_date}/{end_date}',
             ['uses' => 'CategoryReportController@categoryIncome', 'as' => 'category-income']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get(
             'budget/expense/{accountList}/{categoryList}/{start_date}/{end_date}',
             ['uses' => 'CategoryReportController@budgetExpense', 'as' => 'budget-expense']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get(
             'source/expense/{accountList}/{categoryList}/{start_date}/{end_date}',
             ['uses' => 'CategoryReportController@sourceExpense', 'as' => 'source-expense']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get(
             'source/income/{accountList}/{categoryList}/{start_date}/{end_date}',
             ['uses' => 'CategoryReportController@sourceIncome', 'as' => 'source-income']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get(
             'dest/expense/{accountList}/{categoryList}/{start_date}/{end_date}',
             ['uses' => 'CategoryReportController@destinationExpense', 'as' => 'dest-expense']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get(
             'dest/income/{accountList}/{categoryList}/{start_date}/{end_date}',
             ['uses' => 'CategoryReportController@destinationIncome', 'as' => 'dest-income']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get('operations/{accountList}/{category}/{start_date}/{end_date}', ['uses' => 'CategoryReportController@mainChart', 'as' => 'main'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
     }
 );
 
@@ -473,51 +504,61 @@ Route::group(
     static function (): void {
         Route::get('tag/expense/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagReportController@tagExpense', 'as' => 'tag-expense'])
             ->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get('tag/income/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagReportController@tagIncome', 'as' => 'tag-income'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get(
             'category/expense/{accountList}/{tagList}/{start_date}/{end_date}',
             ['uses' => 'TagReportController@categoryExpense', 'as' => 'category-expense']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get(
             'category/income/{accountList}/{tagList}/{start_date}/{end_date}',
             ['uses' => 'TagReportController@categoryIncome', 'as' => 'category-income']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get(
             'budget/expense/{accountList}/{tagList}/{start_date}/{end_date}',
             ['uses' => 'TagReportController@budgetExpense', 'as' => 'budget-expense']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get(
             'source/expense/{accountList}/{tagList}/{start_date}/{end_date}',
             ['uses' => 'TagReportController@sourceExpense', 'as' => 'source-expense']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get(
             'source/income/{accountList}/{tagList}/{start_date}/{end_date}',
             ['uses' => 'TagReportController@sourceIncome', 'as' => 'source-income']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get(
             'dest/expense/{accountList}/{tagList}/{start_date}/{end_date}',
             ['uses' => 'TagReportController@destinationExpense', 'as' => 'dest-expense']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get(
             'dest/income/{accountList}/{tagList}/{start_date}/{end_date}',
             ['uses' => 'TagReportController@destinationIncome', 'as' => 'dest-income']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
 
         Route::get('operations/{accountList}/{tag}/{start_date}/{end_date}', ['uses' => 'TagReportController@mainChart', 'as' => 'main'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
     }
 );
 
@@ -528,34 +569,40 @@ Route::group(
         Route::get('main/{accountList}/{account}/{start_date}/{end_date}', ['uses' => 'DoubleReportController@mainChart', 'as' => 'main'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
 
         Route::get(
             'category/expense/{accountList}/{doubleList}/{start_date}/{end_date}',
             ['uses' => 'DoubleReportController@categoryExpense', 'as' => 'category-expense']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get(
             'category/income/{accountList}/{doubleList}/{start_date}/{end_date}',
             ['uses' => 'DoubleReportController@categoryIncome', 'as' => 'category-income']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get(
             'budget/expense/{accountList}/{doubleList}/{start_date}/{end_date}',
             ['uses' => 'DoubleReportController@budgetExpense', 'as' => 'budget-expense']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
 
         Route::get(
             'tag/expense/{accountList}/{doubleList}/{start_date}/{end_date}',
             ['uses' => 'DoubleReportController@tagExpense', 'as' => 'tag-expense']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get(
             'tag/income/{accountList}/{doubleList}/{start_date}/{end_date}',
             ['uses' => 'DoubleReportController@tagIncome', 'as' => 'tag-income']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
     }
 );
 
@@ -574,11 +621,13 @@ Route::group(
         Route::get('operations/{accountList}/{start_date}/{end_date}', ['uses' => 'ReportController@operations', 'as' => 'operations'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get('net-worth/{accountList}/{start_date}/{end_date}/', ['uses' => 'ReportController@netWorth', 'as' => 'net-worth'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
     }
 );
 
@@ -589,18 +638,22 @@ Route::group(
         Route::get('categories/{objectType}/{start_date}/{end_date}', ['uses' => 'TransactionController@categories', 'as' => 'categories'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get('budgets/{start_date}/{end_date}', ['uses' => 'TransactionController@budgets', 'as' => 'budgets'])->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get(
             'destinationAccounts/{objectType}/{start_date}/{end_date}',
             ['uses' => 'TransactionController@destinationAccounts', 'as' => 'destinationAccounts']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get('sourceAccounts/{objectType}/{start_date}/{end_date}', ['uses' => 'TransactionController@sourceAccounts', 'as' => 'sourceAccounts'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
     }
 );
 
@@ -658,7 +711,8 @@ Route::group(
             'budget/total-budgeted/{currency}/{start_date}/{end_date}',
             ['uses' => 'Json\BudgetController@getBudgetInformation', 'as' => 'budget.total-budgeted']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         // boxes
         Route::get('box/balance', ['uses' => 'Json\BoxController@balance', 'as' => 'box.balance']);
         Route::get('box/available', ['uses' => 'Json\BoxController@available', 'as' => 'box.available']);
@@ -798,7 +852,8 @@ Route::group(
         Route::get('general/{accountList}/{start_date}/{end_date}', ['uses' => 'AccountController@general', 'as' => 'general'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
     }
 );
 
@@ -809,7 +864,8 @@ Route::group(
         Route::get('overview/{accountList}/{start_date}/{end_date}', ['uses' => 'BillController@overview', 'as' => 'overview'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
     }
 );
 
@@ -821,32 +877,38 @@ Route::group(
         Route::get('operations/{accountList}/{doubleList}/{start_date}/{end_date}', ['uses' => 'DoubleController@operations', 'as' => 'operations'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get(
             'ops-asset/{accountList}/{doubleList}/{start_date}/{end_date}',
             ['uses' => 'DoubleController@operationsPerAsset', 'as' => 'ops-asset']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
 
         Route::get(
             'top-expenses/{accountList}/{doubleList}/{start_date}/{end_date}',
             ['uses' => 'DoubleController@topExpenses', 'as' => 'top-expenses']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get(
             'avg-expenses/{accountList}/{doubleList}/{start_date}/{end_date}',
             ['uses' => 'DoubleController@avgExpenses', 'as' => 'avg-expenses']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
 
         Route::get('top-income/{accountList}/{doubleList}/{start_date}/{end_date}', ['uses' => 'DoubleController@topIncome', 'as' => 'top-income'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get('avg-income/{accountList}/{doubleList}/{start_date}/{end_date}', ['uses' => 'DoubleController@avgIncome', 'as' => 'avg-income'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
     }
 );
 
@@ -862,15 +924,18 @@ Route::group(
         Route::get('operations/{accountList}/{start_date}/{end_date}', ['uses' => 'OperationsController@operations', 'as' => 'operations'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get('income/{accountList}/{start_date}/{end_date}', ['uses' => 'OperationsController@income', 'as' => 'income'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get('expenses/{accountList}/{start_date}/{end_date}', ['uses' => 'OperationsController@expenses', 'as' => 'expenses'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
     }
 );
 
@@ -887,49 +952,59 @@ Route::group(
         Route::get('operations/{accountList}/{start_date}/{end_date}', ['uses' => 'CategoryController@operations', 'as' => 'operations'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get('income/{accountList}/{start_date}/{end_date}', ['uses' => 'CategoryController@income', 'as' => 'income'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get('expenses/{accountList}/{start_date}/{end_date}', ['uses' => 'CategoryController@expenses', 'as' => 'expenses'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
 
         Route::get('accounts/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@accounts', 'as' => 'accounts'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get('categories/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@categories', 'as' => 'categories'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get(
             'account-per-category/{accountList}/{categoryList}/{start_date}/{end_date}',
             ['uses' => 'CategoryController@accountPerCategory', 'as' => 'account-per-category']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
 
         Route::get(
             'top-expenses/{accountList}/{categoryList}/{start_date}/{end_date}',
             ['uses' => 'CategoryController@topExpenses', 'as' => 'top-expenses']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get(
             'avg-expenses/{accountList}/{categoryList}/{start_date}/{end_date}',
             ['uses' => 'CategoryController@avgExpenses', 'as' => 'avg-expenses']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
 
         Route::get('top-income/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@topIncome', 'as' => 'top-income'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get('avg-income/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@avgIncome', 'as' => 'avg-income'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
     }
 );
 
@@ -945,34 +1020,41 @@ Route::group(
         Route::get('accounts/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@accounts', 'as' => 'accounts'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get('tags/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@tags', 'as' => 'tags'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get(
             'account-per-tag/{accountList}/{tagList}/{start_date}/{end_date}',
             ['uses' => 'TagController@accountPerTag', 'as' => 'account-per-tag']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
 
         Route::get('top-expenses/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@topExpenses', 'as' => 'top-expenses'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get('avg-expenses/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@avgExpenses', 'as' => 'avg-expenses'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
 
         Route::get('top-income/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@topIncome', 'as' => 'top-income'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get('avg-income/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@avgIncome', 'as' => 'avg-income'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
     }
 );
 
@@ -983,7 +1065,8 @@ Route::group(
         Route::get('general/{accountList}/{start_date}/{end_date}', ['uses' => 'BalanceController@general', 'as' => 'general'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
     }
 );
 
@@ -994,34 +1077,41 @@ Route::group(
         Route::get('general/{accountList}/{start_date}/{end_date}/', ['uses' => 'BudgetController@general', 'as' => 'general'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         // TODO is route still used?
         Route::get('period/{accountList}/{start_date}/{end_date}', ['uses' => 'BudgetController@period', 'as' => 'period'])->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
 
         Route::get('accounts/{accountList}/{budgetList}/{start_date}/{end_date}', ['uses' => 'BudgetController@accounts', 'as' => 'accounts'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get('budgets/{accountList}/{budgetList}/{start_date}/{end_date}', ['uses' => 'BudgetController@budgets', 'as' => 'budgets'])->where(
             ['start_date' => DATEFORMAT]
         )
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get(
             'account-per-budget/{accountList}/{budgetList}/{start_date}/{end_date}',
             ['uses' => 'BudgetController@accountPerBudget', 'as' => 'account-per-budget']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get(
             'top-expenses/{accountList}/{budgetList}/{start_date}/{end_date}',
             ['uses' => 'BudgetController@topExpenses', 'as' => 'top-expenses']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
         Route::get(
             'avg-expenses/{accountList}/{budgetList}/{start_date}/{end_date}',
             ['uses' => 'BudgetController@avgExpenses', 'as' => 'avg-expenses']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
     }
 );
 
@@ -1094,7 +1184,8 @@ Route::group(
 
         Route::get('show/{tagOrId}/all', ['uses' => 'TagController@showAll', 'as' => 'show.all']);
         Route::get('show/{tagOrId}/{start_date?}/{end_date?}', ['uses' => 'TagController@show', 'as' => 'show'])->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
 
         Route::get('edit/{tag}', ['uses' => 'TagController@edit', 'as' => 'edit']);
         Route::get('delete/{tag}', ['uses' => 'TagController@delete', 'as' => 'delete']);
@@ -1119,7 +1210,8 @@ Route::group(
         Route::get('{objectType}/{start_date?}/{end_date?}', ['uses' => 'Transaction\IndexController@index', 'as' => 'index'])->where(
             ['objectType' => 'withdrawal|deposit|transfers|transfer|all']
         )->where(['start_date' => DATEFORMAT])
-             ->where(['end_date' => DATEFORMAT]);
+            ->where(['end_date' => DATEFORMAT])
+        ;
 
         // create group:
         Route::get('create/{objectType}', ['uses' => 'Transaction\CreateController@create', 'as' => 'create']);