Auto commit for release 'develop' on 2025-01-06

Fix sql query error and upgrade error.
Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop
2025-10-26 21:43:53 +00:00 · 2025-01-06 04:13:41 +01:00 · 2025-01-05 14:33:33 +01:00 · 2025-01-05 09:23:17 +01:00 · 2025-01-05 09:21:29 +01:00 · 2025-01-05 09:20:55 +01:00
24 changed files with 182 additions and 246 deletions
--- a/.ci/php-cs-fixer/composer.lock
+++ b/.ci/php-cs-fixer/composer.lock
@@ -406,16 +406,16 @@
        },
        {
            "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.66.0",
+            "version": "v3.66.1",
            "source": {
                "type": "git",
                "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "5f5f2a142ff36b93c41885bca29cc5f861c013e6"
+                "reference": "cde186799d8e92960c5a00c96e6214bf7f5547a9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/5f5f2a142ff36b93c41885bca29cc5f861c013e6",
-                "reference": "5f5f2a142ff36b93c41885bca29cc5f861c013e6",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/cde186799d8e92960c5a00c96e6214bf7f5547a9",
+                "reference": "cde186799d8e92960c5a00c96e6214bf7f5547a9",
                "shasum": ""
            },
            "require": {
@@ -432,17 +432,17 @@
                "react/promise": "^2.0 || ^3.0",
                "react/socket": "^1.0",
                "react/stream": "^1.0",
-                "sebastian/diff": "^4.0 || ^5.0 || ^6.0",
-                "symfony/console": "^5.4 || ^6.0 || ^7.0",
-                "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0",
-                "symfony/filesystem": "^5.4 || ^6.0 || ^7.0",
-                "symfony/finder": "^5.4 || ^6.0 || ^7.0",
-                "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0",
-                "symfony/polyfill-mbstring": "^1.28",
-                "symfony/polyfill-php80": "^1.28",
-                "symfony/polyfill-php81": "^1.28",
-                "symfony/process": "^5.4 || ^6.0 || ^7.0 <7.2",
-                "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0"
+                "sebastian/diff": "^4.0 || ^5.1 || ^6.0",
+                "symfony/console": "^5.4 || ^6.4 || ^7.0",
+                "symfony/event-dispatcher": "^5.4 || ^6.4 || ^7.0",
+                "symfony/filesystem": "^5.4 || ^6.4 || ^7.0",
+                "symfony/finder": "^5.4 || ^6.4 || ^7.0",
+                "symfony/options-resolver": "^5.4 || ^6.4 || ^7.0",
+                "symfony/polyfill-mbstring": "^1.31",
+                "symfony/polyfill-php80": "^1.31",
+                "symfony/polyfill-php81": "^1.31",
+                "symfony/process": "^5.4 || ^6.4 || ^7.2",
+                "symfony/stopwatch": "^5.4 || ^6.4 || ^7.0"
            },
            "require-dev": {
                "facile-it/paraunit": "^1.3.1 || ^2.4",
@@ -454,9 +454,9 @@
                "php-cs-fixer/accessible-object": "^1.1",
                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.5",
                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.5",
-                "phpunit/phpunit": "^9.6.21 || ^10.5.38 || ^11.4.3",
-                "symfony/var-dumper": "^5.4.47 || ^6.4.15 || ^7.1.8",
-                "symfony/yaml": "^5.4.45 || ^6.4.13 || ^7.1.6"
+                "phpunit/phpunit": "^9.6.22 || ^10.5.40 || ^11.5.2",
+                "symfony/var-dumper": "^5.4.48 || ^6.4.15 || ^7.2.0",
+                "symfony/yaml": "^5.4.45 || ^6.4.13 || ^7.2.0"
            },
            "suggest": {
                "ext-dom": "For handling output formats in XML",
@@ -497,7 +497,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.66.0"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.66.1"
            },
            "funding": [
                {
@@ -505,7 +505,7 @@
                    "type": "github"
                }
            ],
-            "time": "2024-12-29T13:46:23+00:00"
+            "time": "2025-01-05T14:43:25+00:00"
        },
        {
            "name": "psr/container",
@@ -2242,16 +2242,16 @@
        },
        {
            "name": "symfony/process",
-            "version": "v7.1.8",
+            "version": "v7.2.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/process.git",
-                "reference": "42783370fda6e538771f7c7a36e9fa2ee3a84892"
+                "reference": "d34b22ba9390ec19d2dd966c40aa9e8462f27a7e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/42783370fda6e538771f7c7a36e9fa2ee3a84892",
-                "reference": "42783370fda6e538771f7c7a36e9fa2ee3a84892",
+                "url": "https://api.github.com/repos/symfony/process/zipball/d34b22ba9390ec19d2dd966c40aa9e8462f27a7e",
+                "reference": "d34b22ba9390ec19d2dd966c40aa9e8462f27a7e",
                "shasum": ""
            },
            "require": {
@@ -2283,7 +2283,7 @@
            "description": "Executes commands in sub-processes",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/process/tree/v7.1.8"
+                "source": "https://github.com/symfony/process/tree/v7.2.0"
            },
            "funding": [
                {
@@ -2299,7 +2299,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-11-06T14:23:19+00:00"
+            "time": "2024-11-06T14:24:19+00:00"
        },
        {
            "name": "symfony/service-contracts",
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -8,56 +8,3 @@ pull_request_rules:
      close:
        message: Please do not open PR's on the `main` branch, but on the `develop`
          branch only. Thank you!
-  - name: No translations
-    conditions:
-      - -author~=^dependabot(|-preview)\[bot\]$
-      - base=develop
-      - or:
-          - files~=^resources/lang/bg_BG
-          - files~=^resources/lang/ca_ES
-          - files~=^resources/lang/cs_CZ
-          - files~=^resources/lang/da_DK
-          - files~=^resources/lang/de_DE
-          - files~=^resources/lang/el_GR
-          - files~=^resources/lang/en_GB
-          - files~=^resources/lang/es_ES
-          - files~=^resources/lang/et_EE
-          - files~=^resources/lang/fa_IR
-          - files~=^resources/lang/fi_FI
-          - files~=^resources/lang/fr_FR
-          - files~=^resources/lang/he_IL
-          - files~=^resources/lang/hu_HU
-          - files~=^resources/lang/id_ID
-          - files~=^resources/lang/is_IS
-          - files~=^resources/lang/it_IT
-          - files~=^resources/lang/ja_JP
-          - files~=^resources/lang/ko_KR
-          - files~=^resources/lang/lt_LT
-          - files~=^resources/lang/nb_NO
-          - files~=^resources/lang/nl_NL
-          - files~=^resources/lang/pl_PL
-          - files~=^resources/lang/pt_BR
-          - files~=^resources/lang/pt_PT
-          - files~=^resources/lang/ro_RO
-          - files~=^resources/lang/ru_RU
-          - files~=^resources/lang/si_LK
-          - files~=^resources/lang/sk_SK
-          - files~=^resources/lang/sl_SI
-          - files~=^resources/lang/sr_CS
-          - files~=^resources/lang/sv_SE
-          - files~=^resources/lang/th_TH
-          - files~=^resources/lang/tlh_AA
-          - files~=^resources/lang/tr_TR
-          - files~=^resources/lang/uk_UA
-          - files~=^resources/lang/vi_VN
-          - files~=^resources/lang/zh_CN
-          - files~=^resources/lang/zh_TW
-    actions:
-      comment:
-        message: >
-          Please do not submit translated strings in your PR. If you need new
-          sentences to be translated, add them to the `en_US` language strings.
-          New or changed translations for other languages can be submitted at
-          https://crowdin.com/project/firefly-iii
-
-          Thank you!
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -58,15 +58,6 @@ jobs:
          GITHUB_TOKEN: ${{ github.token }}
          CROWDIN_PROJECT_NR: ${{ secrets.CROWDIN_PROJECT_NR }}
          CROWDIN_TOKEN: ${{ secrets.CROWDIN_TOKEN }}
-      - name: Cleanup translations
-        id: cleanup-transactions
-        uses: JC5/firefly-iii-dev@main
-        with:
-          action: 'ff3:crowdin-warning'
-          output: ''
-        env:
-          FIREFLY_III_ROOT: /github/workspace
-          GH_TOKEN: ''
      - name: Cleanup changelog
        id: cleanup-changelog
        uses: JC5/firefly-iii-dev@main
--- a/app/Console/Commands/System/CreatesDatabase.php
+++ b/app/Console/Commands/System/CreatesDatabase.php
@@ -38,17 +38,17 @@ class CreatesDatabase extends Command

    public function handle(): int
    {
-        if ('mysql' !== config('database.default')) {
-            $this->friendlyInfo(sprintf('CreateDB does not apply to "%s", skipped.', config('database.default')));
+        if ('mysql' !== env('DB_CONNECTION')) {
+            $this->friendlyInfo(sprintf('CreateDB does not apply to "%s", skipped.', env('DB_CONNECTION')));

            return 0;
        }
        // try to set up a raw connection:
        $exists  = false;
-        $dsn     = sprintf('mysql:host=%s;port=%d;charset=utf8mb4', config('database.mysql.host'), config('database.mysql.port'));
+        $dsn     = sprintf('mysql:host=%s;port=%d;charset=utf8mb4', env('DB_HOST'), env('DB_PORT'));

-        if ('' !== config('database.mysql.unix_socket')) {
-            $dsn = sprintf('mysql:unix_socket=%s;charset=utf8mb4', config('database.mysql.unix_socket'));
+        if ('' !== (string) env('DB_SOCKET')) {
+            $dsn = sprintf('mysql:unix_socket=%s;charset=utf8mb4', env('DB_SOCKET'));
        }
        $this->friendlyLine(sprintf('DSN is %s', $dsn));

@@ -60,7 +60,7 @@ class CreatesDatabase extends Command

        // when it fails, display error
        try {
-            $pdo = new \PDO($dsn, config('database.mysql.username'), config('database.mysql.password'), $options);
+            $pdo = new \PDO($dsn, env('DB_USERNAME'), env('DB_PASSWORD'), $options);
        } catch (\PDOException $e) {
            $this->friendlyError(sprintf('Error when connecting to DB: %s', $e->getMessage()));

@@ -74,19 +74,19 @@ class CreatesDatabase extends Command
        // slightly more complex but less error-prone.
        foreach ($stmt as $row) {
            $name = $row['Database'] ?? false;
-            if ($name === config('database.mysql.database')) {
+            if ($name === env('DB_DATABASE')) {
                $exists = true;
            }
        }
        if (false === $exists) {
-            $this->friendlyError(sprintf('Database "%s" does not exist.', config('database.mysql.database')));
+            $this->friendlyError(sprintf('Database "%s" does not exist.', env('DB_DATABASE')));

            // try to create it.
-            $pdo->exec(sprintf('CREATE DATABASE `%s` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;', config('database.mysql.database')));
-            $this->friendlyInfo(sprintf('Created database "%s"', config('database.mysql.database')));
+            $pdo->exec(sprintf('CREATE DATABASE `%s` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;', env('DB_DATABASE')));
+            $this->friendlyInfo(sprintf('Created database "%s"', env('DB_DATABASE')));
        }
        if (true === $exists) {
-            $this->friendlyInfo(sprintf('Database "%s" exists.', config('database.mysql.database')));
+            $this->friendlyInfo(sprintf('Database "%s" exists.', env('DB_DATABASE')));
        }

        return 0;
--- a/app/Validation/FireflyValidator.php
+++ b/app/Validation/FireflyValidator.php
@@ -820,7 +820,7 @@ class FireflyValidator extends Validator
        }
        $query->where('piggy_banks.name', $value);

-        return 0 === $query->count('piggy_banks.*');
+        return 0 === $query->count();
    }

    /**
--- a/composer.lock
+++ b/composer.lock
@@ -11545,16 +11545,16 @@
        },
        {
            "name": "phpstan/phpstan",
-            "version": "2.1.0",
+            "version": "2.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "2392d360fdf54ea253aa6c68cad1d4ba2e54e927"
+                "reference": "cd6e973e04b4c2b94c86e8612b5a65f0da0e08e7"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/2392d360fdf54ea253aa6c68cad1d4ba2e54e927",
-                "reference": "2392d360fdf54ea253aa6c68cad1d4ba2e54e927",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cd6e973e04b4c2b94c86e8612b5a65f0da0e08e7",
+                "reference": "cd6e973e04b4c2b94c86e8612b5a65f0da0e08e7",
                "shasum": ""
            },
            "require": {
@@ -11599,7 +11599,7 @@
                    "type": "github"
                }
            ],
-            "time": "2024-12-31T07:30:03+00:00"
+            "time": "2025-01-05T16:43:48+00:00"
        },
        {
            "name": "phpstan/phpstan-deprecation-rules",
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -81,7 +81,7 @@ return [
        'running_balance_column' => env('USE_RUNNING_BALANCE', false),
        // see cer.php for exchange rates feature flag.
    ],
-    'version'                      => 'develop/2025-01-05',
+    'version'                      => 'develop/2025-01-06',
    'api_version'                  => '2.1.0', // field is no longer used.
    'db_version'                   => 25,

--- a/package-lock.json
+++ b/package-lock.json
@@ -2591,9 +2591,9 @@
            }
        },
        "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.29.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.29.1.tgz",
-            "integrity": "sha512-ssKhA8RNltTZLpG6/QNkCSge+7mBQGUqJRisZ2MDQcEGaK93QESEgWK2iOpIDZ7k9zPVkG5AS3ksvD5ZWxmItw==",
+            "version": "4.29.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.29.2.tgz",
+            "integrity": "sha512-s/8RiF4bdmGnc/J0N7lHAr5ZFJj+NdJqJ/Hj29K+c4lEdoVlukzvWXB9XpWZCdakVT0YAw8iyIqUP2iFRz5/jA==",
            "cpu": [
                "arm"
            ],
@@ -2605,9 +2605,9 @@
            ]
        },
        "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.29.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.29.1.tgz",
-            "integrity": "sha512-CaRfrV0cd+NIIcVVN/jx+hVLN+VRqnuzLRmfmlzpOzB87ajixsN/+9L5xNmkaUUvEbI5BmIKS+XTwXsHEb65Ew==",
+            "version": "4.29.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.29.2.tgz",
+            "integrity": "sha512-mKRlVj1KsKWyEOwR6nwpmzakq6SgZXW4NUHNWlYSiyncJpuXk7wdLzuKdWsRoR1WLbWsZBKvsUCdCTIAqRn9cA==",
            "cpu": [
                "arm64"
            ],
@@ -2619,9 +2619,9 @@
            ]
        },
        "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.29.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.29.1.tgz",
-            "integrity": "sha512-2ORr7T31Y0Mnk6qNuwtyNmy14MunTAMx06VAPI6/Ju52W10zk1i7i5U3vlDRWjhOI5quBcrvhkCHyF76bI7kEw==",
+            "version": "4.29.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.29.2.tgz",
+            "integrity": "sha512-vJX+vennGwygmutk7N333lvQ/yKVAHnGoBS2xMRQgXWW8tvn46YWuTDOpKroSPR9BEW0Gqdga2DHqz8Pwk6X5w==",
            "cpu": [
                "arm64"
            ],
@@ -2633,9 +2633,9 @@
            ]
        },
        "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.29.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.29.1.tgz",
-            "integrity": "sha512-j/Ej1oanzPjmN0tirRd5K2/nncAhS9W6ICzgxV+9Y5ZsP0hiGhHJXZ2JQ53iSSjj8m6cRY6oB1GMzNn2EUt6Ng==",
+            "version": "4.29.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.29.2.tgz",
+            "integrity": "sha512-e2rW9ng5O6+Mt3ht8fH0ljfjgSCC6ffmOipiLUgAnlK86CHIaiCdHCzHzmTkMj6vEkqAiRJ7ss6Ibn56B+RE5w==",
            "cpu": [
                "x64"
            ],
@@ -2647,9 +2647,9 @@
            ]
        },
        "node_modules/@rollup/rollup-freebsd-arm64": {
-            "version": "4.29.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.29.1.tgz",
-            "integrity": "sha512-91C//G6Dm/cv724tpt7nTyP+JdN12iqeXGFM1SqnljCmi5yTXriH7B1r8AD9dAZByHpKAumqP1Qy2vVNIdLZqw==",
+            "version": "4.29.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.29.2.tgz",
+            "integrity": "sha512-/xdNwZe+KesG6XJCK043EjEDZTacCtL4yurMZRLESIgHQdvtNyul3iz2Ab03ZJG0pQKbFTu681i+4ETMF9uE/Q==",
            "cpu": [
                "arm64"
            ],
@@ -2661,9 +2661,9 @@
            ]
        },
        "node_modules/@rollup/rollup-freebsd-x64": {
-            "version": "4.29.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.29.1.tgz",
-            "integrity": "sha512-hEioiEQ9Dec2nIRoeHUP6hr1PSkXzQaCUyqBDQ9I9ik4gCXQZjJMIVzoNLBRGet+hIUb3CISMh9KXuCcWVW/8w==",
+            "version": "4.29.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.29.2.tgz",
+            "integrity": "sha512-eXKvpThGzREuAbc6qxnArHh8l8W4AyTcL8IfEnmx+bcnmaSGgjyAHbzZvHZI2csJ+e0MYddl7DX0X7g3sAuXDQ==",
            "cpu": [
                "x64"
            ],
@@ -2675,9 +2675,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.29.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.29.1.tgz",
-            "integrity": "sha512-Py5vFd5HWYN9zxBv3WMrLAXY3yYJ6Q/aVERoeUFwiDGiMOWsMs7FokXihSOaT/PMWUty/Pj60XDQndK3eAfE6A==",
+            "version": "4.29.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.29.2.tgz",
+            "integrity": "sha512-h4VgxxmzmtXLLYNDaUcQevCmPYX6zSj4SwKuzY7SR5YlnCBYsmvfYORXgiU8axhkFCDtQF3RW5LIXT8B14Qykg==",
            "cpu": [
                "arm"
            ],
@@ -2689,9 +2689,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.29.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.29.1.tgz",
-            "integrity": "sha512-RiWpGgbayf7LUcuSNIbahr0ys2YnEERD4gYdISA06wa0i8RALrnzflh9Wxii7zQJEB2/Eh74dX4y/sHKLWp5uQ==",
+            "version": "4.29.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.29.2.tgz",
+            "integrity": "sha512-EObwZ45eMmWZQ1w4N7qy4+G1lKHm6mcOwDa+P2+61qxWu1PtQJ/lz2CNJ7W3CkfgN0FQ7cBUy2tk6D5yR4KeXw==",
            "cpu": [
                "arm"
            ],
@@ -2703,9 +2703,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.29.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.29.1.tgz",
-            "integrity": "sha512-Z80O+taYxTQITWMjm/YqNoe9d10OX6kDh8X5/rFCMuPqsKsSyDilvfg+vd3iXIqtfmp+cnfL1UrYirkaF8SBZA==",
+            "version": "4.29.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.29.2.tgz",
+            "integrity": "sha512-Z7zXVHEXg1elbbYiP/29pPwlJtLeXzjrj4241/kCcECds8Zg9fDfURWbZHRIKrEriAPS8wnVtdl4ZJBvZr325w==",
            "cpu": [
                "arm64"
            ],
@@ -2717,9 +2717,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.29.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.29.1.tgz",
-            "integrity": "sha512-fOHRtF9gahwJk3QVp01a/GqS4hBEZCV1oKglVVq13kcK3NeVlS4BwIFzOHDbmKzt3i0OuHG4zfRP0YoG5OF/rA==",
+            "version": "4.29.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.29.2.tgz",
+            "integrity": "sha512-TF4kxkPq+SudS/r4zGPf0G08Bl7+NZcFrUSR3484WwsHgGgJyPQRLCNrQ/R5J6VzxfEeQR9XRpc8m2t7lD6SEQ==",
            "cpu": [
                "arm64"
            ],
@@ -2731,9 +2731,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-            "version": "4.29.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.29.1.tgz",
-            "integrity": "sha512-5a7q3tnlbcg0OodyxcAdrrCxFi0DgXJSoOuidFUzHZ2GixZXQs6Tc3CHmlvqKAmOs5eRde+JJxeIf9DonkmYkw==",
+            "version": "4.29.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.29.2.tgz",
+            "integrity": "sha512-kO9Fv5zZuyj2zB2af4KA29QF6t7YSxKrY7sxZXfw8koDQj9bx5Tk5RjH+kWKFKok0wLGTi4bG117h31N+TIBEg==",
            "cpu": [
                "loong64"
            ],
@@ -2745,9 +2745,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.29.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.29.1.tgz",
-            "integrity": "sha512-9b4Mg5Yfz6mRnlSPIdROcfw1BU22FQxmfjlp/CShWwO3LilKQuMISMTtAu/bxmmrE6A902W2cZJuzx8+gJ8e9w==",
+            "version": "4.29.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.29.2.tgz",
+            "integrity": "sha512-gIh776X7UCBaetVJGdjXPFurGsdWwHHinwRnC5JlLADU8Yk0EdS/Y+dMO264OjJFo7MXQ5PX4xVFbxrwK8zLqA==",
            "cpu": [
                "ppc64"
            ],
@@ -2759,9 +2759,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.29.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.29.1.tgz",
-            "integrity": "sha512-G5pn0NChlbRM8OJWpJFMX4/i8OEU538uiSv0P6roZcbpe/WfhEO+AT8SHVKfp8qhDQzaz7Q+1/ixMy7hBRidnQ==",
+            "version": "4.29.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.29.2.tgz",
+            "integrity": "sha512-YgikssQ5UNq1GoFKZydMEkhKbjlUq7G3h8j6yWXLBF24KyoA5BcMtaOUAXq5sydPmOPEqB6kCyJpyifSpCfQ0w==",
            "cpu": [
                "riscv64"
            ],
@@ -2773,9 +2773,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.29.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.29.1.tgz",
-            "integrity": "sha512-WM9lIkNdkhVwiArmLxFXpWndFGuOka4oJOZh8EP3Vb8q5lzdSCBuhjavJsw68Q9AKDGeOOIHYzYm4ZFvmWez5g==",
+            "version": "4.29.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.29.2.tgz",
+            "integrity": "sha512-9ouIR2vFWCyL0Z50dfnon5nOrpDdkTG9lNDs7MRaienQKlTyHcDxplmk3IbhFlutpifBSBr2H4rVILwmMLcaMA==",
            "cpu": [
                "s390x"
            ],
@@ -2787,9 +2787,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.29.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.29.1.tgz",
-            "integrity": "sha512-87xYCwb0cPGZFoGiErT1eDcssByaLX4fc0z2nRM6eMtV9njAfEE6OW3UniAoDhX4Iq5xQVpE6qO9aJbCFumKYQ==",
+            "version": "4.29.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.29.2.tgz",
+            "integrity": "sha512-ckBBNRN/F+NoSUDENDIJ2U9UWmIODgwDB/vEXCPOMcsco1niTkxTXa6D2Y/pvCnpzaidvY2qVxGzLilNs9BSzw==",
            "cpu": [
                "x64"
            ],
@@ -2801,9 +2801,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.29.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.29.1.tgz",
-            "integrity": "sha512-xufkSNppNOdVRCEC4WKvlR1FBDyqCSCpQeMMgv9ZyXqqtKBfkw1yfGMTUTs9Qsl6WQbJnsGboWCp7pJGkeMhKA==",
+            "version": "4.29.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.29.2.tgz",
+            "integrity": "sha512-jycl1wL4AgM2aBFJFlpll/kGvAjhK8GSbEmFT5v3KC3rP/b5xZ1KQmv0vQQ8Bzb2ieFQ0kZFPRMbre/l3Bu9JA==",
            "cpu": [
                "x64"
            ],
@@ -2815,9 +2815,9 @@
            ]
        },
        "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.29.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.29.1.tgz",
-            "integrity": "sha512-F2OiJ42m77lSkizZQLuC+jiZ2cgueWQL5YC9tjo3AgaEw+KJmVxHGSyQfDUoYR9cci0lAywv2Clmckzulcq6ig==",
+            "version": "4.29.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.29.2.tgz",
+            "integrity": "sha512-S2V0LlcOiYkNGlRAWZwwUdNgdZBfvsDHW0wYosYFV3c7aKgEVcbonetZXsHv7jRTTX+oY5nDYT4W6B1oUpMNOg==",
            "cpu": [
                "arm64"
            ],
@@ -2829,9 +2829,9 @@
            ]
        },
        "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.29.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.29.1.tgz",
-            "integrity": "sha512-rYRe5S0FcjlOBZQHgbTKNrqxCBUmgDJem/VQTCcTnA2KCabYSWQDrytOzX7avb79cAAweNmMUb/Zw18RNd4mng==",
+            "version": "4.29.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.29.2.tgz",
+            "integrity": "sha512-pW8kioj9H5f/UujdoX2atFlXNQ9aCfAxFRaa+mhczwcsusm6gGrSo4z0SLvqLF5LwFqFTjiLCCzGkNK/LE0utQ==",
            "cpu": [
                "ia32"
            ],
@@ -2843,9 +2843,9 @@
            ]
        },
        "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.29.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.29.1.tgz",
-            "integrity": "sha512-+10CMg9vt1MoHj6x1pxyjPSMjHTIlqs8/tBztXvPAx24SKs9jwVnKqHJumlH/IzhaPUaj3T6T6wfZr8okdXaIg==",
+            "version": "4.29.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.29.2.tgz",
+            "integrity": "sha512-p6fTArexECPf6KnOHvJXRpAEq0ON1CBtzG/EY4zw08kCHk/kivBc5vUEtnCFNCHOpJZ2ne77fxwRLIKD4wuW2Q==",
            "cpu": [
                "x64"
            ],
@@ -6081,9 +6081,9 @@
            "license": "MIT"
        },
        "node_modules/fast-glob": {
-            "version": "3.3.2",
-            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
-            "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+            "version": "3.3.3",
+            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
+            "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -6091,7 +6091,7 @@
                "@nodelib/fs.walk": "^1.2.3",
                "glob-parent": "^5.1.2",
                "merge2": "^1.3.0",
-                "micromatch": "^4.0.4"
+                "micromatch": "^4.0.8"
            },
            "engines": {
                "node": ">=8.6.0"
@@ -6105,10 +6105,20 @@
            "license": "MIT"
        },
        "node_modules/fast-uri": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.3.tgz",
-            "integrity": "sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==",
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.4.tgz",
+            "integrity": "sha512-G3iTQw1DizJQ5eEqj1CbFCWhq+pzum7qepkxU7rS1FGZDqjYKcrguo9XDRbV7EgPnn8CgaPigTq+NEjyioeYZQ==",
            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/fastify"
+                },
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/fastify"
+                }
+            ],
            "license": "BSD-3-Clause"
        },
        "node_modules/fastest-levenshtein": {
@@ -9977,9 +9987,9 @@
            }
        },
        "node_modules/rollup": {
-            "version": "4.29.1",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.29.1.tgz",
-            "integrity": "sha512-RaJ45M/kmJUzSWDs1Nnd5DdV4eerC98idtUOVr6FfKcgxqvjwHmxc5upLF9qZU9EpsVzzhleFahrT3shLuJzIw==",
+            "version": "4.29.2",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.29.2.tgz",
+            "integrity": "sha512-tJXpsEkzsEzyAKIaB3qv3IuvTVcTN7qBw1jL4SPPXM3vzDrJgiLGFY6+HodgFaUHAJ2RYJ94zV5MKRJCoQzQeA==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -9993,25 +10003,25 @@
                "npm": ">=8.0.0"
            },
            "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.29.1",
-                "@rollup/rollup-android-arm64": "4.29.1",
-                "@rollup/rollup-darwin-arm64": "4.29.1",
-                "@rollup/rollup-darwin-x64": "4.29.1",
-                "@rollup/rollup-freebsd-arm64": "4.29.1",
-                "@rollup/rollup-freebsd-x64": "4.29.1",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.29.1",
-                "@rollup/rollup-linux-arm-musleabihf": "4.29.1",
-                "@rollup/rollup-linux-arm64-gnu": "4.29.1",
-                "@rollup/rollup-linux-arm64-musl": "4.29.1",
-                "@rollup/rollup-linux-loongarch64-gnu": "4.29.1",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.29.1",
-                "@rollup/rollup-linux-riscv64-gnu": "4.29.1",
-                "@rollup/rollup-linux-s390x-gnu": "4.29.1",
-                "@rollup/rollup-linux-x64-gnu": "4.29.1",
-                "@rollup/rollup-linux-x64-musl": "4.29.1",
-                "@rollup/rollup-win32-arm64-msvc": "4.29.1",
-                "@rollup/rollup-win32-ia32-msvc": "4.29.1",
-                "@rollup/rollup-win32-x64-msvc": "4.29.1",
+                "@rollup/rollup-android-arm-eabi": "4.29.2",
+                "@rollup/rollup-android-arm64": "4.29.2",
+                "@rollup/rollup-darwin-arm64": "4.29.2",
+                "@rollup/rollup-darwin-x64": "4.29.2",
+                "@rollup/rollup-freebsd-arm64": "4.29.2",
+                "@rollup/rollup-freebsd-x64": "4.29.2",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.29.2",
+                "@rollup/rollup-linux-arm-musleabihf": "4.29.2",
+                "@rollup/rollup-linux-arm64-gnu": "4.29.2",
+                "@rollup/rollup-linux-arm64-musl": "4.29.2",
+                "@rollup/rollup-linux-loongarch64-gnu": "4.29.2",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.29.2",
+                "@rollup/rollup-linux-riscv64-gnu": "4.29.2",
+                "@rollup/rollup-linux-s390x-gnu": "4.29.2",
+                "@rollup/rollup-linux-x64-gnu": "4.29.2",
+                "@rollup/rollup-linux-x64-musl": "4.29.2",
+                "@rollup/rollup-win32-arm64-msvc": "4.29.2",
+                "@rollup/rollup-win32-ia32-msvc": "4.29.2",
+                "@rollup/rollup-win32-x64-msvc": "4.29.2",
                "fsevents": "~2.3.2"
            }
        },
--- a/resources/assets/v1/src/locales/ru.json
+++ b/resources/assets/v1/src/locales/ru.json
@@ -170,6 +170,6 @@
    },
    "config": {
        "html_language": "ru",
-        "date_time_fns": "Do MMMM yyyy, @ HH:mm:ss"
+        "date_time_fns": "D MMMM yyyy, @ HH:mm:ss"
    }
 }
--- a/resources/lang/en_US/api.php
+++ b/resources/lang/en_US/api.php
@@ -22,7 +22,7 @@

 declare(strict_types=1);

-// Ignore this comment
+

 return [
 ];
--- a/resources/lang/en_US/auth.php
+++ b/resources/lang/en_US/auth.php
@@ -20,7 +20,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-// Ignore this comment
+

 declare(strict_types=1);

--- a/resources/lang/en_US/breadcrumbs.php
+++ b/resources/lang/en_US/breadcrumbs.php
@@ -20,7 +20,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-// Ignore this comment
+

 declare(strict_types=1);

@@ -56,7 +56,7 @@ return [
    'transfer_list'          => 'Transfers',
    'transfers_list'         => 'Transfers',

-    // Ignore this comment
+

    'reconciliation_list'    => 'Reconciliations',
    'create_withdrawal'      => 'Create new withdrawal',
--- a/resources/lang/en_US/components.php
+++ b/resources/lang/en_US/components.php
@@ -20,7 +20,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-// Ignore this comment
+

 declare(strict_types=1);

--- a/resources/lang/en_US/config.php
+++ b/resources/lang/en_US/config.php
@@ -20,7 +20,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-// Ignore this comment
+

 declare(strict_types=1);

@@ -41,7 +41,7 @@ return [
    // 'month_and_day_no_year'   => '%B %e',
    'month_and_day_no_year_js' => 'MMMM Do',

-    // Ignore this comment
+

    // 'date_time'               => '%B %e, %Y, @ %T',
    'date_time_js'             => 'MMMM Do, YYYY, @ HH:mm:ss',
@@ -71,5 +71,3 @@ return [
    'dow_6'                    => 'Saturday',
    'dow_7'                    => 'Sunday',
 ];
-
-// Ignore this comment
--- a/resources/lang/en_US/demo.php
+++ b/resources/lang/en_US/demo.php
@@ -20,7 +20,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-// Ignore this comment
+

 declare(strict_types=1);

@@ -37,5 +37,3 @@ return [
    'piggy-banks-index'      => 'As you can see, there are three piggy banks. Use the plus and minus buttons to influence the amount of money in each piggy bank. Click the name of the piggy bank to see the administration for each piggy bank.',
    'profile-index'          => 'Keep in mind that the demo site resets every four hours. Your access may be revoked at any time. This happens automatically and is not a bug.',
 ];
-
-// Ignore this comment
--- a/resources/lang/en_US/email.php
+++ b/resources/lang/en_US/email.php
@@ -20,7 +20,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-// Ignore this comment
+

 declare(strict_types=1);

@@ -36,7 +36,7 @@ return [
    'admin_test_body'                             => 'This is a test message from your Firefly III instance. It was sent to :email.',
    'admin_test_message'                          => 'This is a test message from your Firefly III instance over channel ":channel".',

-    // Ignore this comment
+

    // invite
    'invitation_created_subject'                  => 'An invitation has been created',
@@ -85,7 +85,7 @@ return [
    'registered_pw_reset_link'                    => 'Password reset:',
    'registered_doc_link'                         => 'Documentation:',

-    // Ignore this comment
+

    // new version
    'new_version_email_subject'                   => 'A new Firefly III version is available',
@@ -132,7 +132,7 @@ return [
    'error_headers'                               => 'The following headers may also be relevant:',
    'error_post'                                  => 'This was submitted by the user:',

-    // Ignore this comment
+

    // report new journals
    'new_journals_subject'                        => 'Firefly III has created a new transaction|Firefly III has created :count new transactions',
@@ -190,4 +190,3 @@ return [
    'mfa_many_failed_attempts_warning'            => 'If you did not do this, please contact your administrator immediately or check out the Firefly III documentation.',

 ];
-// Ignore this comment
--- a/resources/lang/en_US/errors.php
+++ b/resources/lang/en_US/errors.php
@@ -20,7 +20,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-// Ignore this comment
+

 declare(strict_types=1);

@@ -42,7 +42,7 @@ return [
    'stacktrace'              => 'Stack trace',
    'more_info'               => 'More information',

-    // Ignore this comment
+

    'collect_info'            => 'Please collect more information in the <code>storage/logs</code> directory where you will find log files. If you\'re running Docker, use <code>docker logs -f [container]</code>.',
    'collect_info_more'       => 'You can read more about collecting error information in <a href="https://docs.firefly-iii.org/how-to/general/debug/">the FAQ</a>.',
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -22,7 +22,7 @@

 declare(strict_types=1);

-// Ignore this comment
+

 return [
    // general stuff:
@@ -336,7 +336,7 @@ return [

    // old

-    // Ignore this comment
+

    'search_modifier_date_on'                              => 'Transaction date is ":value"',
    'search_modifier_not_date_on'                          => 'Transaction date is not ":value"',
@@ -728,7 +728,7 @@ return [
    'search_modifier_not_source_balance_gt'                => 'Source account balance is less than or equal to ":value"',


-    // Ignore this comment
+

    // END
    'general_search_error'                                 => 'An error occurred while searching. Please check the log files for more information.',
@@ -1262,7 +1262,7 @@ return [
    'rule_trigger_not_source_balance_lt'                   => 'Source account balance is more than or equal to :trigger_value',
    'rule_trigger_not_source_balance_lte'                  => 'Source account balance is more than :trigger_value',

-    // Ignore this comment
+

    // actions
    // set, clear, add, remove, append/prepend
@@ -1653,7 +1653,7 @@ return [
    'multi_account_warning_deposit'                        => 'Keep in mind that the destination account of subsequent splits will be overruled by whatever is defined in the first split of the deposit.',
    'multi_account_warning_transfer'                       => 'Keep in mind that the source + destination account of subsequent splits will be overruled by whatever is defined in the first split of the transfer.',

-    // Ignore this comment
+

    // export data:
    'export_data_title'                                    => 'Export data from Firefly III',
@@ -2067,7 +2067,7 @@ return [
    'stored_category'                                      => 'Stored new category ":name"',
    'without_category_between'                             => 'Without category between :start and :end',

-    // Ignore this comment
+

    // transactions:
    'wait_loading_transaction'                             => 'Please wait for the form to load',
@@ -2311,7 +2311,7 @@ return [
    'classification'                                       => 'Classification',
    'store_transaction'                                    => 'Store transaction',

-    // Ignore this comment
+

    // reports:
    'report_default'                                       => 'Default financial report between :start and :end',
@@ -2418,7 +2418,7 @@ return [
    'sum_in_default_currency'                              => 'The sum will always be in your default currency.',
    'net_filtered_prefs'                                   => 'This chart will never include accounts that have the "Include in net worth"-option unchecked.',

-    // Ignore this comment
+

    // charts:
    'chart'                                                => 'Chart',
@@ -2521,7 +2521,7 @@ return [
    'total_amount'                                         => 'Total amount',
    'number_of_decimals'                                   => 'Number of decimals',

-    // Ignore this comment
+

    // administration
    'invite_is_already_redeemed'                           => 'The invite to ":address" has already been redeemed.',
@@ -2823,7 +2823,7 @@ return [
    'except_weekends'                                      => 'Except weekends',
    'recurrence_deleted'                                   => 'Recurring transaction ":title" deleted',

-    // Ignore this comment
+

    // new lines for summary controller.
    'box_balance_in_currency'                              => 'Balance (:currency)',
@@ -2890,5 +2890,3 @@ return [
    'enable_auto_convert'                                  => 'Enable currency conversion',
    'disable_auto_convert'                                 => 'Disable currency conversion',
 ];
-
-// Ignore this comment
--- a/resources/lang/en_US/form.php
+++ b/resources/lang/en_US/form.php
@@ -20,7 +20,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-// Ignore this comment
+

 declare(strict_types=1);

@@ -66,7 +66,7 @@ return [
    'tagMode'                      => 'Tag mode',
    'virtual_balance'              => 'Virtual balance',

-    // Ignore this comment
+

    'targetamount'                 => 'Target amount',
    'target_amount'                => 'Target amount',
@@ -168,7 +168,7 @@ return [
    'journal_areYouSure'           => 'Are you sure you want to delete the transaction described ":description"?',
    'mass_journal_are_you_sure'    => 'Are you sure you want to delete these transactions?',

-    // Ignore this comment
+

    'tag_areYouSure'               => 'Are you sure you want to delete the tag ":tag"?',
    'journal_link_areYouSure'      => 'Are you sure you want to delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>?',
@@ -233,7 +233,7 @@ return [
    'fints_account'                => 'FinTS account',
    'local_account'                => 'Firefly III account',

-    // Ignore this comment
+

    'from_date'                    => 'Date from',
    'to_date'                      => 'Date to',
@@ -278,4 +278,3 @@ return [
    'ntfy_user'                    => 'Ntfy username',
    'ntfy_pass'                    => 'Ntfy password',
 ];
-// Ignore this comment
--- a/resources/lang/en_US/intro.php
+++ b/resources/lang/en_US/intro.php
@@ -20,7 +20,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-// Ignore this comment
+

 declare(strict_types=1);

@@ -54,7 +54,7 @@ return [
    'budgets_index_list_of_budgets'                                   => 'Use this table to set the amounts for each budget and see how you are doing.',
    'budgets_index_outro'                                             => 'To learn more about budgeting, checkout the help icon in the top right corner.',

-    // Ignore this comment
+

    // reports (index)
    'reports_index_intro'                                             => 'Use these reports to get detailed insights in your finances.',
@@ -93,7 +93,7 @@ return [
    'piggy-banks_index_button'                                        => 'Next to this progress bar are two buttons (+ and -) to add or remove money from each piggy bank.',
    'piggy-banks_index_accountStatus'                                 => 'For each asset account with at least one piggy bank the status is listed in this table.',

-    // Ignore this comment
+

    // create piggy
    'piggy-banks_create_name'                                         => 'What is your goal? A new couch, a camera, money for emergencies?',
@@ -144,7 +144,7 @@ return [
    'rules_create_test_rule_triggers'                                 => 'Use this button to see which transactions would match your rule.',
    'rules_create_actions'                                            => 'Set as many actions as you like.',

-    // Ignore this comment
+

    // preferences
    'preferences_index_tabs'                                          => 'More options are available behind these tabs.',
@@ -157,4 +157,3 @@ return [
    // create currency
    'currencies_create_code'                                          => 'This code should be ISO compliant (Google it for your new currency).',
 ];
-// Ignore this comment
--- a/resources/lang/en_US/list.php
+++ b/resources/lang/en_US/list.php
@@ -20,7 +20,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-// Ignore this comment
+

 declare(strict_types=1);

@@ -66,7 +66,7 @@ return [
    'balance_difference'      => 'Balance difference',
    'menu'                    => 'Menu',

-    // Ignore this comment
+

    'repeat_freq'             => 'Repeats',
    'description'             => 'Description',
@@ -134,7 +134,7 @@ return [
    'account_at_bunq'         => 'Account with bunq',
    'file_name'               => 'File name',

-    // Ignore this comment
+

    'file_size'               => 'File size',
    'file_type'               => 'File type',
@@ -163,4 +163,3 @@ return [
    'url'                     => 'URL',
    'secret'                  => 'Secret',
 ];
-// Ignore this comment
--- a/resources/lang/en_US/pagination.php
+++ b/resources/lang/en_US/pagination.php
@@ -20,7 +20,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-// Ignore this comment
+

 declare(strict_types=1);

--- a/resources/lang/en_US/passwords.php
+++ b/resources/lang/en_US/passwords.php
@@ -20,7 +20,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-// Ignore this comment
+

 declare(strict_types=1);

--- a/resources/lang/en_US/validation.php
+++ b/resources/lang/en_US/validation.php
@@ -20,7 +20,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-// Ignore this comment
+

 declare(strict_types=1);

@@ -106,7 +106,7 @@ return [
    'unique_object_for_user'          => 'This name is already in use.',
    'unique_account_for_user'         => 'This account name is already in use.',

-    // Ignore this comment
+

    'between.numeric'                 => 'The :attribute must be between :min and :max.',
    'between.file'                    => 'The :attribute must be between :min and :max kilobytes.',
@@ -177,7 +177,7 @@ return [
    'same_account_type'               => 'Both accounts must be of the same account type',
    'same_account_currency'           => 'Both accounts must have the same currency setting',

-    // Ignore this comment
+

    'secure_password'                 => 'This is not a secure password. Please try again. For more information, visit https://bit.ly/FF3-password',
    'valid_recurrence_rep_type'       => 'Invalid repetition type for recurring transactions.',
@@ -240,7 +240,7 @@ return [
    'deposit_dest_bad_data'           => 'Could not find a valid destination account when searching for ID ":id" or name ":name".',
    'deposit_dest_wrong_type'         => 'The submitted destination account is not of the right type.',

-    // Ignore this comment
+

    'transfer_source_need_data'       => 'Need to get a valid source account ID and/or valid source account name to continue.',
    'transfer_source_bad_data'        => '[c] Could not find a valid source account when searching for ID ":id" or name ":name".',
@@ -278,5 +278,3 @@ return [
    'administration_owner_rename'     => 'You can\'t rename your standard administration.',
    'existing_mfa_code'               => 'Please enter a valid code',
 ];
-
-// Ignore this comment
Author	SHA1	Message	Date
github-actions	2d37177316	Auto commit for release 'develop' on 2025-01-06	2025-01-06 04:13:41 +01:00
James Cole	abb25e2015	Fix sql query error and upgrade error.	2025-01-05 14:33:33 +01:00
James Cole	d08d075e30	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop	2025-01-05 09:23:17 +01:00
James Cole	04fb6a953e	This rule is no longer necessary.	2025-01-05 09:21:29 +01:00
James Cole	5dce0bec8e	This is no longer necessary since translations are no longer stored in the repository.	2025-01-05 09:20:55 +01:00