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

Bump i18next from 23.11.1 to 23.11.2

.ci/php-cs-fixer/composer.lock

@@ -226,16 +226,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.52.1",
+            "version": "v3.54.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "6e77207f0d851862ceeb6da63e6e22c01b1587bc"
+                "reference": "2aecbc8640d7906c38777b3dcab6f4ca79004d08"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/6e77207f0d851862ceeb6da63e6e22c01b1587bc",
-                "reference": "6e77207f0d851862ceeb6da63e6e22c01b1587bc",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/2aecbc8640d7906c38777b3dcab6f4ca79004d08",
+                "reference": "2aecbc8640d7906c38777b3dcab6f4ca79004d08",
                 "shasum": ""
             },
             "require": {
@@ -259,6 +259,7 @@
             },
             "require-dev": {
                 "facile-it/paraunit": "^1.3 || ^2.0",
+                "infection/infection": "^0.27.11",
                 "justinrainbow/json-schema": "^5.2",
                 "keradus/cli-executor": "^2.1",
                 "mikey179/vfsstream": "^1.6.11",
@@ -306,7 +307,7 @@
             ],
             "support": {
                 "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.52.1"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.54.0"
             },
             "funding": [
                 {
@@ -314,7 +315,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-19T21:02:43+00:00"
+            "time": "2024-04-17T08:12:13+00:00"
         },
         {
             "name": "psr/container",

.ci/phpcs.sh

@@ -20,23 +20,8 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-# Install composer packages
-#composer install --no-scripts --no-ansi
-
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
-# enable test .env file.
-# cp .ci/.env.ci .env
-
-OUTPUT_FORMAT=txt
-EXTRA_PARAMS=""
-
-if [[ $GITHUB_ACTIONS = "true" ]]
-then
-    OUTPUT_FORMAT=txt
-    EXTRA_PARAMS=""
-fi
-
 # clean up php code
 cd $SCRIPT_DIR/php-cs-fixer
 composer update --quiet
@@ -44,8 +29,8 @@ rm -f .php-cs-fixer.cache
 PHP_CS_FIXER_IGNORE_ENV=true
 ./vendor/bin/php-cs-fixer fix \
     --config $SCRIPT_DIR/php-cs-fixer/.php-cs-fixer.php \
-    --format=$OUTPUT_FORMAT \
-    --allow-risky=yes $EXTRA_PARAMS
+    --format=txt \
+    --allow-risky=yes
 
 EXIT_CODE=$?
 

.github/pull_request_template.md

@@ -1,13 +1,13 @@
 <!--
 Thank you for submitting new code to Firefly III, or any of the related projects. Please read the following rules carefully.
 
-- Do not submit solutions for problems that are not already reported in an issue
-- Firefly III can't be your learning experience. If you're new to all of this, please go be new somewhere else
-- Do not open PRs to "discuss" possible solutions or to "get feedback" on your code. I don't have time for that.
+- Please do not submit solutions for problems that are not already reported in an issue.
+- Unfortunately, Firefly III can't be your learning experience. If you're new to all of this, please open an issue first.
+- Please do not open PRs to "discuss" possible solutions or to "get feedback" on your code. I simply don't have time for that.
 - Pull requests for the MAIN branch will be closed.
 - DO NOT include translated strings in your PR.
 
-Perhaps open an issue first, before you open a PR?
+If it feels necessary to open an issue first, please do so, before you open a PR.
 
 See also: https://docs.firefly-iii.org/explanation/support/#contributing-code
 

.github/workflows/close-duplicates.yml

@@ -13,7 +13,7 @@ jobs:
   close_duplicates:
     runs-on: ubuntu-latest
     steps:
-      - uses: github/command@v1.1.0
+      - uses: github/command@v1.1.1
         id: command
         with:
           allowed_contexts: "issue"

.github/workflows/release.yml

@@ -51,7 +51,7 @@ jobs:
           CROWDIN_TOKEN: ${{ secrets.CROWDIN_TOKEN }}
       - name: Cleanup translations
         id: cleanup-transactions
-        uses: JC5/firefly-iii-dev@v38
+        uses: JC5/firefly-iii-dev@main
         with:
           action: 'ff3:crowdin-warning'
           output: ''
@@ -60,7 +60,7 @@ jobs:
           GH_TOKEN: ''
       - name: Cleanup changelog
         id: cleanup-changelog
-        uses: JC5/firefly-iii-dev@v38
+        uses: JC5/firefly-iii-dev@main
         with:
           action: 'ff3:changelog'
           output: ''
@@ -69,7 +69,7 @@ jobs:
           GH_TOKEN: ${{ secrets.CHANGELOG_TOKEN }}
       - name: Extract changelog
         id: extract-changelog
-        uses: JC5/firefly-iii-dev@v38
+        uses: JC5/firefly-iii-dev@main
         with:
           action: 'ff3:extract-changelog'
           output: 'output'
@@ -78,7 +78,7 @@ jobs:
           GH_TOKEN: ""
       - name: Replace version
         id: replace-version
-        uses: JC5/firefly-iii-dev@v38
+        uses: JC5/firefly-iii-dev@main
         with:
           action: 'ff3:version'
           output: ''
@@ -88,7 +88,7 @@ jobs:
           FF_III_VERSION: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }}
       - name: Generate JSON v1
         id: json-v1
-        uses: JC5/firefly-iii-dev@v38
+        uses: JC5/firefly-iii-dev@main
         with:
           action: 'ff3:json-translations v1'
           output: ''
@@ -97,7 +97,7 @@ jobs:
           GH_TOKEN: ''
       - name: Generate JSON v2
         id: json-v2
-        uses: JC5/firefly-iii-dev@v38
+        uses: JC5/firefly-iii-dev@main
         with:
           action: 'ff3:json-translations v2'
           output: ''
@@ -106,7 +106,7 @@ jobs:
           GH_TOKEN: ''
       - name: Code cleanup
         id: code-cleanup
-        uses: JC5/firefly-iii-dev@v38
+        uses: JC5/firefly-iii-dev@main
         with:
           action: 'ff3:code'
           output: ''

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

@@ -27,6 +27,7 @@ namespace FireflyIII\Api\V2\Controllers\Chart;
 use Carbon\Carbon;
 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Api\V2\Request\Chart\BalanceChartRequest;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\TransactionCurrency;
@@ -42,6 +43,7 @@ use Illuminate\Support\Collection;
 class BalanceController extends Controller
 {
     use CleansChartData;
+    protected array                    $acceptedRoles = [UserRoleEnum::READ_ONLY];
 
     /**
      * The code is practically a duplicate of ReportController::operations.

app/Http/Controllers/Account/ShowController.php

@@ -106,7 +106,7 @@ class ShowController extends Controller
         $periods          = $this->getAccountPeriodOverview($account, $firstTransaction, $end);
 
         // if layout = v2, overrule the page title.
-        if ('v1' !== config('firefly.layout')) {
+        if ('v1' !== config('view.layout')) {
             $subTitle = (string)trans('firefly.all_journals_for_account', ['name' => $account->name]);
         }
 

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -31,6 +31,7 @@ use Illuminate\Contracts\View\Factory;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
 
 /**
@@ -106,6 +107,8 @@ class ForgotPasswordController extends Controller
         }
         $host           = request()->host();
         if ($configuredHost !== $host) {
+            Log::error(sprintf('Host header is "%s", APP_URL is "%s".', $host, $configuredHost));
+
             throw new FireflyException('The Host-header does not match the host in the APP_URL environment variable. Please make sure these match. See also: https://bit.ly/FF3-host-header');
         }
     }

app/Http/Controllers/Controller.php

@@ -70,7 +70,7 @@ abstract class Controller extends BaseController
         $logoutUrl        = config('firefly.custom_logout_url');
 
         // overrule v2 layout back to v1.
-        if ('true' === request()->get('force_default_layout') && 'v2' === config('firefly.layout')) {
+        if ('true' === request()->get('force_default_layout') && 'v2' === config('view.layout')) {
             app('view')->getFinder()->setPaths([realpath(base_path('resources/views'))]); // @phpstan-ignore-line
         }
 

app/Support/Twig/Translation.php

@@ -49,6 +49,7 @@ class Translation extends AbstractExtension
     {
         return [
             $this->journalLinkTranslation(),
+            $this->laravelTranslation(),
         ];
     }
 
@@ -68,4 +69,19 @@ class Translation extends AbstractExtension
             ['is_safe' => ['html']]
         );
     }
+
+    public function laravelTranslation(): TwigFunction
+    {
+        return new TwigFunction(
+            '__',
+            static function (string $key) {
+                $translation = trans($key);
+                if ($key === $translation) {
+                    return $key;
+                }
+
+                return $translation;
+            }
+        );
+    }
 }

composer.lock

@@ -1670,16 +1670,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.2.0",
+            "version": "v11.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "a1750156b671f37cba702380107e2d22161c31e3"
+                "reference": "c1dc67c28811dc5be524a30b18f29ce62126716a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/a1750156b671f37cba702380107e2d22161c31e3",
-                "reference": "a1750156b671f37cba702380107e2d22161c31e3",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/c1dc67c28811dc5be524a30b18f29ce62126716a",
+                "reference": "c1dc67c28811dc5be524a30b18f29ce62126716a",
                 "shasum": ""
             },
             "require": {
@@ -1698,7 +1698,7 @@
                 "fruitcake/php-cors": "^1.3",
                 "guzzlehttp/guzzle": "^7.8",
                 "guzzlehttp/uri-template": "^1.0",
-                "laravel/prompts": "^0.1.15",
+                "laravel/prompts": "^0.1.18",
                 "laravel/serializable-closure": "^1.3",
                 "league/commonmark": "^2.2.1",
                 "league/flysystem": "^3.8.0",
@@ -1871,20 +1871,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-04-02T14:01:33+00:00"
+            "time": "2024-04-16T14:38:51+00:00"
         },
         {
             "name": "laravel/passport",
-            "version": "v12.0.2",
+            "version": "v12.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/passport.git",
-                "reference": "21099f1aff81706781578a19335d8a4c7c96422a"
+                "reference": "ff4742c71c58a4941b8738496ba96dabdf5e395b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/passport/zipball/21099f1aff81706781578a19335d8a4c7c96422a",
-                "reference": "21099f1aff81706781578a19335d8a4c7c96422a",
+                "url": "https://api.github.com/repos/laravel/passport/zipball/ff4742c71c58a4941b8738496ba96dabdf5e395b",
+                "reference": "ff4742c71c58a4941b8738496ba96dabdf5e395b",
                 "shasum": ""
             },
             "require": {
@@ -1947,20 +1947,20 @@
                 "issues": "https://github.com/laravel/passport/issues",
                 "source": "https://github.com/laravel/passport"
             },
-            "time": "2024-03-21T18:44:57+00:00"
+            "time": "2024-04-15T18:49:04+00:00"
         },
         {
             "name": "laravel/prompts",
-            "version": "v0.1.17",
+            "version": "v0.1.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/prompts.git",
-                "reference": "8ee9f87f7f9eadcbe21e9e72cd4176b2f06cd5b5"
+                "reference": "0ab75ac3434d9f610c5691758a6146a3d1940c18"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/8ee9f87f7f9eadcbe21e9e72cd4176b2f06cd5b5",
-                "reference": "8ee9f87f7f9eadcbe21e9e72cd4176b2f06cd5b5",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/0ab75ac3434d9f610c5691758a6146a3d1940c18",
+                "reference": "0ab75ac3434d9f610c5691758a6146a3d1940c18",
                 "shasum": ""
             },
             "require": {
@@ -2002,22 +2002,22 @@
             ],
             "support": {
                 "issues": "https://github.com/laravel/prompts/issues",
-                "source": "https://github.com/laravel/prompts/tree/v0.1.17"
+                "source": "https://github.com/laravel/prompts/tree/v0.1.19"
             },
-            "time": "2024-03-13T16:05:43+00:00"
+            "time": "2024-04-16T14:20:35+00:00"
         },
         {
             "name": "laravel/sanctum",
-            "version": "v4.0.1",
+            "version": "v4.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/sanctum.git",
-                "reference": "d1de99bf8d31199aaf93881561622489ab91ba58"
+                "reference": "9cfc0ce80cabad5334efff73ec856339e8ec1ac1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/sanctum/zipball/d1de99bf8d31199aaf93881561622489ab91ba58",
-                "reference": "d1de99bf8d31199aaf93881561622489ab91ba58",
+                "url": "https://api.github.com/repos/laravel/sanctum/zipball/9cfc0ce80cabad5334efff73ec856339e8ec1ac1",
+                "reference": "9cfc0ce80cabad5334efff73ec856339e8ec1ac1",
                 "shasum": ""
             },
             "require": {
@@ -2068,7 +2068,7 @@
                 "issues": "https://github.com/laravel/sanctum/issues",
                 "source": "https://github.com/laravel/sanctum"
             },
-            "time": "2024-03-19T20:09:38+00:00"
+            "time": "2024-04-10T19:39:58+00:00"
         },
         {
             "name": "laravel/serializable-closure",
@@ -2324,16 +2324,16 @@
         },
         {
             "name": "lcobucci/jwt",
-            "version": "5.2.0",
+            "version": "5.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/lcobucci/jwt.git",
-                "reference": "0ba88aed12c04bd2ed9924f500673f32b67a6211"
+                "reference": "08071d8d2c7f4b00222cc4b1fb6aa46990a80f83"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lcobucci/jwt/zipball/0ba88aed12c04bd2ed9924f500673f32b67a6211",
-                "reference": "0ba88aed12c04bd2ed9924f500673f32b67a6211",
+                "url": "https://api.github.com/repos/lcobucci/jwt/zipball/08071d8d2c7f4b00222cc4b1fb6aa46990a80f83",
+                "reference": "08071d8d2c7f4b00222cc4b1fb6aa46990a80f83",
                 "shasum": ""
             },
             "require": {
@@ -2381,7 +2381,7 @@
             ],
             "support": {
                 "issues": "https://github.com/lcobucci/jwt/issues",
-                "source": "https://github.com/lcobucci/jwt/tree/5.2.0"
+                "source": "https://github.com/lcobucci/jwt/tree/5.3.0"
             },
             "funding": [
                 {
@@ -2393,7 +2393,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2023-11-20T21:17:42+00:00"
+            "time": "2024-04-11T23:07:54+00:00"
         },
         {
             "name": "league/commonmark",
@@ -3265,16 +3265,16 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "3.5.0",
+            "version": "3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "c915e2634718dbc8a4a15c61b0e62e7a44e14448"
+                "reference": "4b18b21a5527a3d5ffdac2fd35d3ab25a9597654"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c915e2634718dbc8a4a15c61b0e62e7a44e14448",
-                "reference": "c915e2634718dbc8a4a15c61b0e62e7a44e14448",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/4b18b21a5527a3d5ffdac2fd35d3ab25a9597654",
+                "reference": "4b18b21a5527a3d5ffdac2fd35d3ab25a9597654",
                 "shasum": ""
             },
             "require": {
@@ -3297,7 +3297,7 @@
                 "phpstan/phpstan": "^1.9",
                 "phpstan/phpstan-deprecation-rules": "^1.0",
                 "phpstan/phpstan-strict-rules": "^1.4",
-                "phpunit/phpunit": "^10.1",
+                "phpunit/phpunit": "^10.5.17",
                 "predis/predis": "^1.1 || ^2",
                 "ruflin/elastica": "^7",
                 "symfony/mailer": "^5.4 || ^6",
@@ -3350,7 +3350,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/3.5.0"
+                "source": "https://github.com/Seldaek/monolog/tree/3.6.0"
             },
             "funding": [
                 {
@@ -3362,7 +3362,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-10-27T15:32:31+00:00"
+            "time": "2024-04-12T21:02:21+00:00"
         },
         {
             "name": "nesbot/carbon",
@@ -5320,16 +5320,16 @@
         },
         {
             "name": "spatie/ignition",
-            "version": "1.13.1",
+            "version": "1.13.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/ignition.git",
-                "reference": "889bf1dfa59e161590f677728b47bf4a6893983b"
+                "reference": "952798e239d9969e4e694b124c2cc222798dbb28"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/ignition/zipball/889bf1dfa59e161590f677728b47bf4a6893983b",
-                "reference": "889bf1dfa59e161590f677728b47bf4a6893983b",
+                "url": "https://api.github.com/repos/spatie/ignition/zipball/952798e239d9969e4e694b124c2cc222798dbb28",
+                "reference": "952798e239d9969e4e694b124c2cc222798dbb28",
                 "shasum": ""
             },
             "require": {
@@ -5399,7 +5399,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-29T14:03:47+00:00"
+            "time": "2024-04-16T08:49:17+00:00"
         },
         {
             "name": "spatie/laravel-html",
@@ -5481,16 +5481,16 @@
         },
         {
             "name": "spatie/laravel-ignition",
-            "version": "2.5.1",
+            "version": "2.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-ignition.git",
-                "reference": "0c864b3cbd66ce67a2096c5f743e07ce8f1d6ab9"
+                "reference": "c93fcadcc4629775c839ac9a90916f07a660266f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/0c864b3cbd66ce67a2096c5f743e07ce8f1d6ab9",
-                "reference": "0c864b3cbd66ce67a2096c5f743e07ce8f1d6ab9",
+                "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/c93fcadcc4629775c839ac9a90916f07a660266f",
+                "reference": "c93fcadcc4629775c839ac9a90916f07a660266f",
                 "shasum": ""
             },
             "require": {
@@ -5500,7 +5500,7 @@
                 "illuminate/support": "^10.0|^11.0",
                 "php": "^8.1",
                 "spatie/flare-client-php": "^1.3.5",
-                "spatie/ignition": "^1.13",
+                "spatie/ignition": "^1.13.2",
                 "symfony/console": "^6.2.3|^7.0",
                 "symfony/var-dumper": "^6.2.3|^7.0"
             },
@@ -5569,7 +5569,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-04-02T06:30:22+00:00"
+            "time": "2024-04-16T08:57:16+00:00"
         },
         {
             "name": "spatie/period",
@@ -8610,30 +8610,37 @@
         },
         {
             "name": "twig/twig",
-            "version": "v3.8.0",
+            "version": "v3.9.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d"
+                "reference": "856cb5a6cfd6f3e4dc1f6c9a8f54e259503f7cf3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/9d15f0ac07f44dc4217883ec6ae02fd555c6f71d",
-                "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/856cb5a6cfd6f3e4dc1f6c9a8f54e259503f7cf3",
+                "reference": "856cb5a6cfd6f3e4dc1f6c9a8f54e259503f7cf3",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-ctype": "^1.8",
                 "symfony/polyfill-mbstring": "^1.3",
                 "symfony/polyfill-php80": "^1.22"
             },
             "require-dev": {
                 "psr/container": "^1.0|^2.0",
-                "symfony/phpunit-bridge": "^5.4.9|^6.3|^7.0"
+                "symfony/phpunit-bridge": "^5.4.9|^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
+                "files": [
+                    "src/Resources/core.php",
+                    "src/Resources/debug.php",
+                    "src/Resources/escaper.php",
+                    "src/Resources/string_loader.php"
+                ],
                 "psr-4": {
                     "Twig\\": "src/"
                 }
@@ -8666,7 +8673,7 @@
             ],
             "support": {
                 "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v3.8.0"
+                "source": "https://github.com/twigphp/Twig/tree/v3.9.2"
             },
             "funding": [
                 {
@@ -8678,7 +8685,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-21T18:54:41+00:00"
+            "time": "2024-04-17T14:16:25+00:00"
         },
         {
             "name": "vlucas/phpdotenv",
@@ -8900,16 +8907,16 @@
     "packages-dev": [
         {
             "name": "barryvdh/laravel-debugbar",
-            "version": "v3.13.3",
+            "version": "v3.13.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-debugbar.git",
-                "reference": "241e9bddb04ab42a04a5fe8b2b9654374c864229"
+                "reference": "00201bcd1eaf9b1d3debddcdc13c219e4835fb61"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/241e9bddb04ab42a04a5fe8b2b9654374c864229",
-                "reference": "241e9bddb04ab42a04a5fe8b2b9654374c864229",
+                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/00201bcd1eaf9b1d3debddcdc13c219e4835fb61",
+                "reference": "00201bcd1eaf9b1d3debddcdc13c219e4835fb61",
                 "shasum": ""
             },
             "require": {
@@ -8968,7 +8975,7 @@
             ],
             "support": {
                 "issues": "https://github.com/barryvdh/laravel-debugbar/issues",
-                "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.13.3"
+                "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.13.4"
             },
             "funding": [
                 {
@@ -8980,7 +8987,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-04-04T02:42:49+00:00"
+            "time": "2024-04-10T09:15:45+00:00"
         },
         {
             "name": "barryvdh/laravel-ide-helper",
@@ -9507,16 +9514,16 @@
         },
         {
             "name": "larastan/larastan",
-            "version": "v2.9.2",
+            "version": "v2.9.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/larastan/larastan.git",
-                "reference": "a79b46b96060504b400890674b83f66aa7f5db6d"
+                "reference": "101f1a4470f87326f4d3995411d28679d8800abe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/a79b46b96060504b400890674b83f66aa7f5db6d",
-                "reference": "a79b46b96060504b400890674b83f66aa7f5db6d",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/101f1a4470f87326f4d3995411d28679d8800abe",
+                "reference": "101f1a4470f87326f4d3995411d28679d8800abe",
                 "shasum": ""
             },
             "require": {
@@ -9529,15 +9536,15 @@
                 "illuminate/pipeline": "^9.52.16 || ^10.28.0 || ^11.0",
                 "illuminate/support": "^9.52.16 || ^10.28.0 || ^11.0",
                 "php": "^8.0.2",
-                "phpmyadmin/sql-parser": "^5.8.2",
-                "phpstan/phpstan": "^1.10.50"
+                "phpmyadmin/sql-parser": "^5.9.0",
+                "phpstan/phpstan": "^1.10.66"
             },
             "require-dev": {
                 "doctrine/coding-standard": "^12.0",
-                "nikic/php-parser": "^4.17.1",
-                "orchestra/canvas": "^7.11.1 || ^8.11.0 || ^9.0.0",
-                "orchestra/testbench": "^7.33.0 || ^8.13.0 || ^9.0.0",
-                "phpunit/phpunit": "^9.6.13 || ^10.5"
+                "nikic/php-parser": "^4.19.1",
+                "orchestra/canvas": "^7.11.1 || ^8.11.0 || ^9.0.2",
+                "orchestra/testbench": "^7.33.0 || ^8.13.0 || ^9.0.3",
+                "phpunit/phpunit": "^9.6.13 || ^10.5.16"
             },
             "suggest": {
                 "orchestra/testbench": "Using Larastan for analysing a package needs Testbench"
@@ -9585,7 +9592,7 @@
             ],
             "support": {
                 "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v2.9.2"
+                "source": "https://github.com/larastan/larastan/tree/v2.9.5"
             },
             "funding": [
                 {
@@ -9605,7 +9612,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2024-02-27T03:16:03+00:00"
+            "time": "2024-04-16T19:13:34+00:00"
         },
         {
             "name": "maximebf/debugbar",
@@ -10285,16 +10292,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.66",
+            "version": "1.10.67",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "94779c987e4ebd620025d9e5fdd23323903950bd"
+                "reference": "16ddbe776f10da6a95ebd25de7c1dbed397dc493"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/94779c987e4ebd620025d9e5fdd23323903950bd",
-                "reference": "94779c987e4ebd620025d9e5fdd23323903950bd",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/16ddbe776f10da6a95ebd25de7c1dbed397dc493",
+                "reference": "16ddbe776f10da6a95ebd25de7c1dbed397dc493",
                 "shasum": ""
             },
             "require": {
@@ -10337,13 +10344,9 @@
                 {
                     "url": "https://github.com/phpstan",
                     "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
-                    "type": "tidelift"
                 }
             ],
-            "time": "2024-03-28T16:17:31+00:00"
+            "time": "2024-04-16T07:22:02+00:00"
         },
         {
             "name": "phpstan/phpstan-deprecation-rules",
@@ -10765,16 +10768,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "10.5.17",
+            "version": "10.5.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "c1f736a473d21957ead7e94fcc029f571895abf5"
+                "reference": "c726f0de022368f6ed103e452a765d3304a996a4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c1f736a473d21957ead7e94fcc029f571895abf5",
-                "reference": "c1f736a473d21957ead7e94fcc029f571895abf5",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c726f0de022368f6ed103e452a765d3304a996a4",
+                "reference": "c726f0de022368f6ed103e452a765d3304a996a4",
                 "shasum": ""
             },
             "require": {
@@ -10846,7 +10849,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.17"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.19"
             },
             "funding": [
                 {
@@ -10862,7 +10865,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-05T04:39:01+00:00"
+            "time": "2024-04-17T14:06:18+00:00"
         },
         {
             "name": "sebastian/cli-parser",

config/firefly.php

@@ -117,7 +117,7 @@ return [
         'expression_engine' => false,
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => 'develop/2024-04-08',
+    'version'                      => 'develop/2024-04-18',
     'api_version'                  => '2.0.13',
     'db_version'                   => 24,
 
@@ -206,7 +206,6 @@ return [
 
     // web configuration:
     'trusted_proxies'              => env('TRUSTED_PROXIES', ''),
-    'layout'                       => envNonEmpty('FIREFLY_III_LAYOUT', 'v1'),
 
     // map configuration
     'default_location'             => [

public/v2/i18n/ca.json

@@ -15,22 +15,22 @@
     },
     "firefly": {
         "spent": "Gastat",
-        "administration_owner": "Administration owner: {{email}}",
-        "administration_you": "Your role: {{role}}",
-        "administration_role_owner": "Owner",
-        "administration_role_ro": "Read-only",
-        "administration_role_mng_trx": "Manage transactions",
-        "administration_role_mng_meta": "Manage classification and meta-data",
-        "administration_role_mng_budgets": "Manage budgets",
-        "administration_role_mng_piggies": "Manage piggy banks",
-        "administration_role_mng_subscriptions": "Manage subscriptions",
-        "administration_role_mng_rules": "Manage rules",
-        "administration_role_mng_recurring": "Manage recurring transactions ",
-        "administration_role_mng_webhooks": "Manage webhooks",
-        "administration_role_mng_currencies": "Manage currencies",
-        "administration_role_view_reports": "View reports",
-        "administration_role_full": "Full access",
-        "new_administration_created": "New financial administration \"{{title}}\" has been created",
+        "administration_owner": "Propietari de l'administraci\u00f3: {{email}}",
+        "administration_you": "El teu rol: {{role}}",
+        "administration_role_owner": "Propietari",
+        "administration_role_ro": "Nom\u00e9s de lectura",
+        "administration_role_mng_trx": "Gestionar transaccions",
+        "administration_role_mng_meta": "Gestionar classificaci\u00f3 i meta-dades",
+        "administration_role_mng_budgets": "Gestionar pressupostos",
+        "administration_role_mng_piggies": "Administra guardioles",
+        "administration_role_mng_subscriptions": "Gestionar subscripcions",
+        "administration_role_mng_rules": "Gestionar normes",
+        "administration_role_mng_recurring": "Gestionar transaccions recurrents ",
+        "administration_role_mng_webhooks": "Gestionar Webhooks",
+        "administration_role_mng_currencies": "Gestionar divises",
+        "administration_role_view_reports": "Veure informes",
+        "administration_role_full": "Acc\u00e9s total",
+        "new_administration_created": "S'ha creat una nova administraci\u00f3 financera \"{{title}}\"",
         "left": "Queda",
         "paid": "Pagat",
         "errors_submission_v2": "Hi ha hagut un error amb el teu enviament. Per favor, comprova els seg\u00fcents errors: {{errorMessage}}",

public/v2/i18n/ca_ES.json

@@ -15,22 +15,22 @@
     },
     "firefly": {
         "spent": "Gastat",
-        "administration_owner": "Administration owner: {{email}}",
-        "administration_you": "Your role: {{role}}",
-        "administration_role_owner": "Owner",
-        "administration_role_ro": "Read-only",
-        "administration_role_mng_trx": "Manage transactions",
-        "administration_role_mng_meta": "Manage classification and meta-data",
-        "administration_role_mng_budgets": "Manage budgets",
-        "administration_role_mng_piggies": "Manage piggy banks",
-        "administration_role_mng_subscriptions": "Manage subscriptions",
-        "administration_role_mng_rules": "Manage rules",
-        "administration_role_mng_recurring": "Manage recurring transactions ",
-        "administration_role_mng_webhooks": "Manage webhooks",
-        "administration_role_mng_currencies": "Manage currencies",
-        "administration_role_view_reports": "View reports",
-        "administration_role_full": "Full access",
-        "new_administration_created": "New financial administration \"{{title}}\" has been created",
+        "administration_owner": "Propietari de l'administraci\u00f3: {{email}}",
+        "administration_you": "El teu rol: {{role}}",
+        "administration_role_owner": "Propietari",
+        "administration_role_ro": "Nom\u00e9s de lectura",
+        "administration_role_mng_trx": "Gestionar transaccions",
+        "administration_role_mng_meta": "Gestionar classificaci\u00f3 i meta-dades",
+        "administration_role_mng_budgets": "Gestionar pressupostos",
+        "administration_role_mng_piggies": "Administra guardioles",
+        "administration_role_mng_subscriptions": "Gestionar subscripcions",
+        "administration_role_mng_rules": "Gestionar normes",
+        "administration_role_mng_recurring": "Gestionar transaccions recurrents ",
+        "administration_role_mng_webhooks": "Gestionar Webhooks",
+        "administration_role_mng_currencies": "Gestionar divises",
+        "administration_role_view_reports": "Veure informes",
+        "administration_role_full": "Acc\u00e9s total",
+        "new_administration_created": "S'ha creat una nova administraci\u00f3 financera \"{{title}}\"",
         "left": "Queda",
         "paid": "Pagat",
         "errors_submission_v2": "Hi ha hagut un error amb el teu enviament. Per favor, comprova els seg\u00fcents errors: {{errorMessage}}",

public/v2/i18n/it.json

@@ -4,7 +4,7 @@
         "date_time_fns": "do MMMM yyyy @ HH:mm:ss",
         "month_and_day_fns": "d MMMM y",
         "does_not_exist": "(config.does_not_exist)",
-        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
+        "date_time_fns_short": "do MMMM yyyy @ HH:mm"
     },
     "form": {
         "title": "Titolo"
@@ -17,10 +17,10 @@
         "spent": "Speso",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",
-        "administration_role_owner": "Owner",
-        "administration_role_ro": "Read-only",
-        "administration_role_mng_trx": "Manage transactions",
-        "administration_role_mng_meta": "Manage classification and meta-data",
+        "administration_role_owner": "Proprietario",
+        "administration_role_ro": "Sola lettura",
+        "administration_role_mng_trx": "Gestisci le transazioni",
+        "administration_role_mng_meta": "Gestisci classificazione e meta-dati",
         "administration_role_mng_budgets": "Manage budgets",
         "administration_role_mng_piggies": "Manage piggy banks",
         "administration_role_mng_subscriptions": "Manage subscriptions",
@@ -48,7 +48,7 @@
         "unknown_dest_plain": "Conto di destinazione sconosciuto",
         "unknown_any_plain": "Conto sconosciuto",
         "unknown_budget_plain": "Nessun budget",
-        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
+        "stored_journal_js": "Nuova transazione \"{{description}} \" creata con successo",
         "wait_loading_transaction": "Attendi il caricamento del modello",
         "nothing_found": "(nessun risultato)",
         "wait_loading_data": "Ti preghiamo di attendere il caricamento delle tue informazioni...",

public/v2/i18n/it_IT.json

@@ -4,7 +4,7 @@
         "date_time_fns": "do MMMM yyyy @ HH:mm:ss",
         "month_and_day_fns": "d MMMM y",
         "does_not_exist": "(config.does_not_exist)",
-        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
+        "date_time_fns_short": "do MMMM yyyy @ HH:mm"
     },
     "form": {
         "title": "Titolo"
@@ -17,10 +17,10 @@
         "spent": "Speso",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",
-        "administration_role_owner": "Owner",
-        "administration_role_ro": "Read-only",
-        "administration_role_mng_trx": "Manage transactions",
-        "administration_role_mng_meta": "Manage classification and meta-data",
+        "administration_role_owner": "Proprietario",
+        "administration_role_ro": "Sola lettura",
+        "administration_role_mng_trx": "Gestisci le transazioni",
+        "administration_role_mng_meta": "Gestisci classificazione e meta-dati",
         "administration_role_mng_budgets": "Manage budgets",
         "administration_role_mng_piggies": "Manage piggy banks",
         "administration_role_mng_subscriptions": "Manage subscriptions",
@@ -48,7 +48,7 @@
         "unknown_dest_plain": "Conto di destinazione sconosciuto",
         "unknown_any_plain": "Conto sconosciuto",
         "unknown_budget_plain": "Nessun budget",
-        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
+        "stored_journal_js": "Nuova transazione \"{{description}} \" creata con successo",
         "wait_loading_transaction": "Attendi il caricamento del modello",
         "nothing_found": "(nessun risultato)",
         "wait_loading_data": "Ti preghiamo di attendere il caricamento delle tue informazioni...",

public/v2/i18n/pt-br.json

@@ -4,7 +4,7 @@
         "date_time_fns": "dd 'de' MMMM 'de' yyyy, '\u00e0s' HH:mm:ss",
         "month_and_day_fns": "d [de] MMMM [de] y",
         "does_not_exist": "(config.does_not_exist)",
-        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
+        "date_time_fns_short": "dd\/MMM\/yyyy HH:mm"
     },
     "form": {
         "title": "T\u00edtulo"
@@ -15,25 +15,25 @@
     },
     "firefly": {
         "spent": "Gasto",
-        "administration_owner": "Administration owner: {{email}}",
-        "administration_you": "Your role: {{role}}",
-        "administration_role_owner": "Owner",
-        "administration_role_ro": "Read-only",
-        "administration_role_mng_trx": "Manage transactions",
-        "administration_role_mng_meta": "Manage classification and meta-data",
-        "administration_role_mng_budgets": "Manage budgets",
-        "administration_role_mng_piggies": "Manage piggy banks",
-        "administration_role_mng_subscriptions": "Manage subscriptions",
-        "administration_role_mng_rules": "Manage rules",
-        "administration_role_mng_recurring": "Manage recurring transactions ",
-        "administration_role_mng_webhooks": "Manage webhooks",
-        "administration_role_mng_currencies": "Manage currencies",
-        "administration_role_view_reports": "View reports",
-        "administration_role_full": "Full access",
-        "new_administration_created": "New financial administration \"{{title}}\" has been created",
+        "administration_owner": "Propriet\u00e1rio da administra\u00e7\u00e3o: {{email}}",
+        "administration_you": "Sua fun\u00e7\u00e3o: {{role}}",
+        "administration_role_owner": "Propriet\u00e1rio",
+        "administration_role_ro": "Somente leitura",
+        "administration_role_mng_trx": "Gerenciar transa\u00e7\u00f5es",
+        "administration_role_mng_meta": "Gerenciar classifica\u00e7\u00e3o e metadados",
+        "administration_role_mng_budgets": "Gerenciar or\u00e7amentos",
+        "administration_role_mng_piggies": "Gerenciar cofrinhos",
+        "administration_role_mng_subscriptions": "Gerenciar assinaturas",
+        "administration_role_mng_rules": "Gerenciar regras",
+        "administration_role_mng_recurring": "Gerenciar transa\u00e7\u00f5es recorrentes ",
+        "administration_role_mng_webhooks": "Gerenciar webhooks",
+        "administration_role_mng_currencies": "Gerenciar moedas",
+        "administration_role_view_reports": "Ver relat\u00f3rios",
+        "administration_role_full": "Acesso completo",
+        "new_administration_created": "Nova administra\u00e7\u00e3o financeira \"{{title}}\" foi criada",
         "left": "Restante",
         "paid": "Pago",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
+        "errors_submission_v2": "Algo deu errado com seu envio. Por favor, verifique os erros abaixo: {{errorMessage}}",
         "unpaid": "N\u00e3o pago",
         "default_group_title_name_plain": "sem grupo",
         "subscriptions_in_group": "Assinaturas no grupo \"%{title}\"",
@@ -48,7 +48,7 @@
         "unknown_dest_plain": "Conta de destino desconhecida",
         "unknown_any_plain": "Conta desconhecida",
         "unknown_budget_plain": "Nenhum or\u00e7amento",
-        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
+        "stored_journal_js": "Transa\u00e7\u00e3o \"{{description}}\" criada com sucesso",
         "wait_loading_transaction": "Por favor, aguarde o formul\u00e1rio carregar",
         "nothing_found": "(nada encontrado)",
         "wait_loading_data": "Por favor, aguarde suas informa\u00e7\u00f5es serem carregadas...",

public/v2/i18n/pt_BR.json

@@ -4,7 +4,7 @@
         "date_time_fns": "dd 'de' MMMM 'de' yyyy, '\u00e0s' HH:mm:ss",
         "month_and_day_fns": "d [de] MMMM [de] y",
         "does_not_exist": "(config.does_not_exist)",
-        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
+        "date_time_fns_short": "dd\/MMM\/yyyy HH:mm"
     },
     "form": {
         "title": "T\u00edtulo"
@@ -15,25 +15,25 @@
     },
     "firefly": {
         "spent": "Gasto",
-        "administration_owner": "Administration owner: {{email}}",
-        "administration_you": "Your role: {{role}}",
-        "administration_role_owner": "Owner",
-        "administration_role_ro": "Read-only",
-        "administration_role_mng_trx": "Manage transactions",
-        "administration_role_mng_meta": "Manage classification and meta-data",
-        "administration_role_mng_budgets": "Manage budgets",
-        "administration_role_mng_piggies": "Manage piggy banks",
-        "administration_role_mng_subscriptions": "Manage subscriptions",
-        "administration_role_mng_rules": "Manage rules",
-        "administration_role_mng_recurring": "Manage recurring transactions ",
-        "administration_role_mng_webhooks": "Manage webhooks",
-        "administration_role_mng_currencies": "Manage currencies",
-        "administration_role_view_reports": "View reports",
-        "administration_role_full": "Full access",
-        "new_administration_created": "New financial administration \"{{title}}\" has been created",
+        "administration_owner": "Propriet\u00e1rio da administra\u00e7\u00e3o: {{email}}",
+        "administration_you": "Sua fun\u00e7\u00e3o: {{role}}",
+        "administration_role_owner": "Propriet\u00e1rio",
+        "administration_role_ro": "Somente leitura",
+        "administration_role_mng_trx": "Gerenciar transa\u00e7\u00f5es",
+        "administration_role_mng_meta": "Gerenciar classifica\u00e7\u00e3o e metadados",
+        "administration_role_mng_budgets": "Gerenciar or\u00e7amentos",
+        "administration_role_mng_piggies": "Gerenciar cofrinhos",
+        "administration_role_mng_subscriptions": "Gerenciar assinaturas",
+        "administration_role_mng_rules": "Gerenciar regras",
+        "administration_role_mng_recurring": "Gerenciar transa\u00e7\u00f5es recorrentes ",
+        "administration_role_mng_webhooks": "Gerenciar webhooks",
+        "administration_role_mng_currencies": "Gerenciar moedas",
+        "administration_role_view_reports": "Ver relat\u00f3rios",
+        "administration_role_full": "Acesso completo",
+        "new_administration_created": "Nova administra\u00e7\u00e3o financeira \"{{title}}\" foi criada",
         "left": "Restante",
         "paid": "Pago",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
+        "errors_submission_v2": "Algo deu errado com seu envio. Por favor, verifique os erros abaixo: {{errorMessage}}",
         "unpaid": "N\u00e3o pago",
         "default_group_title_name_plain": "sem grupo",
         "subscriptions_in_group": "Assinaturas no grupo \"%{title}\"",
@@ -48,7 +48,7 @@
         "unknown_dest_plain": "Conta de destino desconhecida",
         "unknown_any_plain": "Conta desconhecida",
         "unknown_budget_plain": "Nenhum or\u00e7amento",
-        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
+        "stored_journal_js": "Transa\u00e7\u00e3o \"{{description}}\" criada com sucesso",
         "wait_loading_transaction": "Por favor, aguarde o formul\u00e1rio carregar",
         "nothing_found": "(nada encontrado)",
         "wait_loading_data": "Por favor, aguarde suas informa\u00e7\u00f5es serem carregadas...",

public/v2/i18n/sl.json

@@ -30,7 +30,7 @@
         "administration_role_mng_currencies": "Upravljanje valut",
         "administration_role_view_reports": "Prikaz poro\u010dil",
         "administration_role_full": "Neomejen dostop",
-        "new_administration_created": "New financial administration \"{{title}}\" has been created",
+        "new_administration_created": "Ustvarjena je bila nova finan\u010dna administracija \"{{title}}\"",
         "left": "Preostalo",
         "paid": "Pla\u010dano",
         "errors_submission_v2": "Nekaj je bilo narobe z va\u0161o oddajo. Preverite spodnje napake: {{errorMessage}}",

public/v2/i18n/sl_SI.json

@@ -30,7 +30,7 @@
         "administration_role_mng_currencies": "Upravljanje valut",
         "administration_role_view_reports": "Prikaz poro\u010dil",
         "administration_role_full": "Neomejen dostop",
-        "new_administration_created": "New financial administration \"{{title}}\" has been created",
+        "new_administration_created": "Ustvarjena je bila nova finan\u010dna administracija \"{{title}}\"",
         "left": "Preostalo",
         "paid": "Pla\u010dano",
         "errors_submission_v2": "Nekaj je bilo narobe z va\u0161o oddajo. Preverite spodnje napake: {{errorMessage}}",

resources/assets/v1/package.json

@@ -10,7 +10,7 @@
         "prod": "mix --production"
     },
     "dependencies": {
-        "date-fns": "^2.30.0",
+        "date-fns": "^3.6.0",
         "stream-browserify": "^3.0.0"
     },
     "devDependencies": {

resources/assets/v1/src/locales/pt-br.json

@@ -5,8 +5,8 @@
         "flash_warning": "Aten\u00e7\u00e3o!",
         "flash_success": "Sucesso!",
         "close": "Fechar",
-        "select_dest_account": "Please select or type a valid destination account name",
-        "select_source_account": "Please select or type a valid source account name",
+        "select_dest_account": "Por favor, selecione ou digite um nome de conta de destino v\u00e1lido",
+        "select_source_account": "Por favor, selecione ou digite um nome de conta de origem v\u00e1lido",
         "split_transaction_title": "Descri\u00e7\u00e3o da transa\u00e7\u00e3o dividida",
         "errors_submission": "Algo deu errado com seu envio. Por favor, verifique os erros abaixo.",
         "split": "Dividir",

resources/assets/v1/webpack.mix.js

@@ -20,6 +20,7 @@
 
 let mix = require('laravel-mix');
 
+
 mix.webpackConfig({
     resolve: {
         alias: {

resources/assets/v2/package.json

@@ -1,6 +1,7 @@
 {
     "name": "v2",
     "private": true,
+    "type": "module",
     "scripts": {
         "dev": "vite",
         "build": "vite build --emptyOutDir",
@@ -8,11 +9,11 @@
     },
     "devDependencies": {
         "axios": "^1.6.8",
-        "laravel-vite-plugin": "^0.8.1",
+        "laravel-vite-plugin": "^1.0.2",
         "patch-package": "^8.0.0",
-        "sass": "^1.72.0",
-        "vite": "^4.5.3",
-        "vite-plugin-manifest-sri": "^0.1.0"
+        "sass": "^1.75.0",
+        "vite": "^5",
+        "vite-plugin-manifest-sri": "^0.2.0"
     },
     "dependencies": {
         "@ag-grid-community/client-side-row-model": "^31.0.3",
@@ -30,7 +31,7 @@
         "chartjs-adapter-date-fns": "^3.0.0",
         "chartjs-chart-sankey": "^0.12.0",
         "date-fns": "^3.6.0",
-        "i18next": "^23.10.1",
+        "i18next": "^23.11.2",
         "i18next-chained-backend": "^4.6.2",
         "i18next-http-backend": "^2.4.2",
         "i18next-localstorage-backend": "^4.2.0",

resources/assets/v2/vite.config.js

@@ -65,20 +65,13 @@ export default defineConfig({
             publicDirectory: '../../../public',
             refresh: true,
         }),
-        //manifestSRI(),
+        manifestSRI(),
 
     ],
 
 
     server: {
         usePolling: true,
-        allowedHosts: '*.sd.internal',
-        host: '0.0.0.0',
-        hmr: {host},
-        cors: true
-        // https: {
-        //     key: fs.readFileSync(`/Users/sander/Sites/vm/tls-certificates/wildcard.sd.local.key`),
-        //     cert: fs.readFileSync(`/Users/sander/Sites/vm/tls-certificates/wildcard.sd.local.crt`),
-        // },
+        host: '10.0.0.15',
     },
 });

resources/lang/ca_ES/firefly.php

@@ -1419,34 +1419,34 @@ return [
     // Financial administrations
     'administration_index'                                => 'Administració financera',
     'administrations_index_menu'                          => 'Administració financera',
-    'administrations_breadcrumb'                          => 'Financial administrations',
-    'administrations_page_title'                          => 'Financial administrations',
-    'administrations_page_sub_title'                      => 'Overview',
-    'create_administration'                               => 'Create new administration',
-    'administration_owner'                                => 'Administration owner: {{email}}',
-    'administration_you'                                  => 'Your role: {{role}}',
-    'other_users_in_admin'                                => 'Other users in this administration',
-    'administrations_create_breadcrumb'                   => 'Create new financial administration',
-    'administrations_page_create_sub_title'               => 'Create new financial administration',
-    'basic_administration_information'                    => 'Basic administration information',
-    'new_administration_created'                          => 'New financial administration "{{title}}" has been created',
-    'edit_administration_breadcrumb'                      => 'Edit financial administration ":title"',
-    'administrations_page_edit_sub_title'                 => 'Edit financial administration ":title"',
+    'administrations_breadcrumb'                          => 'Administracions financeres',
+    'administrations_page_title'                          => 'Administracions financeres',
+    'administrations_page_sub_title'                      => 'Visió general',
+    'create_administration'                               => 'Crea una nova administració',
+    'administration_owner'                                => 'Propietari de l\'administració: {{email}}',
+    'administration_you'                                  => 'El teu rol: {{role}}',
+    'other_users_in_admin'                                => 'Altres usuaris a aquesta administració',
+    'administrations_create_breadcrumb'                   => 'Crea una nova administració financera',
+    'administrations_page_create_sub_title'               => 'Crea una nova administració financera',
+    'basic_administration_information'                    => 'Informació de l\'administració bàsica',
+    'new_administration_created'                          => 'S\'ha creat una nova administració financera "{{title}}"',
+    'edit_administration_breadcrumb'                      => 'Edita l\'administració financera ":title"',
+    'administrations_page_edit_sub_title'                 => 'Edita l\'administració financera ":title"',
 
     // roles
-    'administration_role_owner'                           => 'Owner',
-    'administration_role_ro'                              => 'Read-only',
-    'administration_role_mng_trx'                         => 'Manage transactions',
-    'administration_role_mng_meta'                        => 'Manage classification and meta-data',
-    'administration_role_mng_budgets'                     => 'Manage budgets',
-    'administration_role_mng_piggies'                     => 'Manage piggy banks',
-    'administration_role_mng_subscriptions'               => 'Manage subscriptions',
-    'administration_role_mng_rules'                       => 'Manage rules',
-    'administration_role_mng_recurring'                   => 'Manage recurring transactions ',
-    'administration_role_mng_webhooks'                    => 'Manage webhooks',
-    'administration_role_mng_currencies'                  => 'Manage currencies',
-    'administration_role_view_reports'                    => 'View reports',
-    'administration_role_full'                            => 'Full access',
+    'administration_role_owner'                           => 'Propietari',
+    'administration_role_ro'                              => 'Només de lectura',
+    'administration_role_mng_trx'                         => 'Gestionar transaccions',
+    'administration_role_mng_meta'                        => 'Gestionar classificació i meta-dades',
+    'administration_role_mng_budgets'                     => 'Gestionar pressupostos',
+    'administration_role_mng_piggies'                     => 'Administra guardioles',
+    'administration_role_mng_subscriptions'               => 'Gestionar subscripcions',
+    'administration_role_mng_rules'                       => 'Gestionar normes',
+    'administration_role_mng_recurring'                   => 'Gestionar transaccions recurrents ',
+    'administration_role_mng_webhooks'                    => 'Gestionar Webhooks',
+    'administration_role_mng_currencies'                  => 'Gestionar divises',
+    'administration_role_view_reports'                    => 'Veure informes',
+    'administration_role_full'                            => 'Accés total',
 
     // profile:
     'purge_data_title'                                    => 'Purgar dades de Firefly III',

resources/lang/ca_ES/validation.php

@@ -68,8 +68,8 @@ return [
     'invalid_selection'               => 'La selecció és invàlida.',
     'belongs_user'                    => 'Aquest valor està enllaçat a un objecte que sembla que no existeix.',
     'belongs_user_or_user_group'      => 'Aquest valor està enllaçat a un objecte que sembla no existir a la teva administració financera actual.',
-    'no_access_group'                 => 'The user has no access to this user group.',
-    'no_accepted_roles_defined'       => 'No access roles have been defined for this endpoint, access denied.',
+    'no_access_group'                 => 'L\'usuari no té accés a aquest grup d\'usuaris.',
+    'no_accepted_roles_defined'       => 'No s\'ha definit cap rol d\'accés per a aquest endpoint, accés denegat.',
     'at_least_one_transaction'        => 'Necessites almenys una transacció.',
     'recurring_transaction_id'        => 'Necessites almenys una transacció.',
     'need_id_to_match'                => 'Has d\'enviar aquesta entrada amb un ID perquè l\'API sigui capaç de comparar-lo.',
@@ -302,7 +302,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.',
+    'administration_owner_rename'     => 'No pots canviar el nom de la teva administració estàndard.',
 ];
 
 /*

resources/lang/de_DE/validation.php

@@ -68,7 +68,7 @@ return [
     'invalid_selection'               => 'Ihre Auswahl ist ungültig.',
     'belongs_user'                    => 'Dieser Wert verweist auf ein Objekt, das offenbar nicht existiert.',
     'belongs_user_or_user_group'      => 'Dieser Wert verweist auf ein Objekt, das in Ihrer aktuellen Finanzverwaltung offenbar nicht existiert.',
-    'no_access_group'                 => 'The user has no access to this user group.',
+    'no_access_group'                 => 'Der Benutzer hat keinen Zugriff auf diese Benutzergruppe.',
     'no_accepted_roles_defined'       => 'No access roles have been defined for this endpoint, access denied.',
     'at_least_one_transaction'        => 'Sie brauchen mindestens eine Transaktion.',
     'recurring_transaction_id'        => 'Sie benötigen mindestens eine Buchung.',

resources/lang/fr_FR/validation.php

@@ -68,8 +68,8 @@ return [
     'invalid_selection'               => 'Votre sélection est invalide.',
     'belongs_user'                    => 'Cette valeur est liée à un objet qui ne semble pas exister.',
     'belongs_user_or_user_group'      => 'Cette valeur est liée à un objet qui ne semble pas exister dans votre administration financière actuelle.',
-    'no_access_group'                 => 'The user has no access to this user group.',
-    'no_accepted_roles_defined'       => 'No access roles have been defined for this endpoint, access denied.',
+    'no_access_group'                 => 'L\'utilisateur n\'a pas accès à ce groupe d\'utilisateurs.',
+    'no_accepted_roles_defined'       => 'Aucun rôle d\'accès n\'a été défini pour ce point d\'accès, accès refusé.',
     'at_least_one_transaction'        => 'Besoin d\'au moins une opération.',
     'recurring_transaction_id'        => 'Au moins une opération est nécessaire.',
     'need_id_to_match'                => 'Vous devez saisir cette entrée avec un identifiant pour que l\'API puisse la faire correspondre.',

resources/lang/it_IT/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'            => 'do MMMM yyyy @ HH:mm:ss',
-    'date_time_fns_short'      => 'MMMM do, yyyy @ HH:mm',
+    'date_time_fns_short'      => 'do MMMM yyyy @ HH:mm',
 
     // 'specific_day'            => '%e %B %Y',
     'specific_day_js'          => 'D MMMM YYYY',

resources/lang/it_IT/errors.php

@@ -42,7 +42,7 @@ return [
     'fatal_error'             => 'Si è verificato un errore fatale. Controlla i file di login "storage/Los" o usa "Docker Los f [container]" per vedere cosa sta succedendo.',
     'maintenance_mode'        => 'Firefox III è in modalità di manutenzione.',
     'be_right_back'           => 'Torno subito!',
-    '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 non è disponibile per via di una manutenzione necessaria. Per favore riprova tra qualche istante. Se ti capita di vedere questo messaggio sul sito demo, attendi qualche minuto. Il database viene reimpostato ogni poche ore.',
     'error_occurred'          => 'Oops! Si è verificato un errore.',
     'db_error_occurred'       => 'Oops! Si è verificato un errore del database.',
     'error_not_recoverable'   => 'Sfortunatamente questo errore non è riparabile :(. Firefly III è rotto. L\'errore è:',

resources/lang/it_IT/firefly.php

@@ -896,9 +896,9 @@ return [
     'rule_trigger_budget_is'                              => 'Il budget è ":trigger_value"',
     'rule_trigger_tag_is_choice'                          => 'Qualsiasi tag è..',
     'rule_trigger_tag_is'                                 => 'Qualsiasi tag è ":trigger_value"',
-    'rule_trigger_tag_contains_choice'                    => 'Any tag contains..',
-    'rule_trigger_tag_contains'                           => 'Any tag contains ":trigger_value"',
-    'rule_trigger_tag_ends_choice'                        => 'Any tag ends with..',
+    'rule_trigger_tag_contains_choice'                    => 'Qualsiasi tag contiene..',
+    'rule_trigger_tag_contains'                           => 'Qualsiasi tag contiene ":trigger_value"',
+    'rule_trigger_tag_ends_choice'                        => 'Qualsiasi tag finisce con..',
     'rule_trigger_tag_ends'                               => 'Any tag ends with ":trigger_value"',
     'rule_trigger_tag_starts_choice'                      => 'Any tag starts with..',
     'rule_trigger_tag_starts'                             => 'Any tag starts with ":trigger_value"',
@@ -1434,10 +1434,10 @@ return [
     'administrations_page_edit_sub_title'                 => 'Edit financial administration ":title"',
 
     // roles
-    'administration_role_owner'                           => 'Owner',
-    'administration_role_ro'                              => 'Read-only',
-    'administration_role_mng_trx'                         => 'Manage transactions',
-    'administration_role_mng_meta'                        => 'Manage classification and meta-data',
+    'administration_role_owner'                           => 'Proprietario',
+    'administration_role_ro'                              => 'Sola lettura',
+    'administration_role_mng_trx'                         => 'Gestisci le transazioni',
+    'administration_role_mng_meta'                        => 'Gestisci classificazione e meta-dati',
     'administration_role_mng_budgets'                     => 'Manage budgets',
     'administration_role_mng_piggies'                     => 'Manage piggy banks',
     'administration_role_mng_subscriptions'               => 'Manage subscriptions',
@@ -2017,7 +2017,7 @@ return [
     'deleted_transfer'                                    => 'Trasferimento ":description" eliminato correttamente',
     'deleted_reconciliation'                              => 'Transazione di riconciliazione ":description" elimina con successo',
     'stored_journal'                                      => 'Nuova transazione ":description" creata correttamente',
-    'stored_journal_js'                                   => 'Successfully created new transaction "{{description}}"',
+    'stored_journal_js'                                   => 'Nuova transazione "{{description}} " creata con successo',
     'stored_journal_no_descr'                             => 'Hai creato con successo la nuova transazione',
     'updated_journal_no_descr'                            => 'Transazione aggiornata con successo',
     'select_transactions'                                 => 'Seleziona transazioni',
@@ -2325,7 +2325,7 @@ return [
     'description'                                         => 'Descrizione',
     'sum_of_period'                                       => 'Somma del periodo',
     'average_in_period'                                   => 'Media nel periodo',
-    'no_account_role'                                     => '(no role)',
+    'no_account_role'                                     => '(nessun ruolo)',
     'account_role_defaultAsset'                           => 'Conto attività predefinito',
     'account_role_sharedAsset'                            => 'Conto attività condiviso',
     'account_role_savingAsset'                            => 'Conto risparmio',
@@ -2490,7 +2490,7 @@ return [
     'block_code_bounced'                                  => 'Messaggi email respinti',
     'block_code_expired'                                  => 'Conto demo scaduto',
     'no_block_code'                                       => 'Nessun motivo per bloccare o non bloccare un utente',
-    'demo_user_export'                                    => 'The demo user cannot export data',
+    'demo_user_export'                                    => 'L\'utente demo non può esportare dati',
     'block_code_email_changed'                            => 'L\'utente non ha ancora confermato il nuovo indirizzo emails',
     'admin_update_email'                                  => 'Contrariamente alla pagina del profilo, l\'utente NON riceverà alcuna notifica al proprio indirizzo email!',
     'update_user'                                         => 'Aggiorna utente',

resources/lang/it_IT/rules.php

@@ -70,5 +70,5 @@ return [
     'cannot_find_budget'                          => 'Firefly III non riesce a trovare il budget ":name"',
     'cannot_find_category'                        => 'Firefly III non riesce a trovare la categoria ":name"',
     'cannot_set_budget'                           => 'Firefly III non può impostare il budget ":name" a una transazione di tipo ":type"',
-    'journal_invalid_amount'                      => 'Firefly III can\'t set amount ":amount" because it is not a valid number.',
+    'journal_invalid_amount'                      => 'Firefly III non può impostare l\'importo ":amount" perché non è un numero valido.',
 ];

resources/lang/it_IT/validation.php

@@ -55,11 +55,11 @@ return [
     'reconciled_forbidden_field'      => 'Questa transazione è già riconciliata, non è possibile modificare il campo ":field"',
     'deleted_user'                    => 'A causa dei vincoli di sicurezza, non è possibile registrarsi utilizzando questo indirizzo email.',
     'rule_trigger_value'              => 'Questo valore non è valido per il trigger selezionato.',
-    'rule_action_expression'          => 'Invalid expression. :error',
+    'rule_action_expression'          => 'Espressione non valida. :error',
     'rule_action_value'               => 'Questo valore non è valido per l\'azione selezionata.',
     'file_already_attached'           => 'Il file caricato ":name" è già associato a questo oggetto.',
     'file_attached'                   => 'File caricato con successo ":name".',
-    'file_zero'                       => 'The file is zero bytes in size.',
+    'file_zero'                       => 'Il file ha dimensione zero.',
     'must_exist'                      => 'L\'ID nel campo :attribute non esiste nel database.',
     'all_accounts_equal'              => 'Tutti i conti in questo campo devono essere uguali.',
     'group_title_mandatory'           => 'Il titolo del gruppo è obbligatorio quando ci sono più di una transazione.',
@@ -68,8 +68,8 @@ return [
     'invalid_selection'               => 'La tua selezione non è valida.',
     'belongs_user'                    => 'Questo valore è collegato a un oggetto che non sembra esistere.',
     'belongs_user_or_user_group'      => 'Questo valore è collegato a un oggetto che non sembra esistere nella tua attuale amministrazione finanziaria.',
-    'no_access_group'                 => 'The user has no access to this user group.',
-    'no_accepted_roles_defined'       => 'No access roles have been defined for this endpoint, access denied.',
+    'no_access_group'                 => 'L\'utente non ha accesso a questo gruppo.',
+    'no_accepted_roles_defined'       => 'Nessun ruolo di accesso è stato definito per questo endpoint, accesso negato.',
     'at_least_one_transaction'        => 'Hai bisogno di almeno una transazione.',
     'recurring_transaction_id'        => 'Hai bisogno di almeno una transazione.',
     'need_id_to_match'                => 'È necessario inviare questa voce con un ID affinché l\'API sia in grado di abbinarla.',
@@ -199,7 +199,7 @@ return [
  *
  */
 
-    'secure_password'                 => 'This is not a secure password. Please try again. For more information, visit https://bit.ly/FF3-password',
+    'secure_password'                 => 'Questa non è una password sicura. Per favore riprova. Per ulteriori informazioni, visita https://bit.ly/FF3-password',
     'valid_recurrence_rep_type'       => 'Il tipo di ripetizione della transazione ricorrente non è valido.',
     'valid_recurrence_rep_moment'     => 'Il momento di ripetizione per questo tipo di ripetizione non è valido.',
     'invalid_account_info'            => 'Informazione sul conto non valida.',

resources/lang/pt_BR/config.php

@@ -64,7 +64,7 @@ return [
     // 'date_time'               => '%B %e, %Y, @ %T',
     'date_time_js'             => 'DD [de] MMMM [de] YYYY, [às] HH:mm:ss',
     'date_time_fns'            => 'dd \'de\' MMMM \'de\' yyyy, \'às\' HH:mm:ss',
-    'date_time_fns_short'      => 'MMMM do, yyyy @ HH:mm',
+    'date_time_fns_short'      => 'dd/MMM/yyyy HH:mm',
 
     // 'specific_day'            => '%e %B %Y',
     'specific_day_js'          => 'DD [de] MMMM [de] YYYY',

resources/lang/pt_BR/errors.php

@@ -42,7 +42,7 @@ return [
     'fatal_error'             => 'Houve um erro fatal. Por favor, verifique os arquivos de log em "storage/logs" ou use "docker logs -f [container]" para ver o que está acontecendo.',
     'maintenance_mode'        => 'Firefly III está em modo de manutenção.',
     'be_right_back'           => 'Volta logo!',
-    '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 está desligado para algumas manutenções necessárias. Volte em um segundo. Se acontecer de você ver esta mensagem no site de demonstração, espere alguns minutos. O banco de dados é reiniciado a cada algumas horas.',
     'error_occurred'          => 'Ops! Aconteceu um erro.',
     'db_error_occurred'       => 'Ops! Ocorreu um erro no banco de dados.',
     'error_not_recoverable'   => 'Infelizmente este erro não é recuperável :(. Firefly III quebrou. O erro é:',

resources/lang/pt_BR/firefly.php

@@ -113,7 +113,7 @@ return [
     'two_factor_forgot'                                   => 'Esqueci minha autenticação em duas etapas.',
     'two_factor_lost_header'                              => 'Perdeu sua autenticação em duas etapas?',
     'two_factor_lost_intro'                               => 'Se você perdeu seus códigos de backup também, você tem azar. Isso não é algo que você pode corrigir a partir da interface da web. Você tem duas escolhas.',
-    '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'                            => 'Se você roda sua própria instância do Firefly III, leia <a href="https://docs.firefly-iii.org/references/faq/firefly-iii/using/#i-lost-my-2fa-token-generator-or-2fa-has-stopped-working>esta seção no FAQ</a> para instruções.',
     'two_factor_lost_fix_owner'                           => 'Caso contrário, entre em contato com o proprietário do site, <a href="mailto::site_owner">:site_owner</a>, e peça que redefina sua autenticação de duas etapas.',
     'mfa_backup_code'                                     => 'Você usou um código de backup para acessar o Firefly III. Não pode ser usado novamente, então cruze-o na sua lista.',
     'pref_two_factor_new_backup_codes'                    => 'Obter novos códigos de backup',
@@ -317,8 +317,8 @@ return [
     'update_new_version_alert'                            => 'Uma nova versão do Firefly lll está disponível. Você está utilizando a versão :your_version, e a nova é a :new_version, que foi lançada no dia :date.',
     'update_version_beta'                                 => 'Esta versão é uma versão BETA. Você pode encontrar problemas.',
     'update_version_alpha'                                => 'Esta versão é uma versão ALPHA. Você pode encontrar problemas.',
-    'update_current_dev_older'                            => 'You are running development release ":version", which is older than the latest release :new_version. Please update!',
-    'update_current_dev_newer'                            => 'You are running development release ":version", which is newer than the latest release :new_version.',
+    'update_current_dev_older'                            => 'Você está executando a versão de desenvolvimento ":version", que é mais antiga que o último lançamento :new_version. Por favor, atualize!',
+    'update_current_dev_newer'                            => 'Você está executando a versão de desenvolvimento ":version", que é mais recente que o último lançamento :new_version.',
     'update_current_version_alert'                        => 'Você está utilizando a versão :version, que é a última disponível.',
     'update_newer_version_alert'                          => 'Você está utilizando a versão :your_version, que é mais nova do que a mais recente :new_version.',
     'update_check_error'                                  => 'Ocorreu um erro durante a verificação de atualizações: :error',
@@ -896,12 +896,12 @@ return [
     'rule_trigger_budget_is'                              => 'O orçamento é ":trigger_value"',
     'rule_trigger_tag_is_choice'                          => 'Qualquer tag é..',
     'rule_trigger_tag_is'                                 => 'Qualquer tag é ":trigger_value"',
-    'rule_trigger_tag_contains_choice'                    => 'Any tag contains..',
-    'rule_trigger_tag_contains'                           => 'Any tag contains ":trigger_value"',
-    'rule_trigger_tag_ends_choice'                        => 'Any tag ends with..',
-    'rule_trigger_tag_ends'                               => 'Any tag ends with ":trigger_value"',
-    'rule_trigger_tag_starts_choice'                      => 'Any tag starts with..',
-    'rule_trigger_tag_starts'                             => 'Any tag starts with ":trigger_value"',
+    'rule_trigger_tag_contains_choice'                    => 'Qualquer tag contém..',
+    'rule_trigger_tag_contains'                           => 'Qualquer tag contém ":trigger_value"',
+    'rule_trigger_tag_ends_choice'                        => 'Qualquer tag termina com..',
+    'rule_trigger_tag_ends'                               => 'Qualquer tag termina com ":trigger_value"',
+    'rule_trigger_tag_starts_choice'                      => 'Qualquer tag começa com..',
+    'rule_trigger_tag_starts'                             => 'Qualquer tag começa com ":trigger_value"',
     'rule_trigger_currency_is_choice'                     => 'A moeda da transação é..',
     'rule_trigger_currency_is'                            => 'A moeda da transação é ":trigger_value"',
     'rule_trigger_foreign_currency_is_choice'             => 'A moeda estrangeira da transação é...',
@@ -1203,7 +1203,7 @@ return [
     'rule_trigger_not_exists'                             => 'Transação não existe',
     'rule_trigger_not_has_attachments'                    => 'A transação não tem anexos',
     'rule_trigger_not_has_any_category'                   => 'A transação não tem categoria',
-    'rule_trigger_not_has_any_budget'                     => 'Transaction has no budget',
+    'rule_trigger_not_has_any_budget'                     => 'A transação não tem orçamento',
     'rule_trigger_not_has_any_bill'                       => 'A transação não tem nenhuma fatura',
     'rule_trigger_not_has_any_tag'                        => 'A transação não tem tags',
     'rule_trigger_not_any_notes'                          => 'A transação não tem notas',
@@ -1286,8 +1286,8 @@ return [
     'rule_action_append_notes_to_descr'                   => 'Adicionar notas à descrição',
     'rule_action_move_descr_to_notes'                     => 'Substituir notas por descrição',
     'rule_action_move_notes_to_descr'                     => 'Substituir descrição por notas',
-    'rule_action_set_amount_choice'                       => 'Set amount to ..',
-    'rule_action_set_amount'                              => 'Set amount to ":action_value"',
+    'rule_action_set_amount_choice'                       => 'Definir valor para ..',
+    'rule_action_set_amount'                              => 'Definir valor para ":action_value"',
     'rule_action_set_destination_to_cash_choice'          => 'Definir a conta destino para (dinheiro)',
     'rule_action_set_source_to_cash_choice'               => 'Definir a conta de ativo para (dinheiro)',
     'rulegroup_for_bills_title'                           => 'Grupo de regras para faturas',
@@ -1419,34 +1419,34 @@ return [
     // Financial administrations
     'administration_index'                                => 'Administração financeira',
     'administrations_index_menu'                          => 'Administração(ões) financeira(s)',
-    'administrations_breadcrumb'                          => 'Financial administrations',
-    'administrations_page_title'                          => 'Financial administrations',
-    'administrations_page_sub_title'                      => 'Overview',
-    'create_administration'                               => 'Create new administration',
-    'administration_owner'                                => 'Administration owner: {{email}}',
-    'administration_you'                                  => 'Your role: {{role}}',
-    'other_users_in_admin'                                => 'Other users in this administration',
-    'administrations_create_breadcrumb'                   => 'Create new financial administration',
-    'administrations_page_create_sub_title'               => 'Create new financial administration',
-    'basic_administration_information'                    => 'Basic administration information',
-    'new_administration_created'                          => 'New financial administration "{{title}}" has been created',
-    'edit_administration_breadcrumb'                      => 'Edit financial administration ":title"',
-    'administrations_page_edit_sub_title'                 => 'Edit financial administration ":title"',
+    'administrations_breadcrumb'                          => 'Administrações financeira',
+    'administrations_page_title'                          => 'Administrações financeiras',
+    'administrations_page_sub_title'                      => 'Visão Geral',
+    'create_administration'                               => 'Criar nova administração',
+    'administration_owner'                                => 'Proprietário da administração: {{email}}',
+    'administration_you'                                  => 'Sua função: {{role}}',
+    'other_users_in_admin'                                => 'Outros usuários nesta administração',
+    'administrations_create_breadcrumb'                   => 'Criar nova administração financeira',
+    'administrations_page_create_sub_title'               => 'Criar nova administração financeira',
+    'basic_administration_information'                    => 'Informações básicas da administração',
+    'new_administration_created'                          => 'Nova administração financeira "{{title}}" foi criada',
+    'edit_administration_breadcrumb'                      => 'Editar administração financeira ":title"',
+    'administrations_page_edit_sub_title'                 => 'Editar administração financeira ":title"',
 
     // roles
-    'administration_role_owner'                           => 'Owner',
-    'administration_role_ro'                              => 'Read-only',
-    'administration_role_mng_trx'                         => 'Manage transactions',
-    'administration_role_mng_meta'                        => 'Manage classification and meta-data',
-    'administration_role_mng_budgets'                     => 'Manage budgets',
-    'administration_role_mng_piggies'                     => 'Manage piggy banks',
-    'administration_role_mng_subscriptions'               => 'Manage subscriptions',
-    'administration_role_mng_rules'                       => 'Manage rules',
-    'administration_role_mng_recurring'                   => 'Manage recurring transactions ',
-    'administration_role_mng_webhooks'                    => 'Manage webhooks',
-    'administration_role_mng_currencies'                  => 'Manage currencies',
-    'administration_role_view_reports'                    => 'View reports',
-    'administration_role_full'                            => 'Full access',
+    'administration_role_owner'                           => 'Proprietário',
+    'administration_role_ro'                              => 'Somente leitura',
+    'administration_role_mng_trx'                         => 'Gerenciar transações',
+    'administration_role_mng_meta'                        => 'Gerenciar classificação e metadados',
+    'administration_role_mng_budgets'                     => 'Gerenciar orçamentos',
+    'administration_role_mng_piggies'                     => 'Gerenciar cofrinhos',
+    'administration_role_mng_subscriptions'               => 'Gerenciar assinaturas',
+    'administration_role_mng_rules'                       => 'Gerenciar regras',
+    'administration_role_mng_recurring'                   => 'Gerenciar transações recorrentes ',
+    'administration_role_mng_webhooks'                    => 'Gerenciar webhooks',
+    'administration_role_mng_currencies'                  => 'Gerenciar moedas',
+    'administration_role_view_reports'                    => 'Ver relatórios',
+    'administration_role_full'                            => 'Acesso completo',
 
     // profile:
     'purge_data_title'                                    => 'Expurgar dados do Firefly III',
@@ -1616,8 +1616,8 @@ return [
     'submission_options'                                  => 'Opções de envio',
     'apply_rules_checkbox'                                => 'Aplicar regras',
     'fire_webhooks_checkbox'                              => 'Acionar webhooks',
-    'select_source_account'                               => 'Please select or type a valid source account name',
-    'select_dest_account'                                 => 'Please select or type a valid destination account name',
+    'select_source_account'                               => 'Por favor, selecione ou digite um nome de conta de origem válido',
+    'select_dest_account'                                 => 'Por favor, selecione ou digite um nome de conta de destino válido',
 
     // convert stuff:
     'convert_is_already_type_Withdrawal'                  => 'Esta transação já é uma saída',
@@ -2017,7 +2017,7 @@ return [
     'deleted_transfer'                                    => 'Transferência ":description" excluída com sucesso',
     'deleted_reconciliation'                              => 'Transação de reconciliação ":description" excluída com sucesso',
     'stored_journal'                                      => 'Transação ":description" incluída com sucesso',
-    'stored_journal_js'                                   => 'Successfully created new transaction "{{description}}"',
+    'stored_journal_js'                                   => 'Transação "{{description}}" criada com sucesso',
     'stored_journal_no_descr'                             => 'Transação criada com sucesso',
     'updated_journal_no_descr'                            => 'Transação atualizada com sucesso',
     'select_transactions'                                 => 'Selecione as transações',
@@ -2325,7 +2325,7 @@ return [
     'description'                                         => 'Descrição',
     'sum_of_period'                                       => 'Soma de período',
     'average_in_period'                                   => 'Média do período',
-    'no_account_role'                                     => '(no role)',
+    'no_account_role'                                     => '(sem função)',
     'account_role_defaultAsset'                           => 'Conta padrão',
     'account_role_sharedAsset'                            => 'Contas de ativos compartilhadas',
     'account_role_savingAsset'                            => 'Conta poupança',
@@ -2490,7 +2490,7 @@ return [
     'block_code_bounced'                                  => 'Mensagem(s) de email devolvidas',
     'block_code_expired'                                  => 'Conta de demonstração expirada',
     'no_block_code'                                       => 'Nenhuma razão para o bloqueio ou o usuário não está bloqueado',
-    'demo_user_export'                                    => 'The demo user cannot export data',
+    'demo_user_export'                                    => 'O usuário de demonstração não pode exportar dados',
     'block_code_email_changed'                            => 'O usuário ainda não confirmou o novo endereço de e-mail',
     'admin_update_email'                                  => 'Ao contrário da página de perfil, o usuário NÃO será notificado de que seu endereço de e-mail mudou!',
     'update_user'                                         => 'Atualizar usuário',
@@ -2598,9 +2598,9 @@ return [
     'store_as_new'                                        => 'Armazene como uma nova transação em vez de atualizar.',
     'reset_after'                                         => 'Limpar o formulário após o envio',
     'errors_submission'                                   => 'Algo deu errado com seu envio. Por favor, verifique os erros abaixo.',
-    'errors_submission_v2'                                => 'There was something wrong with your submission. Please check out the errors below: {{errorMessage}}',
+    'errors_submission_v2'                                => 'Algo deu errado com seu envio. Por favor, verifique os erros abaixo: {{errorMessage}}',
     'transaction_expand_split'                            => 'Exibir divisão',
-    'transaction_remove_split'                            => 'Remove split',
+    'transaction_remove_split'                            => 'Remover divisão',
     'transaction_collapse_split'                          => 'Esconder divisão',
 
     // object groups
@@ -2800,7 +2800,7 @@ return [
     'ale_action_add_to_piggy'                             => 'Cofrinho',
     'ale_action_remove_from_piggy'                        => 'Cofrinho',
     'ale_action_add_tag'                                  => 'Tag adicionada',
-    'ale_action_update_amount'                            => 'Updated amount',
+    'ale_action_update_amount'                            => 'Valor atualizado',
 
     // dashboard
     'enable_auto_convert'                                 => 'Habilitar conversão de moeda',

resources/lang/pt_BR/rules.php

@@ -70,5 +70,5 @@ return [
     'cannot_find_budget'                          => 'O Firefly III não pode encontrar o orçamento ":name"',
     'cannot_find_category'                        => 'O Firefly III não pode encontrar a categoria ":name"',
     'cannot_set_budget'                           => 'O Firefly III não pode definir o orçamento ":name" à transação de tipo ":type"',
-    'journal_invalid_amount'                      => 'Firefly III can\'t set amount ":amount" because it is not a valid number.',
+    'journal_invalid_amount'                      => 'Firefly III não pode definir o valor ":amount" porque não é um número válido.',
 ];

resources/lang/pt_BR/validation.php

@@ -55,11 +55,11 @@ return [
     'reconciled_forbidden_field'      => 'Esta transação já está reconciliada, você não pode mudar o campo ":field"',
     'deleted_user'                    => 'Devido a restrições de segurança, você não pode se registrar usando este endereço de e-mail.',
     'rule_trigger_value'              => 'Este valor é inválido para o disparo selecionado.',
-    'rule_action_expression'          => 'Invalid expression. :error',
+    'rule_action_expression'          => 'Expressão inválida. :error',
     'rule_action_value'               => 'Este valor é inválido para a ação selecionada.',
     'file_already_attached'           => 'Arquivo ":name" carregado já está anexado para este objeto.',
     'file_attached'                   => 'Arquivo carregado com sucesso ":name".',
-    'file_zero'                       => 'The file is zero bytes in size.',
+    'file_zero'                       => 'O arquivo tem zero byte de tamanho.',
     'must_exist'                      => 'O ID no campo :attribute não existe no banco de dados.',
     'all_accounts_equal'              => 'Todas as contas neste campo devem ser iguais.',
     'group_title_mandatory'           => 'Um título de grupo é obrigatório quando existe mais de uma transação.',
@@ -68,8 +68,8 @@ return [
     'invalid_selection'               => 'Sua seleção é inválida.',
     'belongs_user'                    => 'Este valor está vinculado a um objeto que aparentemente não existe.',
     'belongs_user_or_user_group'      => 'Este valor está ligado a um objeto que aparentemente não existe na sua administração financeira atual.',
-    'no_access_group'                 => 'The user has no access to this user group.',
-    'no_accepted_roles_defined'       => 'No access roles have been defined for this endpoint, access denied.',
+    'no_access_group'                 => 'O usuário não tem acesso a este grupo de usuários.',
+    'no_accepted_roles_defined'       => 'Nenhuma função de acesso foi definida para esta rota, acesso negado.',
     'at_least_one_transaction'        => 'Precisa de ao menos uma transação.',
     'recurring_transaction_id'        => 'Precisa de ao menos uma transação.',
     'need_id_to_match'                => 'Você precisa enviar esta entrada com um ID para a API poder identificá-la.',
@@ -199,7 +199,7 @@ return [
  *
  */
 
-    'secure_password'                 => 'This is not a secure password. Please try again. For more information, visit https://bit.ly/FF3-password',
+    'secure_password'                 => 'Esta não é uma senha segura. Por favor, tente novamente. Para mais informações, visite https://bit.ly/FF3-password',
     'valid_recurrence_rep_type'       => 'Tipo de repetição inválido para transações recorrentes.',
     'valid_recurrence_rep_moment'     => 'Momento de repetição inválido para esse tipo de repetição.',
     'invalid_account_info'            => 'Informação de conta inválida.',
@@ -302,7 +302,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.',
+    'administration_owner_rename'     => 'Você não pode renomear sua administração padrão.',
 ];
 
 /*

resources/lang/ru_RU/validation.php

@@ -68,8 +68,8 @@ return [
     'invalid_selection'               => 'Вы сделали неправильный выбор.',
     'belongs_user'                    => 'Это значение связано с объектом, который не существует.',
     'belongs_user_or_user_group'      => 'Это значение связано с объектом, который не существует в Вашем текущем финансовом администрировании.',
-    'no_access_group'                 => 'The user has no access to this user group.',
-    'no_accepted_roles_defined'       => 'No access roles have been defined for this endpoint, access denied.',
+    'no_access_group'                 => 'Пользователь не имеет доступа к данной группе пользователей.',
+    'no_accepted_roles_defined'       => 'Нет ролей доступа для этой конечной точки, доступ запрещен.',
     'at_least_one_transaction'        => 'Необходима как минимум одна транзакция.',
     'recurring_transaction_id'        => 'Необходима минимум одна транзакция.',
     'need_id_to_match'                => 'Вы должны отправить эту запись с ID для того, чтобы API мог сопоставить её.',

resources/lang/sl_SI/firefly.php

@@ -1426,12 +1426,12 @@ return [
     'administration_owner'                                => 'Lastnik administracije: {{email}}',
     'administration_you'                                  => 'Vaša vloga: {{role}}',
     '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"',
+    'administrations_create_breadcrumb'                   => 'Ustvari novo finančno administracijo',
+    'administrations_page_create_sub_title'               => 'Ustvari novo finančno administracijo',
+    'basic_administration_information'                    => 'Osnovne informacije o administraciji',
+    'new_administration_created'                          => 'Ustvarjena je bila nova finančna administracija "{{title}}"',
+    'edit_administration_breadcrumb'                      => 'Uredi finančno administracijo ":title"',
+    'administrations_page_edit_sub_title'                 => 'Uredi finančno administracijo ":title"',
 
     // roles
     'administration_role_owner'                           => 'Lastnik',

resources/lang/sl_SI/validation.php

@@ -69,7 +69,7 @@ return [
     'belongs_user'                    => 'Ta vrednost je povezana z objektom, za katerega se zdi, da ne obstaja.',
     'belongs_user_or_user_group'      => 'Ta vrednost je povezana z objektom, za katerega se zdi, da ne obstaja v vaši trenutni finančni upravi.',
     'no_access_group'                 => 'Uporabnik nima dostopa do te uporabniške skupine.',
-    'no_accepted_roles_defined'       => 'No access roles have been defined for this endpoint, access denied.',
+    'no_accepted_roles_defined'       => 'Za to končno točko ni bila definirana nobena dostopna vloga, dostop je zavrnjen.',
     'at_least_one_transaction'        => 'Potrebujete vsaj eno transakcijo.',
     'recurring_transaction_id'        => 'Potrebujete vsaj eno transakcijo.',
     'need_id_to_match'                => 'Ta vnos morate predložiti z ID-jem za API, da ga lahko povežete.',
@@ -302,7 +302,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.',
+    'administration_owner_rename'     => 'Standardne administracije ne morete preimenovati.',
 ];
 
 /*

resources/lang/sv_SE/firefly.php

@@ -1455,7 +1455,7 @@ return [
     'purge_all_data'                                      => 'Purge all deleted records',
     'purge_data'                                          => 'Purge data',
     'purged_all_records'                                  => 'All deleted records have been purged.',
-    'delete_data_title'                                   => 'Delete data from Firefly III',
+    'delete_data_title'                                   => 'Radera data från Firefly III',
     'permanent_delete_stuff'                              => 'You can delete stuff from Firefly III. Using the buttons below means that your items will be removed from view and hidden. There is no undo-button for this, but the items may remain in the database where you can salvage them if necessary.',
     'other_sessions_logged_out'                           => 'Alla dina andra sessioner har loggats ut.',
     'delete_unused_accounts'                              => 'Deleting unused accounts will clean your auto-complete lists.',

resources/views/partials/debug-table.twig

@@ -72,8 +72,8 @@
     </tr>
     <tr>
         <td>Layout</td>
-        <td>{{ config('firefly.layout') }}
-            {% if 'v2' == config('firefly.layout') %}
+        <td>{{ config('view.layout') }}
+            {% if 'v2' == config('view.layout') %}
                 <!-- .eOxNZAmyGz6CXMyf -->
             {% endif %}
         </td>

resources/views/partials/password-modal-twig.twig

@@ -0,0 +1,35 @@
+<div class="modal fade" id="passwordModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">
+                    {{ __('firefly.secure_pw_title') }}
+                </h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{{ __('firefly.close') }}"></button>
+            </div>
+            <div class="modal-body">
+                <p>
+                    {{ __('firefly.secure_pw_history') }}
+                </p>
+                <p>
+                    {{ __('firefly.secure_pw_ff') }}
+                </p>
+                <p>
+                    {{ __('firefly.secure_pw_check_box') }}
+                </p>
+
+                <h4>{{ __('firefly.secure_pw_working_title') }}</h4>
+                <p>
+                    {{  __('firefly.secure_pw_working')|raw  }}
+                </p>
+                <h4>{{ __('firefly.secure_pw_should') }}</h4>
+                <p>
+                    {{ __('firefly.secure_pw_long_password') }}
+                </p>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{ __('firefly.close') }}</button>
+            </div>
+        </div>
+    </div>
+</div>

resources/views/profile/change-password.twig

@@ -65,5 +65,5 @@
             </div>
         </div>
     </form>
-    {% include 'partials.password-modal' %}
+    {% include 'partials.password-modal-twig' %}
 {% endblock %}