More readable fix for division by zero error.

Merge pull request #8735 from mansuf/develop
Fix `Division error by zero` in budget views
2025-10-26 21:43:53 +00:00 · 2024-03-31 08:40:47 +02:00 · 2024-03-31 08:37:09 +02:00 · 2024-03-31 12:03:54 +07:00 · 2024-03-31 03:16:54 +02:00 · 2024-03-31 03:14:08 +02:00
80 changed files with 886 additions and 196 deletions
--- a/.ci/php-cs-fixer/composer.lock
+++ b/.ci/php-cs-fixer/composer.lock
@@ -160,16 +160,16 @@
        },
        {
            "name": "composer/xdebug-handler",
-            "version": "3.0.3",
+            "version": "3.0.4",
            "source": {
                "type": "git",
                "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "ced299686f41dce890debac69273b47ffe98a40c"
+                "reference": "4f988f8fdf580d53bdb2d1278fe93d1ed5462255"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c",
-                "reference": "ced299686f41dce890debac69273b47ffe98a40c",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/4f988f8fdf580d53bdb2d1278fe93d1ed5462255",
+                "reference": "4f988f8fdf580d53bdb2d1278fe93d1ed5462255",
                "shasum": ""
            },
            "require": {
@@ -180,7 +180,7 @@
            "require-dev": {
                "phpstan/phpstan": "^1.0",
                "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^6.0"
+                "phpunit/phpunit": "^8.5 || ^9.6 || ^10.5"
            },
            "type": "library",
            "autoload": {
@@ -204,9 +204,9 @@
                "performance"
            ],
            "support": {
-                "irc": "irc://irc.freenode.org/composer",
+                "irc": "ircs://irc.libera.chat:6697/composer",
                "issues": "https://github.com/composer/xdebug-handler/issues",
-                "source": "https://github.com/composer/xdebug-handler/tree/3.0.3"
+                "source": "https://github.com/composer/xdebug-handler/tree/3.0.4"
            },
            "funding": [
                {
@@ -222,7 +222,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-02-25T21:32:43+00:00"
+            "time": "2024-03-26T18:29:49+00:00"
        },
        {
            "name": "friendsofphp/php-cs-fixer",
--- a/.env.example
+++ b/.env.example
@@ -111,7 +111,10 @@ PGSQL_SSL_CERT=null
 PGSQL_SSL_KEY=null
 PGSQL_SSL_CRL_FILE=null

-# more PostgreSQL settings
+# For postgresql 15 and up, setting this to public will no longer work as expected, becasuse the
+# 'public' schema is without grants. This can be worked around by having a super user grant those
+# necessary privileges, but in security conscious setups that's not viable.
+# You will need to set this to the schema you want to use.
 PGSQL_SCHEMA=public

 # If you're looking for performance improvements, you could install memcached or redis
--- a/.github/workflows/release.yml
+++ b/.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@v34
+        uses: JC5/firefly-iii-dev@v36
        with:
          action: 'ff3:crowdin-warning'
          output: ''
@@ -60,7 +60,7 @@ jobs:
          GH_TOKEN: ''
      - name: Cleanup changelog
        id: cleanup-changelog
-        uses: JC5/firefly-iii-dev@v34
+        uses: JC5/firefly-iii-dev@v36
        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@v34
+        uses: JC5/firefly-iii-dev@v36
        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@v34
+        uses: JC5/firefly-iii-dev@v36
        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@v34
+        uses: JC5/firefly-iii-dev@v36
        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@v34
+        uses: JC5/firefly-iii-dev@v36
        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@v34
+        uses: JC5/firefly-iii-dev@v36
        with:
          action: 'ff3:code'
          output: ''
@@ -120,7 +120,7 @@ jobs:
          npm run build
      - name: Build old JS
        id: old-js
-        uses: JC5/firefly-iii-dev@v34
+        uses: JC5/firefly-iii-dev@v36
        with:
          action: 'ff3:old-js'
          output: ''
@@ -141,13 +141,20 @@ jobs:
          git config user.email 41898282+github-actions[bot]@users.noreply.github.com
          git config advice.addIgnoredFile false

+          # update composer (again)
+          composer validate --strict
+          composer update --no-dev --no-scripts --no-plugins
+          composer dump-autoload
+
          releaseName=$version
          zipName=FireflyIII-$version.zip
+          tarName=FireflyIII-$version.tar.gz

          if [[ "develop" == "$version" ]]; then
            [[ -z $(git status --untracked-files=normal --porcelain) ]] && echo "this branch is clean, no need to push..." && exit 0;
            releaseName=$version-$(date +'%Y%m%d')
            zipName=FireflyIII-develop.zip
+            tarName=FireflyIII-develop.tar.gz
          fi

          git add -A
@@ -157,27 +164,53 @@ jobs:
          git commit -m "Auto commit for release '$version' on $(date +'%Y-%m-%d')" || true
          git push

-          # zip everything
+          # zip and tar everything
          zip -rq $zipName . -x "*.git*" "*.ci*" "*.github*" "*node_modules*" "*output.txt*"
+          touch $tarName
+          tar --exclude=$tarName --exclude='./.git' --exclude='./.ci' --exclude='./.github' --exclude='./node_modules' --exclude='./output.txt' -czf $tarName .

          # add sha256 sum
          sha256sum -b $zipName > $zipName.sha256
+          sha256sum -b $tarName > $tarName.sha256

          if [[ "develop" == "$version" ]]; then
+            # add text to output.txt (instructions)
+            rm output.txt
+            echo "Bi-weekly development release of Firefly III with the latest fixes, translations and features. Docker users can find this release under the \`develop\` tag." >> output.txt
+            echo "" >> output.txt
+            echo "This release was created on **$(date +'%Y-%m-%d')** and may contain unexpected bugs. Data loss is rare but is not impossible." >> output.txt
+            echo "" >> output.txt
+            echo "* Please read the installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
+            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
+            echo "" >> output.txt
+            echo ":warning: Please be careful with this pre-release, as is may not work as expected." >> output.txt
+
+            # create the release:
            echo "Create nightly release."
            git tag -a $releaseName -m "Nightly development release '$version' on $(date +'%Y-%m-%d')"
            git push origin $releaseName
            gh release create $releaseName -p --verify-tag \
              -t "Development release for $(date +'%Y-%m-%d')" \
-              -n "Bi-weekly development release of Firefly III with the latest fixes, translations and features. This release was created on **$(date +'%Y-%m-%d')** and may contain bugs. Use at your own risk. Docker users can find this release under the \`develop\` tag."
+              -F output.txt

            # add zip file to release.
            gh release upload $releaseName $zipName
+            gh release upload $releaseName $tarName

            # add sha256 sum to release
            gh release upload $releaseName $zipName.sha256
+            gh release upload $releaseName $tarName.sha256

+            # rm output.txt again
+            rm output.txt
          else
+            # add text to output.txt (more instructions)
+            echo '' >> output.txt
+            echo '### Instructions' >> output.txt
+            echo '' >> output.txt
+            echo "* Installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
+            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
+
            echo "Create default release."
            git tag -a $releaseName -m "Here be changelog"
            git push origin $releaseName
--- a/app/Http/Controllers/Json/BoxController.php
+++ b/app/Http/Controllers/Json/BoxController.php
@@ -130,7 +130,7 @@ class BoxController extends Controller
                $boxTitle         = (string)trans('firefly.left_to_spend');
                $activeDaysLeft   = $this->activeDaysLeft($start, $end);   // see method description.
                $display          = 1;                                     // not overspent
-                $leftPerDayAmount = bcdiv($leftToSpendAmount, (string)$activeDaysLeft);
+                $leftPerDayAmount = 0 === (int) $activeDaysLeft ? $leftToSpendAmount : bcdiv($leftToSpendAmount, (string)$activeDaysLeft);
                app('log')->debug(sprintf('Left to spend per day is %s', $leftPerDayAmount));
            }
        }
--- a/app/Support/Search/OperatorQuerySearch.php
+++ b/app/Support/Search/OperatorQuerySearch.php
@@ -177,7 +177,7 @@ class OperatorQuerySearch implements SearchInterface
            default:
                app('log')->error(sprintf('Cannot handle node %s', $class));

-                throw new FireflyException(sprintf('Firefly III search cant handle "%s"-nodes', $class));
+                throw new FireflyException(sprintf('Firefly III search can\'t handle "%s"-nodes', $class));

            case Subquery::class:
                // loop all notes in subquery:
--- a/app/Transformers/BillTransformer.php
+++ b/app/Transformers/BillTransformer.php
@@ -110,7 +110,10 @@ class BillTransformer extends AbstractTransformer
            $nem     = $nemDate->toAtomString();

            // nullify again when it's outside the current view range.
-            if ($nemDate->lt($this->parameters->get('start')) || $nemDate->gt($this->parameters->get('end'))) {
+            if (
+                (null !== $this->parameters->get('start') && $nemDate->lt($this->parameters->get('start')))
+                || (null !== $this->parameters->get('end') && $nemDate->gt($this->parameters->get('end')))
+            ) {
                $nem          = null;
                $nemDate      = null;
                $firstPayDate = null;
--- a/composer.lock
+++ b/composer.lock
@@ -1670,16 +1670,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v11.0.8",
+            "version": "v11.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "0379a7ccb77e2029c43ce508fa76e251a0d68fce"
+                "reference": "1437cea6d2b04cbc83743fbb208e1a01efccd9ec"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/0379a7ccb77e2029c43ce508fa76e251a0d68fce",
-                "reference": "0379a7ccb77e2029c43ce508fa76e251a0d68fce",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/1437cea6d2b04cbc83743fbb208e1a01efccd9ec",
+                "reference": "1437cea6d2b04cbc83743fbb208e1a01efccd9ec",
                "shasum": ""
            },
            "require": {
@@ -1871,20 +1871,20 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2024-03-21T14:15:49+00:00"
+            "time": "2024-03-28T15:07:18+00:00"
        },
        {
            "name": "laravel/passport",
-            "version": "v12.0.1",
+            "version": "v12.0.2",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/passport.git",
-                "reference": "37a5b5fbcae25dbb7c6a973957c2ce490e76946e"
+                "reference": "21099f1aff81706781578a19335d8a4c7c96422a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/passport/zipball/37a5b5fbcae25dbb7c6a973957c2ce490e76946e",
-                "reference": "37a5b5fbcae25dbb7c6a973957c2ce490e76946e",
+                "url": "https://api.github.com/repos/laravel/passport/zipball/21099f1aff81706781578a19335d8a4c7c96422a",
+                "reference": "21099f1aff81706781578a19335d8a4c7c96422a",
                "shasum": ""
            },
            "require": {
@@ -1904,6 +1904,7 @@
                "nyholm/psr7": "^1.5",
                "php": "^8.0",
                "phpseclib/phpseclib": "^2.0|^3.0",
+                "symfony/console": "^6.0|^7.0",
                "symfony/psr-http-message-bridge": "^2.1|^6.0|^7.0"
            },
            "require-dev": {
@@ -1946,20 +1947,20 @@
                "issues": "https://github.com/laravel/passport/issues",
                "source": "https://github.com/laravel/passport"
            },
-            "time": "2024-03-14T16:27:37+00:00"
+            "time": "2024-03-21T18:44:57+00:00"
        },
        {
            "name": "laravel/prompts",
-            "version": "v0.1.16",
+            "version": "v0.1.17",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/prompts.git",
-                "reference": "ca6872ab6aec3ab61db3a61f83a6caf764ec7781"
+                "reference": "8ee9f87f7f9eadcbe21e9e72cd4176b2f06cd5b5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/ca6872ab6aec3ab61db3a61f83a6caf764ec7781",
-                "reference": "ca6872ab6aec3ab61db3a61f83a6caf764ec7781",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/8ee9f87f7f9eadcbe21e9e72cd4176b2f06cd5b5",
+                "reference": "8ee9f87f7f9eadcbe21e9e72cd4176b2f06cd5b5",
                "shasum": ""
            },
            "require": {
@@ -2001,22 +2002,22 @@
            ],
            "support": {
                "issues": "https://github.com/laravel/prompts/issues",
-                "source": "https://github.com/laravel/prompts/tree/v0.1.16"
+                "source": "https://github.com/laravel/prompts/tree/v0.1.17"
            },
-            "time": "2024-02-21T19:25:27+00:00"
+            "time": "2024-03-13T16:05:43+00:00"
        },
        {
            "name": "laravel/sanctum",
-            "version": "v4.0.0",
+            "version": "v4.0.1",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/sanctum.git",
-                "reference": "9e6e561308cace166de9ceae4ced820309fa8e13"
+                "reference": "d1de99bf8d31199aaf93881561622489ab91ba58"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/sanctum/zipball/9e6e561308cace166de9ceae4ced820309fa8e13",
-                "reference": "9e6e561308cace166de9ceae4ced820309fa8e13",
+                "url": "https://api.github.com/repos/laravel/sanctum/zipball/d1de99bf8d31199aaf93881561622489ab91ba58",
+                "reference": "d1de99bf8d31199aaf93881561622489ab91ba58",
                "shasum": ""
            },
            "require": {
@@ -2025,7 +2026,8 @@
                "illuminate/contracts": "^11.0",
                "illuminate/database": "^11.0",
                "illuminate/support": "^11.0",
-                "php": "^8.2"
+                "php": "^8.2",
+                "symfony/console": "^7.0"
            },
            "require-dev": {
                "mockery/mockery": "^1.6",
@@ -2066,7 +2068,7 @@
                "issues": "https://github.com/laravel/sanctum/issues",
                "source": "https://github.com/laravel/sanctum"
            },
-            "time": "2024-03-12T14:07:05+00:00"
+            "time": "2024-03-19T20:09:38+00:00"
        },
        {
            "name": "laravel/serializable-closure",
@@ -2195,16 +2197,16 @@
        },
        {
            "name": "laravel/ui",
-            "version": "v4.5.0",
+            "version": "v4.5.1",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/ui.git",
-                "reference": "da3811f409297d13feccd5858ce748e7474b3d11"
+                "reference": "a3562953123946996a503159199d6742d5534e61"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/ui/zipball/da3811f409297d13feccd5858ce748e7474b3d11",
-                "reference": "da3811f409297d13feccd5858ce748e7474b3d11",
+                "url": "https://api.github.com/repos/laravel/ui/zipball/a3562953123946996a503159199d6742d5534e61",
+                "reference": "a3562953123946996a503159199d6742d5534e61",
                "shasum": ""
            },
            "require": {
@@ -2212,7 +2214,8 @@
                "illuminate/filesystem": "^9.21|^10.0|^11.0",
                "illuminate/support": "^9.21|^10.0|^11.0",
                "illuminate/validation": "^9.21|^10.0|^11.0",
-                "php": "^8.0"
+                "php": "^8.0",
+                "symfony/console": "^6.0|^7.0"
            },
            "require-dev": {
                "orchestra/testbench": "^7.35|^8.15|^9.0",
@@ -2251,9 +2254,9 @@
                "ui"
            ],
            "support": {
-                "source": "https://github.com/laravel/ui/tree/v4.5.0"
+                "source": "https://github.com/laravel/ui/tree/v4.5.1"
            },
-            "time": "2024-03-04T13:58:27+00:00"
+            "time": "2024-03-21T18:12:29+00:00"
        },
        {
            "name": "lcobucci/clock",
@@ -3363,16 +3366,16 @@
        },
        {
            "name": "nesbot/carbon",
-            "version": "3.1.1",
+            "version": "3.2.3",
            "source": {
                "type": "git",
                "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "34ccf6f6b49c915421c7886c88c0cb77f3ebbfd2"
+                "reference": "4d599a6e2351d6b6bf21737accdfe1a4ce3fdbb1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/34ccf6f6b49c915421c7886c88c0cb77f3ebbfd2",
-                "reference": "34ccf6f6b49c915421c7886c88c0cb77f3ebbfd2",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4d599a6e2351d6b6bf21737accdfe1a4ce3fdbb1",
+                "reference": "4d599a6e2351d6b6bf21737accdfe1a4ce3fdbb1",
                "shasum": ""
            },
            "require": {
@@ -3390,14 +3393,14 @@
            "require-dev": {
                "doctrine/dbal": "^3.6.3 || ^4.0",
                "doctrine/orm": "^2.15.2 || ^3.0",
-                "friendsofphp/php-cs-fixer": "^3.18.0",
-                "kylekatarnls/multi-tester": "^2.2.0",
-                "ondrejmirtes/better-reflection": "^6.11.0.0",
-                "phpmd/phpmd": "^2.13.0",
-                "phpstan/extension-installer": "^1.3.0",
-                "phpstan/phpstan": "^1.10.20",
-                "phpunit/phpunit": "^10.2.2",
-                "squizlabs/php_codesniffer": "^3.7.2"
+                "friendsofphp/php-cs-fixer": "^3.52.1",
+                "kylekatarnls/multi-tester": "^2.5.3",
+                "ondrejmirtes/better-reflection": "^6.25.0.4",
+                "phpmd/phpmd": "^2.15.0",
+                "phpstan/extension-installer": "^1.3.1",
+                "phpstan/phpstan": "^1.10.65",
+                "phpunit/phpunit": "^10.5.15",
+                "squizlabs/php_codesniffer": "^3.9.0"
            },
            "bin": [
                "bin/carbon"
@@ -3465,7 +3468,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-03-13T12:42:37+00:00"
+            "time": "2024-03-30T18:22:00+00:00"
        },
        {
            "name": "nette/schema",
@@ -5317,16 +5320,16 @@
        },
        {
            "name": "spatie/ignition",
-            "version": "1.12.0",
+            "version": "1.13.1",
            "source": {
                "type": "git",
                "url": "https://github.com/spatie/ignition.git",
-                "reference": "5b6f801c605a593106b623e45ca41496a6e7d56d"
+                "reference": "889bf1dfa59e161590f677728b47bf4a6893983b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/spatie/ignition/zipball/5b6f801c605a593106b623e45ca41496a6e7d56d",
-                "reference": "5b6f801c605a593106b623e45ca41496a6e7d56d",
+                "url": "https://api.github.com/repos/spatie/ignition/zipball/889bf1dfa59e161590f677728b47bf4a6893983b",
+                "reference": "889bf1dfa59e161590f677728b47bf4a6893983b",
                "shasum": ""
            },
            "require": {
@@ -5396,7 +5399,7 @@
                    "type": "github"
                }
            ],
-            "time": "2024-01-03T15:49:39+00:00"
+            "time": "2024-03-29T14:03:47+00:00"
        },
        {
            "name": "spatie/laravel-html",
@@ -5478,16 +5481,16 @@
        },
        {
            "name": "spatie/laravel-ignition",
-            "version": "2.4.2",
+            "version": "2.5.0",
            "source": {
                "type": "git",
                "url": "https://github.com/spatie/laravel-ignition.git",
-                "reference": "351504f4570e32908839fc5a2dc53bf77d02f85e"
+                "reference": "e23f4e8ce6644dc3d68b9d8a0aed3beaca0d6ada"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/351504f4570e32908839fc5a2dc53bf77d02f85e",
-                "reference": "351504f4570e32908839fc5a2dc53bf77d02f85e",
+                "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/e23f4e8ce6644dc3d68b9d8a0aed3beaca0d6ada",
+                "reference": "e23f4e8ce6644dc3d68b9d8a0aed3beaca0d6ada",
                "shasum": ""
            },
            "require": {
@@ -5497,7 +5500,7 @@
                "illuminate/support": "^10.0|^11.0",
                "php": "^8.1",
                "spatie/flare-client-php": "^1.3.5",
-                "spatie/ignition": "^1.9",
+                "spatie/ignition": "^1.13",
                "symfony/console": "^6.2.3|^7.0",
                "symfony/var-dumper": "^6.2.3|^7.0"
            },
@@ -5566,7 +5569,7 @@
                    "type": "github"
                }
            ],
-            "time": "2024-02-09T16:08:40+00:00"
+            "time": "2024-03-29T14:14:55+00:00"
        },
        {
            "name": "spatie/period",
@@ -10277,16 +10280,16 @@
        },
        {
            "name": "phpstan/phpstan",
-            "version": "1.10.65",
+            "version": "1.10.66",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "3c657d057a0b7ecae19cb12db446bbc99d8839c6"
+                "reference": "94779c987e4ebd620025d9e5fdd23323903950bd"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/3c657d057a0b7ecae19cb12db446bbc99d8839c6",
-                "reference": "3c657d057a0b7ecae19cb12db446bbc99d8839c6",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/94779c987e4ebd620025d9e5fdd23323903950bd",
+                "reference": "94779c987e4ebd620025d9e5fdd23323903950bd",
                "shasum": ""
            },
            "require": {
@@ -10335,7 +10338,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-03-23T10:30:26+00:00"
+            "time": "2024-03-28T16:17:31+00:00"
        },
        {
            "name": "phpstan/phpstan-deprecation-rules",
@@ -10757,16 +10760,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "10.5.15",
+            "version": "10.5.16",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "86376e05e8745ed81d88232ff92fee868247b07b"
+                "reference": "18f8d4a5f52b61fdd9370aaae3167daa0eeb69cd"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/86376e05e8745ed81d88232ff92fee868247b07b",
-                "reference": "86376e05e8745ed81d88232ff92fee868247b07b",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/18f8d4a5f52b61fdd9370aaae3167daa0eeb69cd",
+                "reference": "18f8d4a5f52b61fdd9370aaae3167daa0eeb69cd",
                "shasum": ""
            },
            "require": {
@@ -10838,7 +10841,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.15"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.16"
            },
            "funding": [
                {
@@ -10854,7 +10857,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-03-22T04:17:47+00:00"
+            "time": "2024-03-28T10:08:10+00:00"
        },
        {
            "name": "sebastian/cli-parser",
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -117,8 +117,8 @@ return [
        'expression_engine' => false,
        // see cer.php for exchange rates feature flag.
    ],
-    'version'                      => 'develop/2024-03-26',
-    'api_version'                  => '2.0.12',
+    'version'                      => 'develop/2024-03-31',
+    'api_version'                  => '2.0.13',
    'db_version'                   => 23,

    // generic settings
--- a/public/v2/i18n/bg.json
+++ b/public/v2/i18n/bg.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "bg",
        "date_time_fns": "MMMM do, yyyy @ HH:mm:ss",
+        "month_and_day_fns": "d MMMM y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "\u041f\u043e\u0445\u0430\u0440\u0447\u0435\u043d\u0438",
        "left": "\u041e\u0441\u0442\u0430\u043d\u0430\u043b\u0438",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "\u0414\u044a\u043b\u0433",
        "account_type_Loan": "\u0417\u0430\u0435\u043c",
-        "account_type_Mortgage": "\u0418\u043f\u043e\u0442\u0435\u043a\u0430"
+        "account_type_Mortgage": "\u0418\u043f\u043e\u0442\u0435\u043a\u0430",
+        "account_role_defaultAsset": "\u0421\u043c\u0435\u0442\u043a\u0430 \u0437\u0430 \u0430\u043a\u0442\u0438\u0432\u0438 \u043f\u043e \u043f\u043e\u0434\u0440\u0430\u0437\u0431\u0438\u0440\u0430\u043d\u0435",
+        "account_role_sharedAsset": "\u0421\u043c\u0435\u0442\u043a\u0430 \u0437\u0430 \u0441\u043f\u043e\u0434\u0435\u043b\u0435\u043d\u0438 \u0430\u043a\u0442\u0438\u0432\u0438",
+        "account_role_savingAsset": "\u0421\u043f\u0435\u0441\u0442\u043e\u0432\u043d\u0430 \u0441\u043c\u0435\u0442\u043a\u0430",
+        "account_role_ccAsset": "\u041a\u0440\u0435\u0434\u0438\u0442\u043d\u0430 \u043a\u0430\u0440\u0442\u0430",
+        "account_role_cashWalletAsset": "\u041f\u0430\u0440\u0438\u0447\u0435\u043d \u043f\u043e\u0440\u0442\u0444\u0435\u0439\u043b"
    }
 }
--- a/public/v2/i18n/bg_BG.json
+++ b/public/v2/i18n/bg_BG.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "bg",
        "date_time_fns": "MMMM do, yyyy @ HH:mm:ss",
+        "month_and_day_fns": "d MMMM y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "\u041f\u043e\u0445\u0430\u0440\u0447\u0435\u043d\u0438",
        "left": "\u041e\u0441\u0442\u0430\u043d\u0430\u043b\u0438",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "\u0414\u044a\u043b\u0433",
        "account_type_Loan": "\u0417\u0430\u0435\u043c",
-        "account_type_Mortgage": "\u0418\u043f\u043e\u0442\u0435\u043a\u0430"
+        "account_type_Mortgage": "\u0418\u043f\u043e\u0442\u0435\u043a\u0430",
+        "account_role_defaultAsset": "\u0421\u043c\u0435\u0442\u043a\u0430 \u0437\u0430 \u0430\u043a\u0442\u0438\u0432\u0438 \u043f\u043e \u043f\u043e\u0434\u0440\u0430\u0437\u0431\u0438\u0440\u0430\u043d\u0435",
+        "account_role_sharedAsset": "\u0421\u043c\u0435\u0442\u043a\u0430 \u0437\u0430 \u0441\u043f\u043e\u0434\u0435\u043b\u0435\u043d\u0438 \u0430\u043a\u0442\u0438\u0432\u0438",
+        "account_role_savingAsset": "\u0421\u043f\u0435\u0441\u0442\u043e\u0432\u043d\u0430 \u0441\u043c\u0435\u0442\u043a\u0430",
+        "account_role_ccAsset": "\u041a\u0440\u0435\u0434\u0438\u0442\u043d\u0430 \u043a\u0430\u0440\u0442\u0430",
+        "account_role_cashWalletAsset": "\u041f\u0430\u0440\u0438\u0447\u0435\u043d \u043f\u043e\u0440\u0442\u0444\u0435\u0439\u043b"
    }
 }
--- a/public/v2/i18n/ca.json
+++ b/public/v2/i18n/ca.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "ca",
        "date_time_fns": "D [de\/d'] MMMM yyyy [a les] HH:mm:ss",
+        "month_and_day_fns": "d MMMM y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III no pot determinar el tipus de transacci\u00f3 a partir d'aquest compte font.",
+        "bad_type_destination": "Firefly III no pot determinar el tipus de transacci\u00f3 a partir d'aquest compte de dest\u00ed."
+    },
    "firefly": {
        "spent": "Gastat",
        "left": "Queda",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Compte d'ingressos",
        "account_type_Debt": "Deute",
        "account_type_Loan": "Cr\u00e8dit",
-        "account_type_Mortgage": "Hipoteca"
+        "account_type_Mortgage": "Hipoteca",
+        "account_role_defaultAsset": "Compte d'actius per defecte",
+        "account_role_sharedAsset": "Compte d'actius compartit",
+        "account_role_savingAsset": "Compte d'estalvis",
+        "account_role_ccAsset": "Targeta de cr\u00e8dit",
+        "account_role_cashWalletAsset": "Cartera d'efectiu"
    }
 }
--- a/public/v2/i18n/ca_ES.json
+++ b/public/v2/i18n/ca_ES.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "ca",
        "date_time_fns": "D [de\/d'] MMMM yyyy [a les] HH:mm:ss",
+        "month_and_day_fns": "d MMMM y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III no pot determinar el tipus de transacci\u00f3 a partir d'aquest compte font.",
+        "bad_type_destination": "Firefly III no pot determinar el tipus de transacci\u00f3 a partir d'aquest compte de dest\u00ed."
+    },
    "firefly": {
        "spent": "Gastat",
        "left": "Queda",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Compte d'ingressos",
        "account_type_Debt": "Deute",
        "account_type_Loan": "Cr\u00e8dit",
-        "account_type_Mortgage": "Hipoteca"
+        "account_type_Mortgage": "Hipoteca",
+        "account_role_defaultAsset": "Compte d'actius per defecte",
+        "account_role_sharedAsset": "Compte d'actius compartit",
+        "account_role_savingAsset": "Compte d'estalvis",
+        "account_role_ccAsset": "Targeta de cr\u00e8dit",
+        "account_role_cashWalletAsset": "Cartera d'efectiu"
    }
 }
--- a/public/v2/i18n/cs.json
+++ b/public/v2/i18n/cs.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "cs",
        "date_time_fns": "MMMM do, yyyy @ HH:mm:ss",
+        "month_and_day_fns": "d MMMM, y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "Utraceno",
        "left": "Zb\u00fdv\u00e1",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "Dluh",
        "account_type_Loan": "P\u016fj\u010dka",
-        "account_type_Mortgage": "Hypot\u00e9ka"
+        "account_type_Mortgage": "Hypot\u00e9ka",
+        "account_role_defaultAsset": "V\u00fdchoz\u00ed \u00fa\u010det aktiv",
+        "account_role_sharedAsset": "Sd\u00edlen\u00fd \u00fa\u010det aktiv",
+        "account_role_savingAsset": "Spo\u0159ic\u00ed \u00fa\u010det",
+        "account_role_ccAsset": "Kreditn\u00ed karta",
+        "account_role_cashWalletAsset": "Pen\u011b\u017eenka"
    }
 }
--- a/public/v2/i18n/cs_CZ.json
+++ b/public/v2/i18n/cs_CZ.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "cs",
        "date_time_fns": "MMMM do, yyyy @ HH:mm:ss",
+        "month_and_day_fns": "d MMMM, y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "Utraceno",
        "left": "Zb\u00fdv\u00e1",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "Dluh",
        "account_type_Loan": "P\u016fj\u010dka",
-        "account_type_Mortgage": "Hypot\u00e9ka"
+        "account_type_Mortgage": "Hypot\u00e9ka",
+        "account_role_defaultAsset": "V\u00fdchoz\u00ed \u00fa\u010det aktiv",
+        "account_role_sharedAsset": "Sd\u00edlen\u00fd \u00fa\u010det aktiv",
+        "account_role_savingAsset": "Spo\u0159ic\u00ed \u00fa\u010det",
+        "account_role_ccAsset": "Kreditn\u00ed karta",
+        "account_role_cashWalletAsset": "Pen\u011b\u017eenka"
    }
 }
--- a/public/v2/i18n/da.json
+++ b/public/v2/i18n/da.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "da",
        "date_time_fns": "MMMM g\u00f8r, yyyy @ HH:mm:ss",
+        "month_and_day_fns": "d MMMM y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III kan ikke bestemme transaktionstypen baseret p\u00e5 denne kildekonto.",
+        "bad_type_destination": "Firefly III kan ikke bestemme transaktionstypen baseret p\u00e5 denne destinationskonto."
+    },
    "firefly": {
        "spent": "Spent",
        "left": "Left",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "G\u00e6ld",
        "account_type_Loan": "L\u00e5n",
-        "account_type_Mortgage": "Pant"
+        "account_type_Mortgage": "Pant",
+        "account_role_defaultAsset": "Default asset account",
+        "account_role_sharedAsset": "Shared asset account",
+        "account_role_savingAsset": "Savings account",
+        "account_role_ccAsset": "Credit card",
+        "account_role_cashWalletAsset": "Cash wallet"
    }
 }
--- a/public/v2/i18n/da_DK.json
+++ b/public/v2/i18n/da_DK.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "da",
        "date_time_fns": "MMMM g\u00f8r, yyyy @ HH:mm:ss",
+        "month_and_day_fns": "d MMMM y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III kan ikke bestemme transaktionstypen baseret p\u00e5 denne kildekonto.",
+        "bad_type_destination": "Firefly III kan ikke bestemme transaktionstypen baseret p\u00e5 denne destinationskonto."
+    },
    "firefly": {
        "spent": "Spent",
        "left": "Left",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "G\u00e6ld",
        "account_type_Loan": "L\u00e5n",
-        "account_type_Mortgage": "Pant"
+        "account_type_Mortgage": "Pant",
+        "account_role_defaultAsset": "Default asset account",
+        "account_role_sharedAsset": "Shared asset account",
+        "account_role_savingAsset": "Savings account",
+        "account_role_ccAsset": "Credit card",
+        "account_role_cashWalletAsset": "Cash wallet"
    }
 }
--- a/public/v2/i18n/de.json
+++ b/public/v2/i18n/de.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "de",
        "date_time_fns": "dd. MMM. yyyy um HH:mm:ss",
+        "month_and_day_fns": "D. MMMM Y",
        "date_time_fns_short": "dd. MMM. yyyy um HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III kann die Buchungsart anhand dieses Quellkontos nicht ermitteln.",
+        "bad_type_destination": "Firefly III kann die Buchungsart anhand dieses Zielkontos nicht ermitteln."
+    },
    "firefly": {
        "spent": "Ausgegeben",
        "left": "\u00dcbrig",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Einnahmenkonto",
        "account_type_Debt": "Schuld",
        "account_type_Loan": "Darlehen",
-        "account_type_Mortgage": "Hypothek"
+        "account_type_Mortgage": "Hypothek",
+        "account_role_defaultAsset": "Standard-Bestandskonto",
+        "account_role_sharedAsset": "Gemeinsames Bestandskonto",
+        "account_role_savingAsset": "Sparkonto",
+        "account_role_ccAsset": "Kreditkarte",
+        "account_role_cashWalletAsset": "Geldb\u00f6rse"
    }
 }
--- a/public/v2/i18n/de_DE.json
+++ b/public/v2/i18n/de_DE.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "de",
        "date_time_fns": "dd. MMM. yyyy um HH:mm:ss",
+        "month_and_day_fns": "D. MMMM Y",
        "date_time_fns_short": "dd. MMM. yyyy um HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III kann die Buchungsart anhand dieses Quellkontos nicht ermitteln.",
+        "bad_type_destination": "Firefly III kann die Buchungsart anhand dieses Zielkontos nicht ermitteln."
+    },
    "firefly": {
        "spent": "Ausgegeben",
        "left": "\u00dcbrig",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Einnahmenkonto",
        "account_type_Debt": "Schuld",
        "account_type_Loan": "Darlehen",
-        "account_type_Mortgage": "Hypothek"
+        "account_type_Mortgage": "Hypothek",
+        "account_role_defaultAsset": "Standard-Bestandskonto",
+        "account_role_sharedAsset": "Gemeinsames Bestandskonto",
+        "account_role_savingAsset": "Sparkonto",
+        "account_role_ccAsset": "Kreditkarte",
+        "account_role_cashWalletAsset": "Geldb\u00f6rse"
    }
 }
--- a/public/v2/i18n/el.json
+++ b/public/v2/i18n/el.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "el",
        "date_time_fns": "do MMMM yyyy @ HH:mm:ss",
+        "month_and_day_fns": "d MMMM y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "\u03a4\u03bf Firefly III \u03b4\u03b5\u03bd \u03bc\u03c0\u03bf\u03c1\u03b5\u03af \u03bd\u03b1 \u03ba\u03b1\u03b8\u03bf\u03c1\u03af\u03c3\u03b5\u03b9 \u03c4\u03bf\u03bd \u03c4\u03cd\u03c0\u03bf \u03c3\u03c5\u03bd\u03b1\u03bb\u03bb\u03b1\u03b3\u03ae\u03c2 \u03bc\u03b5 \u03b2\u03ac\u03c3\u03b7 \u03b1\u03c5\u03c4\u03cc \u03c4\u03bf \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc \u03c0\u03c1\u03bf\u03ad\u03bb\u03b5\u03c5\u03c3\u03b7\u03c2.",
+        "bad_type_destination": "\u03a4\u03bf Firefly III \u03b4\u03b5\u03bd \u03bc\u03c0\u03bf\u03c1\u03b5\u03af \u03bd\u03b1 \u03ba\u03b1\u03b8\u03bf\u03c1\u03af\u03c3\u03b5\u03b9 \u03c4\u03bf\u03bd \u03c4\u03cd\u03c0\u03bf \u03c3\u03c5\u03bd\u03b1\u03bb\u03bb\u03b1\u03b3\u03ae\u03c2 \u03bc\u03b5 \u03b2\u03ac\u03c3\u03b7 \u03b1\u03c5\u03c4\u03cc \u03c4\u03bf \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc \u03c0\u03c1\u03bf\u03bf\u03c1\u03b9\u03c3\u03bc\u03bf\u03cd."
+    },
    "firefly": {
        "spent": "\u0394\u03b1\u03c0\u03b1\u03bd\u03ae\u03b8\u03b7\u03ba\u03b1\u03bd",
        "left": "\u0391\u03c0\u03bf\u03bc\u03ad\u03bd\u03bf\u03c5\u03bd",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "\u03a7\u03c1\u03ad\u03bf\u03c2",
        "account_type_Loan": "\u0394\u03ac\u03bd\u03b5\u03b9\u03bf",
-        "account_type_Mortgage": "\u03a5\u03c0\u03bf\u03b8\u03ae\u03ba\u03b7"
+        "account_type_Mortgage": "\u03a5\u03c0\u03bf\u03b8\u03ae\u03ba\u03b7",
+        "account_role_defaultAsset": "\u0392\u03b1\u03c3\u03b9\u03ba\u03cc\u03c2 \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc\u03c2 \u03ba\u03b5\u03c6\u03b1\u03bb\u03b1\u03af\u03bf\u03c5",
+        "account_role_sharedAsset": "\u039a\u03bf\u03b9\u03bd\u03cc\u03c2 \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc\u03c2 \u03ba\u03b5\u03c6\u03b1\u03bb\u03b1\u03af\u03bf\u03c5",
+        "account_role_savingAsset": "\u039b\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc\u03c2 \u03b1\u03c0\u03bf\u03c4\u03b1\u03bc\u03af\u03b5\u03c5\u03c3\u03b7\u03c2",
+        "account_role_ccAsset": "\u03a0\u03b9\u03c3\u03c4\u03c9\u03c4\u03b9\u03ba\u03ae \u03ba\u03ac\u03c1\u03c4\u03b1",
+        "account_role_cashWalletAsset": "\u03a0\u03bf\u03c1\u03c4\u03bf\u03c6\u03cc\u03bb\u03b9 \u03bc\u03b5\u03c4\u03c1\u03b7\u03c4\u03ce\u03bd"
    }
 }
--- a/public/v2/i18n/el_GR.json
+++ b/public/v2/i18n/el_GR.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "el",
        "date_time_fns": "do MMMM yyyy @ HH:mm:ss",
+        "month_and_day_fns": "d MMMM y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "\u03a4\u03bf Firefly III \u03b4\u03b5\u03bd \u03bc\u03c0\u03bf\u03c1\u03b5\u03af \u03bd\u03b1 \u03ba\u03b1\u03b8\u03bf\u03c1\u03af\u03c3\u03b5\u03b9 \u03c4\u03bf\u03bd \u03c4\u03cd\u03c0\u03bf \u03c3\u03c5\u03bd\u03b1\u03bb\u03bb\u03b1\u03b3\u03ae\u03c2 \u03bc\u03b5 \u03b2\u03ac\u03c3\u03b7 \u03b1\u03c5\u03c4\u03cc \u03c4\u03bf \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc \u03c0\u03c1\u03bf\u03ad\u03bb\u03b5\u03c5\u03c3\u03b7\u03c2.",
+        "bad_type_destination": "\u03a4\u03bf Firefly III \u03b4\u03b5\u03bd \u03bc\u03c0\u03bf\u03c1\u03b5\u03af \u03bd\u03b1 \u03ba\u03b1\u03b8\u03bf\u03c1\u03af\u03c3\u03b5\u03b9 \u03c4\u03bf\u03bd \u03c4\u03cd\u03c0\u03bf \u03c3\u03c5\u03bd\u03b1\u03bb\u03bb\u03b1\u03b3\u03ae\u03c2 \u03bc\u03b5 \u03b2\u03ac\u03c3\u03b7 \u03b1\u03c5\u03c4\u03cc \u03c4\u03bf \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc \u03c0\u03c1\u03bf\u03bf\u03c1\u03b9\u03c3\u03bc\u03bf\u03cd."
+    },
    "firefly": {
        "spent": "\u0394\u03b1\u03c0\u03b1\u03bd\u03ae\u03b8\u03b7\u03ba\u03b1\u03bd",
        "left": "\u0391\u03c0\u03bf\u03bc\u03ad\u03bd\u03bf\u03c5\u03bd",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "\u03a7\u03c1\u03ad\u03bf\u03c2",
        "account_type_Loan": "\u0394\u03ac\u03bd\u03b5\u03b9\u03bf",
-        "account_type_Mortgage": "\u03a5\u03c0\u03bf\u03b8\u03ae\u03ba\u03b7"
+        "account_type_Mortgage": "\u03a5\u03c0\u03bf\u03b8\u03ae\u03ba\u03b7",
+        "account_role_defaultAsset": "\u0392\u03b1\u03c3\u03b9\u03ba\u03cc\u03c2 \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc\u03c2 \u03ba\u03b5\u03c6\u03b1\u03bb\u03b1\u03af\u03bf\u03c5",
+        "account_role_sharedAsset": "\u039a\u03bf\u03b9\u03bd\u03cc\u03c2 \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc\u03c2 \u03ba\u03b5\u03c6\u03b1\u03bb\u03b1\u03af\u03bf\u03c5",
+        "account_role_savingAsset": "\u039b\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc\u03c2 \u03b1\u03c0\u03bf\u03c4\u03b1\u03bc\u03af\u03b5\u03c5\u03c3\u03b7\u03c2",
+        "account_role_ccAsset": "\u03a0\u03b9\u03c3\u03c4\u03c9\u03c4\u03b9\u03ba\u03ae \u03ba\u03ac\u03c1\u03c4\u03b1",
+        "account_role_cashWalletAsset": "\u03a0\u03bf\u03c1\u03c4\u03bf\u03c6\u03cc\u03bb\u03b9 \u03bc\u03b5\u03c4\u03c1\u03b7\u03c4\u03ce\u03bd"
    }
 }
--- a/public/v2/i18n/en-gb.json
+++ b/public/v2/i18n/en-gb.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "en-gb",
        "date_time_fns": "MMMM do, yyyy @ HH:mm:ss",
+        "month_and_day_fns": "MMMM d, y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "Spent",
        "left": "Left",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "Debt",
        "account_type_Loan": "Loan",
-        "account_type_Mortgage": "Mortgage"
+        "account_type_Mortgage": "Mortgage",
+        "account_role_defaultAsset": "Default asset account",
+        "account_role_sharedAsset": "Shared asset account",
+        "account_role_savingAsset": "Savings account",
+        "account_role_ccAsset": "Credit card",
+        "account_role_cashWalletAsset": "Cash wallet"
    }
 }
--- a/public/v2/i18n/en.json
+++ b/public/v2/i18n/en.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "en",
        "date_time_fns": "MMMM do, yyyy @ HH:mm:ss",
+        "month_and_day_fns": "MMMM d, y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "Spent",
        "left": "Left",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "Debt",
        "account_type_Loan": "Loan",
-        "account_type_Mortgage": "Mortgage"
+        "account_type_Mortgage": "Mortgage",
+        "account_role_defaultAsset": "Default asset account",
+        "account_role_sharedAsset": "Shared asset account",
+        "account_role_savingAsset": "Savings account",
+        "account_role_ccAsset": "Credit card",
+        "account_role_cashWalletAsset": "Cash wallet"
    }
 }
--- a/public/v2/i18n/en_GB.json
+++ b/public/v2/i18n/en_GB.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "en-gb",
        "date_time_fns": "MMMM do, yyyy @ HH:mm:ss",
+        "month_and_day_fns": "MMMM d, y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "Spent",
        "left": "Left",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "Debt",
        "account_type_Loan": "Loan",
-        "account_type_Mortgage": "Mortgage"
+        "account_type_Mortgage": "Mortgage",
+        "account_role_defaultAsset": "Default asset account",
+        "account_role_sharedAsset": "Shared asset account",
+        "account_role_savingAsset": "Savings account",
+        "account_role_ccAsset": "Credit card",
+        "account_role_cashWalletAsset": "Cash wallet"
    }
 }
--- a/public/v2/i18n/en_US.json
+++ b/public/v2/i18n/en_US.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "en",
        "date_time_fns": "MMMM do, yyyy @ HH:mm:ss",
+        "month_and_day_fns": "MMMM d, y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "Spent",
        "left": "Left",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "Debt",
        "account_type_Loan": "Loan",
-        "account_type_Mortgage": "Mortgage"
+        "account_type_Mortgage": "Mortgage",
+        "account_role_defaultAsset": "Default asset account",
+        "account_role_sharedAsset": "Shared asset account",
+        "account_role_savingAsset": "Savings account",
+        "account_role_ccAsset": "Credit card",
+        "account_role_cashWalletAsset": "Cash wallet"
    }
 }
--- a/public/v2/i18n/es.json
+++ b/public/v2/i18n/es.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "es",
        "date_time_fns": "El MMMM hacer, yyyy a las HH:mm:ss",
+        "month_and_day_fns": "d MMMM y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III no puede determinar el tipo de transacci\u00f3n basado en esta cuenta de origen.",
+        "bad_type_destination": "Firefly III no puede determinar el tipo de transacci\u00f3n basado en esta cuenta de destino."
+    },
    "firefly": {
        "spent": "Gastado",
        "left": "Disponible",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Cuenta de ingresos",
        "account_type_Debt": "Deuda",
        "account_type_Loan": "Pr\u00e9stamo",
-        "account_type_Mortgage": "Hipoteca"
+        "account_type_Mortgage": "Hipoteca",
+        "account_role_defaultAsset": "Cuentas de ingresos por defecto",
+        "account_role_sharedAsset": "Cuenta de ingresos compartida",
+        "account_role_savingAsset": "Cuentas de ahorros",
+        "account_role_ccAsset": "Tarjeta de Cr\u00e9dito",
+        "account_role_cashWalletAsset": "Billetera de efectivo"
    }
 }
--- a/public/v2/i18n/es_ES.json
+++ b/public/v2/i18n/es_ES.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "es",
        "date_time_fns": "El MMMM hacer, yyyy a las HH:mm:ss",
+        "month_and_day_fns": "d MMMM y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III no puede determinar el tipo de transacci\u00f3n basado en esta cuenta de origen.",
+        "bad_type_destination": "Firefly III no puede determinar el tipo de transacci\u00f3n basado en esta cuenta de destino."
+    },
    "firefly": {
        "spent": "Gastado",
        "left": "Disponible",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Cuenta de ingresos",
        "account_type_Debt": "Deuda",
        "account_type_Loan": "Pr\u00e9stamo",
-        "account_type_Mortgage": "Hipoteca"
+        "account_type_Mortgage": "Hipoteca",
+        "account_role_defaultAsset": "Cuentas de ingresos por defecto",
+        "account_role_sharedAsset": "Cuenta de ingresos compartida",
+        "account_role_savingAsset": "Cuentas de ahorros",
+        "account_role_ccAsset": "Tarjeta de Cr\u00e9dito",
+        "account_role_cashWalletAsset": "Billetera de efectivo"
    }
 }
--- a/public/v2/i18n/fi.json
+++ b/public/v2/i18n/fi.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "fi",
        "date_time_fns": "MMMM do, yyyy @ HH:mm:ss",
+        "month_and_day_fns": "MMMM d, y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "K\u00e4ytetty",
        "left": "J\u00e4ljell\u00e4",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "Velka",
        "account_type_Loan": "Laina",
-        "account_type_Mortgage": "Kiinnelaina"
+        "account_type_Mortgage": "Kiinnelaina",
+        "account_role_defaultAsset": "Oletusk\u00e4ytt\u00f6tili",
+        "account_role_sharedAsset": "Jaettu k\u00e4ytt\u00f6tili",
+        "account_role_savingAsset": "S\u00e4\u00e4st\u00f6tili",
+        "account_role_ccAsset": "Luottokortti",
+        "account_role_cashWalletAsset": "K\u00e4teinen"
    }
 }
--- a/public/v2/i18n/fi_FI.json
+++ b/public/v2/i18n/fi_FI.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "fi",
        "date_time_fns": "MMMM do, yyyy @ HH:mm:ss",
+        "month_and_day_fns": "MMMM d, y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "K\u00e4ytetty",
        "left": "J\u00e4ljell\u00e4",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "Velka",
        "account_type_Loan": "Laina",
-        "account_type_Mortgage": "Kiinnelaina"
+        "account_type_Mortgage": "Kiinnelaina",
+        "account_role_defaultAsset": "Oletusk\u00e4ytt\u00f6tili",
+        "account_role_sharedAsset": "Jaettu k\u00e4ytt\u00f6tili",
+        "account_role_savingAsset": "S\u00e4\u00e4st\u00f6tili",
+        "account_role_ccAsset": "Luottokortti",
+        "account_role_cashWalletAsset": "K\u00e4teinen"
    }
 }
--- a/public/v2/i18n/fr.json
+++ b/public/v2/i18n/fr.json
@@ -2,13 +2,18 @@
    "config": {
        "html_language": "fr",
        "date_time_fns": "do MMMM, yyyy @ HH:mm:ss",
+        "month_and_day_fns": "d MMMM y",
        "date_time_fns_short": "do MMMM, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III ne peut pas d\u00e9terminer le type de transaction bas\u00e9 sur ce compte source.",
+        "bad_type_destination": "Firefly III ne peut pas d\u00e9terminer le type de transaction bas\u00e9 sur ce compte de destination."
+    },
    "firefly": {
        "spent": "D\u00e9pens\u00e9",
        "left": "Reste",
        "paid": "Pay\u00e9",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
+        "errors_submission_v2": "Certaines informations ne sont pas correctes dans votre formulaire. Veuillez v\u00e9rifier les erreurs ci-dessous : {{errorMessage}}",
        "unpaid": "Impay\u00e9",
        "default_group_title_name_plain": "non group\u00e9",
        "subscriptions_in_group": "Abonnements dans le groupe \"%{title}\"",
@@ -23,7 +28,7 @@
        "unknown_dest_plain": "Compte de destination inconnu",
        "unknown_any_plain": "Compte inconnu",
        "unknown_budget_plain": "Pas de budget",
-        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
+        "stored_journal_js": "Op\u00e9ration \"{{description}}\" cr\u00e9\u00e9e avec succ\u00e8s",
        "wait_loading_transaction": "Veuillez patienter pendant le chargement du formulaire",
        "nothing_found": "(aucun r\u00e9sultat)",
        "wait_loading_data": "Veuillez attendre que vos informations soient charg\u00e9es...",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Compte de recettes",
        "account_type_Debt": "Dette",
        "account_type_Loan": "Pr\u00eat",
-        "account_type_Mortgage": "Pr\u00eat hypoth\u00e9caire"
+        "account_type_Mortgage": "Pr\u00eat hypoth\u00e9caire",
+        "account_role_defaultAsset": "Compte d'actif par d\u00e9faut",
+        "account_role_sharedAsset": "Compte d'actif partag\u00e9",
+        "account_role_savingAsset": "Compte d\u2019\u00e9pargne",
+        "account_role_ccAsset": "Carte de cr\u00e9dit",
+        "account_role_cashWalletAsset": "Porte-monnaie"
    }
 }
--- a/public/v2/i18n/fr_FR.json
+++ b/public/v2/i18n/fr_FR.json
@@ -2,13 +2,18 @@
    "config": {
        "html_language": "fr",
        "date_time_fns": "do MMMM, yyyy @ HH:mm:ss",
+        "month_and_day_fns": "d MMMM y",
        "date_time_fns_short": "do MMMM, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III ne peut pas d\u00e9terminer le type de transaction bas\u00e9 sur ce compte source.",
+        "bad_type_destination": "Firefly III ne peut pas d\u00e9terminer le type de transaction bas\u00e9 sur ce compte de destination."
+    },
    "firefly": {
        "spent": "D\u00e9pens\u00e9",
        "left": "Reste",
        "paid": "Pay\u00e9",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
+        "errors_submission_v2": "Certaines informations ne sont pas correctes dans votre formulaire. Veuillez v\u00e9rifier les erreurs ci-dessous : {{errorMessage}}",
        "unpaid": "Impay\u00e9",
        "default_group_title_name_plain": "non group\u00e9",
        "subscriptions_in_group": "Abonnements dans le groupe \"%{title}\"",
@@ -23,7 +28,7 @@
        "unknown_dest_plain": "Compte de destination inconnu",
        "unknown_any_plain": "Compte inconnu",
        "unknown_budget_plain": "Pas de budget",
-        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
+        "stored_journal_js": "Op\u00e9ration \"{{description}}\" cr\u00e9\u00e9e avec succ\u00e8s",
        "wait_loading_transaction": "Veuillez patienter pendant le chargement du formulaire",
        "nothing_found": "(aucun r\u00e9sultat)",
        "wait_loading_data": "Veuillez attendre que vos informations soient charg\u00e9es...",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Compte de recettes",
        "account_type_Debt": "Dette",
        "account_type_Loan": "Pr\u00eat",
-        "account_type_Mortgage": "Pr\u00eat hypoth\u00e9caire"
+        "account_type_Mortgage": "Pr\u00eat hypoth\u00e9caire",
+        "account_role_defaultAsset": "Compte d'actif par d\u00e9faut",
+        "account_role_sharedAsset": "Compte d'actif partag\u00e9",
+        "account_role_savingAsset": "Compte d\u2019\u00e9pargne",
+        "account_role_ccAsset": "Carte de cr\u00e9dit",
+        "account_role_cashWalletAsset": "Porte-monnaie"
    }
 }
--- a/public/v2/i18n/hu.json
+++ b/public/v2/i18n/hu.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "hu",
        "date_time_fns": "MMMM do, yyyy @ HH:mm:ss",
+        "month_and_day_fns": "MMMM d, y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "A Firefly III nem tudja eld\u00f6nteni a tranzakci\u00f3 t\u00edpus\u00e1t a forr\u00e1ssz\u00e1mla alapj\u00e1n.",
+        "bad_type_destination": "A Firefly III nem tudja eld\u00f6nteni a tranzakci\u00f3 t\u00edpus\u00e1t a c\u00e9lsz\u00e1mla alapj\u00e1n."
+    },
    "firefly": {
        "spent": "Elk\u00f6lt\u00f6tt",
        "left": "Maradv\u00e1ny",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "Ad\u00f3ss\u00e1g",
        "account_type_Loan": "Hitel",
-        "account_type_Mortgage": "Jelz\u00e1log"
+        "account_type_Mortgage": "Jelz\u00e1log",
+        "account_role_defaultAsset": "Alap\u00e9rtelmezett eszk\u00f6zsz\u00e1mla",
+        "account_role_sharedAsset": "Megosztott eszk\u00f6zsz\u00e1mla",
+        "account_role_savingAsset": "Megtakar\u00edt\u00e1si sz\u00e1mla",
+        "account_role_ccAsset": "Hitelk\u00e1rtya",
+        "account_role_cashWalletAsset": "K\u00e9szp\u00e9nz"
    }
 }
--- a/public/v2/i18n/hu_HU.json
+++ b/public/v2/i18n/hu_HU.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "hu",
        "date_time_fns": "MMMM do, yyyy @ HH:mm:ss",
+        "month_and_day_fns": "MMMM d, y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "A Firefly III nem tudja eld\u00f6nteni a tranzakci\u00f3 t\u00edpus\u00e1t a forr\u00e1ssz\u00e1mla alapj\u00e1n.",
+        "bad_type_destination": "A Firefly III nem tudja eld\u00f6nteni a tranzakci\u00f3 t\u00edpus\u00e1t a c\u00e9lsz\u00e1mla alapj\u00e1n."
+    },
    "firefly": {
        "spent": "Elk\u00f6lt\u00f6tt",
        "left": "Maradv\u00e1ny",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "Ad\u00f3ss\u00e1g",
        "account_type_Loan": "Hitel",
-        "account_type_Mortgage": "Jelz\u00e1log"
+        "account_type_Mortgage": "Jelz\u00e1log",
+        "account_role_defaultAsset": "Alap\u00e9rtelmezett eszk\u00f6zsz\u00e1mla",
+        "account_role_sharedAsset": "Megosztott eszk\u00f6zsz\u00e1mla",
+        "account_role_savingAsset": "Megtakar\u00edt\u00e1si sz\u00e1mla",
+        "account_role_ccAsset": "Hitelk\u00e1rtya",
+        "account_role_cashWalletAsset": "K\u00e9szp\u00e9nz"
    }
 }
--- a/public/v2/i18n/id.json
+++ b/public/v2/i18n/id.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "id",
        "date_time_fns": "do MMMM yyyy @ HH:mm:ss",
+        "month_and_day_fns": "d MMMM, y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "Menghabiskan",
        "left": "Kiri",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "Debt",
        "account_type_Loan": "Loan",
-        "account_type_Mortgage": "Mortgage"
+        "account_type_Mortgage": "Mortgage",
+        "account_role_defaultAsset": "Akun aset standar",
+        "account_role_sharedAsset": "Akun aset bersama",
+        "account_role_savingAsset": "Rekening tabungan",
+        "account_role_ccAsset": "Kartu kredit",
+        "account_role_cashWalletAsset": "Cash wallet"
    }
 }
--- a/public/v2/i18n/id_ID.json
+++ b/public/v2/i18n/id_ID.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "id",
        "date_time_fns": "do MMMM yyyy @ HH:mm:ss",
+        "month_and_day_fns": "d MMMM, y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "Menghabiskan",
        "left": "Kiri",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "Debt",
        "account_type_Loan": "Loan",
-        "account_type_Mortgage": "Mortgage"
+        "account_type_Mortgage": "Mortgage",
+        "account_role_defaultAsset": "Akun aset standar",
+        "account_role_sharedAsset": "Akun aset bersama",
+        "account_role_savingAsset": "Rekening tabungan",
+        "account_role_ccAsset": "Kartu kredit",
+        "account_role_cashWalletAsset": "Cash wallet"
    }
 }
--- a/public/v2/i18n/it.json
+++ b/public/v2/i18n/it.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "it",
        "date_time_fns": "do MMMM yyyy @ HH:mm:ss",
+        "month_and_day_fns": "d MMMM y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III non pu\u00f2 determinare il tipo di transazione in base a questo account sorgente.",
+        "bad_type_destination": "Firefly III non pu\u00f2 determinare il tipo di transazione in base a questo account di destinazione."
+    },
    "firefly": {
        "spent": "Speso",
        "left": "Resto",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Conto di entrate",
        "account_type_Debt": "Debito",
        "account_type_Loan": "Prestito",
-        "account_type_Mortgage": "Mutuo"
+        "account_type_Mortgage": "Mutuo",
+        "account_role_defaultAsset": "Conto attivit\u00e0 predefinito",
+        "account_role_sharedAsset": "Conto attivit\u00e0 condiviso",
+        "account_role_savingAsset": "Conto risparmio",
+        "account_role_ccAsset": "Carta di credito",
+        "account_role_cashWalletAsset": "Portafoglio"
    }
 }
--- a/public/v2/i18n/it_IT.json
+++ b/public/v2/i18n/it_IT.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "it",
        "date_time_fns": "do MMMM yyyy @ HH:mm:ss",
+        "month_and_day_fns": "d MMMM y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III non pu\u00f2 determinare il tipo di transazione in base a questo account sorgente.",
+        "bad_type_destination": "Firefly III non pu\u00f2 determinare il tipo di transazione in base a questo account di destinazione."
+    },
    "firefly": {
        "spent": "Speso",
        "left": "Resto",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Conto di entrate",
        "account_type_Debt": "Debito",
        "account_type_Loan": "Prestito",
-        "account_type_Mortgage": "Mutuo"
+        "account_type_Mortgage": "Mutuo",
+        "account_role_defaultAsset": "Conto attivit\u00e0 predefinito",
+        "account_role_sharedAsset": "Conto attivit\u00e0 condiviso",
+        "account_role_savingAsset": "Conto risparmio",
+        "account_role_ccAsset": "Carta di credito",
+        "account_role_cashWalletAsset": "Portafoglio"
    }
 }
--- a/public/v2/i18n/ja.json
+++ b/public/v2/i18n/ja.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "ja",
        "date_time_fns": "yyyy\u5e74MMMM\u6708do\u65e5 HH:mm:ss",
+        "month_and_day_fns": "y\u5e74 MMMM d\u65e5",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "\u652f\u51fa",
        "left": "\u6b8b\u308a",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "\u53ce\u5165\u53e3\u5ea7",
        "account_type_Debt": "\u501f\u91d1",
        "account_type_Loan": "\u30ed\u30fc\u30f3",
-        "account_type_Mortgage": "\u4f4f\u5b85\u30ed\u30fc\u30f3"
+        "account_type_Mortgage": "\u4f4f\u5b85\u30ed\u30fc\u30f3",
+        "account_role_defaultAsset": "\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u8cc7\u7523\u53e3\u5ea7",
+        "account_role_sharedAsset": "\u5171\u6709\u8cc7\u7523\u53e3\u5ea7",
+        "account_role_savingAsset": "\u8caf\u84c4\u53e3\u5ea7",
+        "account_role_ccAsset": "\u30af\u30ec\u30b8\u30c3\u30c8\u30ab\u30fc\u30c9",
+        "account_role_cashWalletAsset": "\u73fe\u91d1"
    }
 }
--- a/public/v2/i18n/ja_JP.json
+++ b/public/v2/i18n/ja_JP.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "ja",
        "date_time_fns": "yyyy\u5e74MMMM\u6708do\u65e5 HH:mm:ss",
+        "month_and_day_fns": "y\u5e74 MMMM d\u65e5",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "\u652f\u51fa",
        "left": "\u6b8b\u308a",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "\u53ce\u5165\u53e3\u5ea7",
        "account_type_Debt": "\u501f\u91d1",
        "account_type_Loan": "\u30ed\u30fc\u30f3",
-        "account_type_Mortgage": "\u4f4f\u5b85\u30ed\u30fc\u30f3"
+        "account_type_Mortgage": "\u4f4f\u5b85\u30ed\u30fc\u30f3",
+        "account_role_defaultAsset": "\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u8cc7\u7523\u53e3\u5ea7",
+        "account_role_sharedAsset": "\u5171\u6709\u8cc7\u7523\u53e3\u5ea7",
+        "account_role_savingAsset": "\u8caf\u84c4\u53e3\u5ea7",
+        "account_role_ccAsset": "\u30af\u30ec\u30b8\u30c3\u30c8\u30ab\u30fc\u30c9",
+        "account_role_cashWalletAsset": "\u73fe\u91d1"
    }
 }
--- a/public/v2/i18n/ko.json
+++ b/public/v2/i18n/ko.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "ko",
        "date_time_fns": "YYYY\ub144 M\uc6d4 D\uc77c HH:mm:ss",
+        "month_and_day_fns": "y\ub144 MMMM d\uc77c",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "\uc9c0\ucd9c",
        "left": "\ub0a8\uc74c",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "\ub300\ucd9c",
        "account_type_Loan": "\ube5a",
-        "account_type_Mortgage": "\ubaa8\uae30\uc9c0"
+        "account_type_Mortgage": "\ubaa8\uae30\uc9c0",
+        "account_role_defaultAsset": "\uae30\ubcf8 \uc790\uc0b0 \uacc4\uc815",
+        "account_role_sharedAsset": "\uacf5\uc720 \uc790\uc0b0 \uacc4\uc815",
+        "account_role_savingAsset": "\uc608\uae08 \uacc4\uc88c",
+        "account_role_ccAsset": "\uc2e0\uc6a9\uce74\ub4dc",
+        "account_role_cashWalletAsset": "\ud604\uae08 \uc9c0\uac11"
    }
 }
--- a/public/v2/i18n/ko_KR.json
+++ b/public/v2/i18n/ko_KR.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "ko",
        "date_time_fns": "YYYY\ub144 M\uc6d4 D\uc77c HH:mm:ss",
+        "month_and_day_fns": "y\ub144 MMMM d\uc77c",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "\uc9c0\ucd9c",
        "left": "\ub0a8\uc74c",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "\ub300\ucd9c",
        "account_type_Loan": "\ube5a",
-        "account_type_Mortgage": "\ubaa8\uae30\uc9c0"
+        "account_type_Mortgage": "\ubaa8\uae30\uc9c0",
+        "account_role_defaultAsset": "\uae30\ubcf8 \uc790\uc0b0 \uacc4\uc815",
+        "account_role_sharedAsset": "\uacf5\uc720 \uc790\uc0b0 \uacc4\uc815",
+        "account_role_savingAsset": "\uc608\uae08 \uacc4\uc88c",
+        "account_role_ccAsset": "\uc2e0\uc6a9\uce74\ub4dc",
+        "account_role_cashWalletAsset": "\ud604\uae08 \uc9c0\uac11"
    }
 }
--- a/public/v2/i18n/nb.json
+++ b/public/v2/i18n/nb.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "nb",
        "date_time_fns": "do MMMM, yyyy @ HH:mm:ss",
+        "month_and_day_fns": "MMMM d, y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "Brukt",
        "left": "Gjenv\u00e6rende",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Inntektskonto",
        "account_type_Debt": "Gjeld",
        "account_type_Loan": "L\u00e5n",
-        "account_type_Mortgage": "Boligl\u00e5n"
+        "account_type_Mortgage": "Boligl\u00e5n",
+        "account_role_defaultAsset": "Standard aktivakonto",
+        "account_role_sharedAsset": "Delt aktivakonto",
+        "account_role_savingAsset": "Sparekonto",
+        "account_role_ccAsset": "Kredittkort",
+        "account_role_cashWalletAsset": "Kontant lommebok"
    }
 }
--- a/public/v2/i18n/nb_NO.json
+++ b/public/v2/i18n/nb_NO.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "nb",
        "date_time_fns": "do MMMM, yyyy @ HH:mm:ss",
+        "month_and_day_fns": "MMMM d, y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "Brukt",
        "left": "Gjenv\u00e6rende",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Inntektskonto",
        "account_type_Debt": "Gjeld",
        "account_type_Loan": "L\u00e5n",
-        "account_type_Mortgage": "Boligl\u00e5n"
+        "account_type_Mortgage": "Boligl\u00e5n",
+        "account_role_defaultAsset": "Standard aktivakonto",
+        "account_role_sharedAsset": "Delt aktivakonto",
+        "account_role_savingAsset": "Sparekonto",
+        "account_role_ccAsset": "Kredittkort",
+        "account_role_cashWalletAsset": "Kontant lommebok"
    }
 }
--- a/public/v2/i18n/nl.json
+++ b/public/v2/i18n/nl.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "nl",
        "date_time_fns": "d MMMM yyyy @ HH:mm:ss",
+        "month_and_day_fns": "d MMMM y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III kan het transactietype niet bepalen op basis van deze bronrekening.",
+        "bad_type_destination": "Firefly III kan het transactietype niet bepalen op basis van deze doelrekening."
+    },
    "firefly": {
        "spent": "Uitgegeven",
        "left": "Over",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Debiteur",
        "account_type_Debt": "Schuld",
        "account_type_Loan": "Lening",
-        "account_type_Mortgage": "Hypotheek"
+        "account_type_Mortgage": "Hypotheek",
+        "account_role_defaultAsset": "Standaard betaalrekening",
+        "account_role_sharedAsset": "Gedeelde betaalrekening",
+        "account_role_savingAsset": "Spaarrekening",
+        "account_role_ccAsset": "Credit card",
+        "account_role_cashWalletAsset": "Cash"
    }
 }
--- a/public/v2/i18n/nl_NL.json
+++ b/public/v2/i18n/nl_NL.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "nl",
        "date_time_fns": "d MMMM yyyy @ HH:mm:ss",
+        "month_and_day_fns": "d MMMM y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III kan het transactietype niet bepalen op basis van deze bronrekening.",
+        "bad_type_destination": "Firefly III kan het transactietype niet bepalen op basis van deze doelrekening."
+    },
    "firefly": {
        "spent": "Uitgegeven",
        "left": "Over",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Debiteur",
        "account_type_Debt": "Schuld",
        "account_type_Loan": "Lening",
-        "account_type_Mortgage": "Hypotheek"
+        "account_type_Mortgage": "Hypotheek",
+        "account_role_defaultAsset": "Standaard betaalrekening",
+        "account_role_sharedAsset": "Gedeelde betaalrekening",
+        "account_role_savingAsset": "Spaarrekening",
+        "account_role_ccAsset": "Credit card",
+        "account_role_cashWalletAsset": "Cash"
    }
 }
--- a/public/v2/i18n/nn.json
+++ b/public/v2/i18n/nn.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "nn",
        "date_time_fns": "do MMMM, yyyy @ HH:mm:ss",
+        "month_and_day_fns": "MMMM d, y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "Brukt",
        "left": "Att",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "Gjeld",
        "account_type_Loan": "L\u00e5n",
-        "account_type_Mortgage": "Boligl\u00e5n"
+        "account_type_Mortgage": "Boligl\u00e5n",
+        "account_role_defaultAsset": "Standard aktivakonto",
+        "account_role_sharedAsset": "Delt aktivakonto",
+        "account_role_savingAsset": "Sparekonto",
+        "account_role_ccAsset": "Kredittkort",
+        "account_role_cashWalletAsset": "Kontant lommebok"
    }
 }
--- a/public/v2/i18n/nn_NO.json
+++ b/public/v2/i18n/nn_NO.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "nn",
        "date_time_fns": "do MMMM, yyyy @ HH:mm:ss",
+        "month_and_day_fns": "MMMM d, y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "Brukt",
        "left": "Att",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "Gjeld",
        "account_type_Loan": "L\u00e5n",
-        "account_type_Mortgage": "Boligl\u00e5n"
+        "account_type_Mortgage": "Boligl\u00e5n",
+        "account_role_defaultAsset": "Standard aktivakonto",
+        "account_role_sharedAsset": "Delt aktivakonto",
+        "account_role_savingAsset": "Sparekonto",
+        "account_role_ccAsset": "Kredittkort",
+        "account_role_cashWalletAsset": "Kontant lommebok"
    }
 }
--- a/public/v2/i18n/pl.json
+++ b/public/v2/i18n/pl.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "pl",
        "date_time_fns": "do MMMM yyyy @ HH:mm:ss",
+        "month_and_day_fns": "d MMMM y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "Wydano",
        "left": "Pozosta\u0142o",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Konto przychod\u00f3w",
        "account_type_Debt": "D\u0142ug",
        "account_type_Loan": "Po\u017cyczka",
-        "account_type_Mortgage": "Hipoteka"
+        "account_type_Mortgage": "Hipoteka",
+        "account_role_defaultAsset": "Domy\u015blne konto aktyw\u00f3w",
+        "account_role_sharedAsset": "Wsp\u00f3\u0142dzielone konto aktyw\u00f3w",
+        "account_role_savingAsset": "Konto oszcz\u0119dno\u015bciowe",
+        "account_role_ccAsset": "Karta kredytowa",
+        "account_role_cashWalletAsset": "Portfel got\u00f3wkowy"
    }
 }
--- a/public/v2/i18n/pl_PL.json
+++ b/public/v2/i18n/pl_PL.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "pl",
        "date_time_fns": "do MMMM yyyy @ HH:mm:ss",
+        "month_and_day_fns": "d MMMM y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "Wydano",
        "left": "Pozosta\u0142o",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Konto przychod\u00f3w",
        "account_type_Debt": "D\u0142ug",
        "account_type_Loan": "Po\u017cyczka",
-        "account_type_Mortgage": "Hipoteka"
+        "account_type_Mortgage": "Hipoteka",
+        "account_role_defaultAsset": "Domy\u015blne konto aktyw\u00f3w",
+        "account_role_sharedAsset": "Wsp\u00f3\u0142dzielone konto aktyw\u00f3w",
+        "account_role_savingAsset": "Konto oszcz\u0119dno\u015bciowe",
+        "account_role_ccAsset": "Karta kredytowa",
+        "account_role_cashWalletAsset": "Portfel got\u00f3wkowy"
    }
 }
--- a/public/v2/i18n/pt-br.json
+++ b/public/v2/i18n/pt-br.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "pt-br",
        "date_time_fns": "dd 'de' MMMM 'de' yyyy, '\u00e0s' HH:mm:ss",
+        "month_and_day_fns": "d [de] MMMM [de] y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III n\u00e3o conseguiu determinar o tipo de transa\u00e7\u00e3o baseado nesta conta de origem.",
+        "bad_type_destination": "Firefly III n\u00e3o conseguiu determinar o tipo de transa\u00e7\u00e3o baseado nesta conta destino."
+    },
    "firefly": {
        "spent": "Gasto",
        "left": "Restante",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Conta de receitas",
        "account_type_Debt": "D\u00edvida",
        "account_type_Loan": "Empr\u00e9stimo",
-        "account_type_Mortgage": "Hipoteca"
+        "account_type_Mortgage": "Hipoteca",
+        "account_role_defaultAsset": "Conta padr\u00e3o",
+        "account_role_sharedAsset": "Contas de ativos compartilhadas",
+        "account_role_savingAsset": "Conta poupan\u00e7a",
+        "account_role_ccAsset": "Cart\u00e3o de cr\u00e9dito",
+        "account_role_cashWalletAsset": "Carteira de dinheiro"
    }
 }
--- a/public/v2/i18n/pt.json
+++ b/public/v2/i18n/pt.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "pt",
        "date_time_fns": "DO [de] MMMM YYYY, @ HH:mm:ss",
+        "month_and_day_fns": "d MMMM y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "O Firefly III n\u00e3o consegue determinar o tipo de transa\u00e7\u00e3o baseado nesta conta de origem.",
+        "bad_type_destination": "O Firefly III n\u00e3o consegue determinar o tipo de transa\u00e7\u00e3o baseado nesta conta de destino."
+    },
    "firefly": {
        "spent": "Gasto",
        "left": "Em falta",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Conta de receitas",
        "account_type_Debt": "D\u00edvida",
        "account_type_Loan": "Empr\u00e9stimo",
-        "account_type_Mortgage": "Hipoteca"
+        "account_type_Mortgage": "Hipoteca",
+        "account_role_defaultAsset": "Conta de ativos predefinida",
+        "account_role_sharedAsset": "Conta de ativos partilhados",
+        "account_role_savingAsset": "Conta poupan\u00e7a",
+        "account_role_ccAsset": "Cart\u00e3o de cr\u00e9dito",
+        "account_role_cashWalletAsset": "Carteira de dinheiro"
    }
 }
--- a/public/v2/i18n/pt_BR.json
+++ b/public/v2/i18n/pt_BR.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "pt-br",
        "date_time_fns": "dd 'de' MMMM 'de' yyyy, '\u00e0s' HH:mm:ss",
+        "month_and_day_fns": "d [de] MMMM [de] y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III n\u00e3o conseguiu determinar o tipo de transa\u00e7\u00e3o baseado nesta conta de origem.",
+        "bad_type_destination": "Firefly III n\u00e3o conseguiu determinar o tipo de transa\u00e7\u00e3o baseado nesta conta destino."
+    },
    "firefly": {
        "spent": "Gasto",
        "left": "Restante",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Conta de receitas",
        "account_type_Debt": "D\u00edvida",
        "account_type_Loan": "Empr\u00e9stimo",
-        "account_type_Mortgage": "Hipoteca"
+        "account_type_Mortgage": "Hipoteca",
+        "account_role_defaultAsset": "Conta padr\u00e3o",
+        "account_role_sharedAsset": "Contas de ativos compartilhadas",
+        "account_role_savingAsset": "Conta poupan\u00e7a",
+        "account_role_ccAsset": "Cart\u00e3o de cr\u00e9dito",
+        "account_role_cashWalletAsset": "Carteira de dinheiro"
    }
 }
--- a/public/v2/i18n/pt_PT.json
+++ b/public/v2/i18n/pt_PT.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "pt",
        "date_time_fns": "DO [de] MMMM YYYY, @ HH:mm:ss",
+        "month_and_day_fns": "d MMMM y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "O Firefly III n\u00e3o consegue determinar o tipo de transa\u00e7\u00e3o baseado nesta conta de origem.",
+        "bad_type_destination": "O Firefly III n\u00e3o consegue determinar o tipo de transa\u00e7\u00e3o baseado nesta conta de destino."
+    },
    "firefly": {
        "spent": "Gasto",
        "left": "Em falta",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Conta de receitas",
        "account_type_Debt": "D\u00edvida",
        "account_type_Loan": "Empr\u00e9stimo",
-        "account_type_Mortgage": "Hipoteca"
+        "account_type_Mortgage": "Hipoteca",
+        "account_role_defaultAsset": "Conta de ativos predefinida",
+        "account_role_sharedAsset": "Conta de ativos partilhados",
+        "account_role_savingAsset": "Conta poupan\u00e7a",
+        "account_role_ccAsset": "Cart\u00e3o de cr\u00e9dito",
+        "account_role_cashWalletAsset": "Carteira de dinheiro"
    }
 }
--- a/public/v2/i18n/ro.json
+++ b/public/v2/i18n/ro.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "ro",
        "date_time_fns": "MMMM do yyy @ HH:mm:ss",
+        "month_and_day_fns": "MMMM d, y",
        "date_time_fns_short": "MMMM do yyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III nu poate determina tipul de tranzac\u021bie pe baza acestui cont surs\u0103.",
+        "bad_type_destination": "Firefly III nu poate determina tipul de tranzac\u021bie bazat pe acest cont de destina\u021bie."
+    },
    "firefly": {
        "spent": "Cheltuit",
        "left": "R\u0103mas",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Cont de venituri",
        "account_type_Debt": "Datorie",
        "account_type_Loan": "\u00cemprumut",
-        "account_type_Mortgage": "Credit ipotecar"
+        "account_type_Mortgage": "Credit ipotecar",
+        "account_role_defaultAsset": "Contul implicit activ",
+        "account_role_sharedAsset": "Contul de active partajat",
+        "account_role_savingAsset": "Cont de economii",
+        "account_role_ccAsset": "Card de credit",
+        "account_role_cashWalletAsset": "Cash - Numerar"
    }
 }
--- a/public/v2/i18n/ro_RO.json
+++ b/public/v2/i18n/ro_RO.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "ro",
        "date_time_fns": "MMMM do yyy @ HH:mm:ss",
+        "month_and_day_fns": "MMMM d, y",
        "date_time_fns_short": "MMMM do yyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III nu poate determina tipul de tranzac\u021bie pe baza acestui cont surs\u0103.",
+        "bad_type_destination": "Firefly III nu poate determina tipul de tranzac\u021bie bazat pe acest cont de destina\u021bie."
+    },
    "firefly": {
        "spent": "Cheltuit",
        "left": "R\u0103mas",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Cont de venituri",
        "account_type_Debt": "Datorie",
        "account_type_Loan": "\u00cemprumut",
-        "account_type_Mortgage": "Credit ipotecar"
+        "account_type_Mortgage": "Credit ipotecar",
+        "account_role_defaultAsset": "Contul implicit activ",
+        "account_role_sharedAsset": "Contul de active partajat",
+        "account_role_savingAsset": "Cont de economii",
+        "account_role_ccAsset": "Card de credit",
+        "account_role_cashWalletAsset": "Cash - Numerar"
    }
 }
--- a/public/v2/i18n/ru.json
+++ b/public/v2/i18n/ru.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "ru",
        "date_time_fns": "Do MMMM yyyy, @ HH:mm:ss",
+        "month_and_day_fns": "D MMMM YYYY",
        "date_time_fns_short": "Do MMMM YYYY \u0432 HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0438\u0442\u044c \u0442\u0438\u043f \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438 \u043d\u0430 \u043e\u0441\u043d\u043e\u0432\u0435 \u044d\u0442\u043e\u0433\u043e \u0438\u0441\u0445\u043e\u0434\u043d\u043e\u0433\u043e \u0441\u0447\u0435\u0442\u0430.",
+        "bad_type_destination": "Firefly III \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0438\u0442\u044c \u0442\u0438\u043f \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438 \u043d\u0430 \u043e\u0441\u043d\u043e\u0432\u0435 \u044d\u0442\u043e\u0433\u043e \u0441\u0447\u0435\u0442\u0430."
+    },
    "firefly": {
        "spent": "\u0420\u0430\u0441\u0445\u043e\u0434",
        "left": "\u041e\u0441\u0442\u0430\u043b\u043e\u0441\u044c",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "\u0421\u0447\u0435\u0442 \u0434\u043e\u0445\u043e\u0434\u043e\u0432",
        "account_type_Debt": "\u0414\u0435\u0431\u0438\u0442",
        "account_type_Loan": "\u0417\u0430\u0451\u043c",
-        "account_type_Mortgage": "\u0418\u043f\u043e\u0442\u0435\u043a\u0430"
+        "account_type_Mortgage": "\u0418\u043f\u043e\u0442\u0435\u043a\u0430",
+        "account_role_defaultAsset": "\u0421\u0447\u0451\u0442 \u043f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e",
+        "account_role_sharedAsset": "\u041e\u0431\u0449\u0438\u0439 \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0439 \u0441\u0447\u0451\u0442",
+        "account_role_savingAsset": "\u0421\u0431\u0435\u0440\u0435\u0433\u0430\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u0441\u0447\u0435\u0442",
+        "account_role_ccAsset": "\u041a\u0440\u0435\u0434\u0438\u0442\u043d\u0430\u044f \u043a\u0430\u0440\u0442\u0430",
+        "account_role_cashWalletAsset": "\u041d\u0430\u043b\u0438\u0447\u043d\u044b\u0435"
    }
 }
--- a/public/v2/i18n/ru_RU.json
+++ b/public/v2/i18n/ru_RU.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "ru",
        "date_time_fns": "Do MMMM yyyy, @ HH:mm:ss",
+        "month_and_day_fns": "D MMMM YYYY",
        "date_time_fns_short": "Do MMMM YYYY \u0432 HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0438\u0442\u044c \u0442\u0438\u043f \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438 \u043d\u0430 \u043e\u0441\u043d\u043e\u0432\u0435 \u044d\u0442\u043e\u0433\u043e \u0438\u0441\u0445\u043e\u0434\u043d\u043e\u0433\u043e \u0441\u0447\u0435\u0442\u0430.",
+        "bad_type_destination": "Firefly III \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0438\u0442\u044c \u0442\u0438\u043f \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438 \u043d\u0430 \u043e\u0441\u043d\u043e\u0432\u0435 \u044d\u0442\u043e\u0433\u043e \u0441\u0447\u0435\u0442\u0430."
+    },
    "firefly": {
        "spent": "\u0420\u0430\u0441\u0445\u043e\u0434",
        "left": "\u041e\u0441\u0442\u0430\u043b\u043e\u0441\u044c",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "\u0421\u0447\u0435\u0442 \u0434\u043e\u0445\u043e\u0434\u043e\u0432",
        "account_type_Debt": "\u0414\u0435\u0431\u0438\u0442",
        "account_type_Loan": "\u0417\u0430\u0451\u043c",
-        "account_type_Mortgage": "\u0418\u043f\u043e\u0442\u0435\u043a\u0430"
+        "account_type_Mortgage": "\u0418\u043f\u043e\u0442\u0435\u043a\u0430",
+        "account_role_defaultAsset": "\u0421\u0447\u0451\u0442 \u043f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e",
+        "account_role_sharedAsset": "\u041e\u0431\u0449\u0438\u0439 \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0439 \u0441\u0447\u0451\u0442",
+        "account_role_savingAsset": "\u0421\u0431\u0435\u0440\u0435\u0433\u0430\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u0441\u0447\u0435\u0442",
+        "account_role_ccAsset": "\u041a\u0440\u0435\u0434\u0438\u0442\u043d\u0430\u044f \u043a\u0430\u0440\u0442\u0430",
+        "account_role_cashWalletAsset": "\u041d\u0430\u043b\u0438\u0447\u043d\u044b\u0435"
    }
 }
--- a/public/v2/i18n/sk.json
+++ b/public/v2/i18n/sk.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "sk",
        "date_time_fns": "MMMM do, yyyy @ HH:mm:ss",
+        "month_and_day_fns": "MMMM d, y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "Utraten\u00e9",
        "left": "Zost\u00e1va",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "Dlh",
        "account_type_Loan": "P\u00f4\u017ei\u010dka",
-        "account_type_Mortgage": "Hypot\u00e9ka"
+        "account_type_Mortgage": "Hypot\u00e9ka",
+        "account_role_defaultAsset": "Predvolen\u00fd \u00fa\u010det akt\u00edv",
+        "account_role_sharedAsset": "Zdie\u013ean\u00fd \u00fa\u010det akt\u00edv",
+        "account_role_savingAsset": "\u0160etriaci \u00fa\u010det",
+        "account_role_ccAsset": "Kreditn\u00e1 karta",
+        "account_role_cashWalletAsset": "Pe\u0148a\u017eenka"
    }
 }
--- a/public/v2/i18n/sk_SK.json
+++ b/public/v2/i18n/sk_SK.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "sk",
        "date_time_fns": "MMMM do, yyyy @ HH:mm:ss",
+        "month_and_day_fns": "MMMM d, y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "Utraten\u00e9",
        "left": "Zost\u00e1va",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "Dlh",
        "account_type_Loan": "P\u00f4\u017ei\u010dka",
-        "account_type_Mortgage": "Hypot\u00e9ka"
+        "account_type_Mortgage": "Hypot\u00e9ka",
+        "account_role_defaultAsset": "Predvolen\u00fd \u00fa\u010det akt\u00edv",
+        "account_role_sharedAsset": "Zdie\u013ean\u00fd \u00fa\u010det akt\u00edv",
+        "account_role_savingAsset": "\u0160etriaci \u00fa\u010det",
+        "account_role_ccAsset": "Kreditn\u00e1 karta",
+        "account_role_cashWalletAsset": "Pe\u0148a\u017eenka"
    }
 }
--- a/public/v2/i18n/sl.json
+++ b/public/v2/i18n/sl.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "sl",
        "date_time_fns": "MMMM do, yyyy @ HH:mm:ss",
+        "month_and_day_fns": "MMMM d, y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Na podlagi tega izvornega ra\u010duna Firefly III ne more dolo\u010diti vrste transakcije.",
+        "bad_type_destination": "Na podlagi tega ciljnega ra\u010duna Firefly III ne more dolo\u010diti vrste transakcije."
+    },
    "firefly": {
        "spent": "Porabljeno",
        "left": "Preostalo",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Ra\u010dun prihodkov",
        "account_type_Debt": "Dolg",
        "account_type_Loan": "Posojilo",
-        "account_type_Mortgage": "Hipoteka"
+        "account_type_Mortgage": "Hipoteka",
+        "account_role_defaultAsset": "Privzeti ra\u010dun sredstev",
+        "account_role_sharedAsset": "Skupni ra\u010dun sredstev",
+        "account_role_savingAsset": "Var\u010devalni ra\u010dun",
+        "account_role_ccAsset": "Kreditna kartica",
+        "account_role_cashWalletAsset": "Gotovina"
    }
 }
--- a/public/v2/i18n/sl_SI.json
+++ b/public/v2/i18n/sl_SI.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "sl",
        "date_time_fns": "MMMM do, yyyy @ HH:mm:ss",
+        "month_and_day_fns": "MMMM d, y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Na podlagi tega izvornega ra\u010duna Firefly III ne more dolo\u010diti vrste transakcije.",
+        "bad_type_destination": "Na podlagi tega ciljnega ra\u010duna Firefly III ne more dolo\u010diti vrste transakcije."
+    },
    "firefly": {
        "spent": "Porabljeno",
        "left": "Preostalo",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Ra\u010dun prihodkov",
        "account_type_Debt": "Dolg",
        "account_type_Loan": "Posojilo",
-        "account_type_Mortgage": "Hipoteka"
+        "account_type_Mortgage": "Hipoteka",
+        "account_role_defaultAsset": "Privzeti ra\u010dun sredstev",
+        "account_role_sharedAsset": "Skupni ra\u010dun sredstev",
+        "account_role_savingAsset": "Var\u010devalni ra\u010dun",
+        "account_role_ccAsset": "Kreditna kartica",
+        "account_role_cashWalletAsset": "Gotovina"
    }
 }
--- a/public/v2/i18n/sv.json
+++ b/public/v2/i18n/sv.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "sv",
        "date_time_fns": "MMMM do, yyyy @ HH:mm:ss",
+        "month_and_day_fns": "d MMMM y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III kan inte avg\u00f6ra transaktionstypen baserat p\u00e5 detta k\u00e4llkonto.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "Spenderat",
        "left": "\u00c5terst\u00e5r",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "Skuld",
        "account_type_Loan": "L\u00e5n",
-        "account_type_Mortgage": "Bol\u00e5n"
+        "account_type_Mortgage": "Bol\u00e5n",
+        "account_role_defaultAsset": "F\u00f6rvalt tillg\u00e5ngskonto",
+        "account_role_sharedAsset": "Delat tillg\u00e5ngskonto",
+        "account_role_savingAsset": "Sparkonto",
+        "account_role_ccAsset": "Kreditkort",
+        "account_role_cashWalletAsset": "Pl\u00e5nbok"
    }
 }
--- a/public/v2/i18n/sv_SE.json
+++ b/public/v2/i18n/sv_SE.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "sv",
        "date_time_fns": "MMMM do, yyyy @ HH:mm:ss",
+        "month_and_day_fns": "d MMMM y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III kan inte avg\u00f6ra transaktionstypen baserat p\u00e5 detta k\u00e4llkonto.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "Spenderat",
        "left": "\u00c5terst\u00e5r",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "Skuld",
        "account_type_Loan": "L\u00e5n",
-        "account_type_Mortgage": "Bol\u00e5n"
+        "account_type_Mortgage": "Bol\u00e5n",
+        "account_role_defaultAsset": "F\u00f6rvalt tillg\u00e5ngskonto",
+        "account_role_sharedAsset": "Delat tillg\u00e5ngskonto",
+        "account_role_savingAsset": "Sparkonto",
+        "account_role_ccAsset": "Kreditkort",
+        "account_role_cashWalletAsset": "Pl\u00e5nbok"
    }
 }
--- a/public/v2/i18n/tr.json
+++ b/public/v2/i18n/tr.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "tr",
        "date_time_fns": "MMMM do, yyyy @ HH:mm:ss",
+        "month_and_day_fns": "MMMM d, y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "Harcanan",
        "left": "Ayr\u0131ld\u0131",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "Debt",
        "account_type_Loan": "Loan",
-        "account_type_Mortgage": "Mortgage"
+        "account_type_Mortgage": "Mortgage",
+        "account_role_defaultAsset": "Varsay\u0131lan varl\u0131k hesab\u0131",
+        "account_role_sharedAsset": "Payla\u015f\u0131lan varl\u0131k hesab\u0131",
+        "account_role_savingAsset": "Birikim hesab\u0131",
+        "account_role_ccAsset": "Kredi Kart\u0131",
+        "account_role_cashWalletAsset": "Nakit c\u00fczdan"
    }
 }
--- a/public/v2/i18n/tr_TR.json
+++ b/public/v2/i18n/tr_TR.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "tr",
        "date_time_fns": "MMMM do, yyyy @ HH:mm:ss",
+        "month_and_day_fns": "MMMM d, y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "Harcanan",
        "left": "Ayr\u0131ld\u0131",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "Debt",
        "account_type_Loan": "Loan",
-        "account_type_Mortgage": "Mortgage"
+        "account_type_Mortgage": "Mortgage",
+        "account_role_defaultAsset": "Varsay\u0131lan varl\u0131k hesab\u0131",
+        "account_role_sharedAsset": "Payla\u015f\u0131lan varl\u0131k hesab\u0131",
+        "account_role_savingAsset": "Birikim hesab\u0131",
+        "account_role_ccAsset": "Kredi Kart\u0131",
+        "account_role_cashWalletAsset": "Nakit c\u00fczdan"
    }
 }
--- a/public/v2/i18n/uk.json
+++ b/public/v2/i18n/uk.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "uk",
        "date_time_fns": "MMMM do, yyyy @ HH:mm:ss",
+        "month_and_day_fns": "MMMM d, y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "Spent",
        "left": "Left",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "\u0414\u0435\u0431\u0456\u0442",
        "account_type_Loan": "\u041f\u043e\u0437\u0438\u043a\u0430",
-        "account_type_Mortgage": "\u0406\u043f\u043e\u0442\u0435\u043a\u0430"
+        "account_type_Mortgage": "\u0406\u043f\u043e\u0442\u0435\u043a\u0430",
+        "account_role_defaultAsset": "Default asset account",
+        "account_role_sharedAsset": "\u0421\u043f\u0456\u043b\u044c\u043d\u0438\u0439 \u0440\u0430\u0445\u0443\u043d\u043e\u043a",
+        "account_role_savingAsset": "\u0420\u0430\u0445\u0443\u043d\u043e\u043a \u0434\u043b\u044f \u043d\u0430\u043a\u043e\u043f\u0438\u0447\u0435\u043d\u043d\u044f",
+        "account_role_ccAsset": "\u041a\u0440\u0435\u0434\u0438\u0442\u043d\u0430 \u043a\u0430\u0440\u0442\u043a\u0430",
+        "account_role_cashWalletAsset": "\u0413\u0430\u043c\u0430\u043d\u0435\u0446\u044c"
    }
 }
--- a/public/v2/i18n/uk_UA.json
+++ b/public/v2/i18n/uk_UA.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "uk",
        "date_time_fns": "MMMM do, yyyy @ HH:mm:ss",
+        "month_and_day_fns": "MMMM d, y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "Spent",
        "left": "Left",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "\u0414\u0435\u0431\u0456\u0442",
        "account_type_Loan": "\u041f\u043e\u0437\u0438\u043a\u0430",
-        "account_type_Mortgage": "\u0406\u043f\u043e\u0442\u0435\u043a\u0430"
+        "account_type_Mortgage": "\u0406\u043f\u043e\u0442\u0435\u043a\u0430",
+        "account_role_defaultAsset": "Default asset account",
+        "account_role_sharedAsset": "\u0421\u043f\u0456\u043b\u044c\u043d\u0438\u0439 \u0440\u0430\u0445\u0443\u043d\u043e\u043a",
+        "account_role_savingAsset": "\u0420\u0430\u0445\u0443\u043d\u043e\u043a \u0434\u043b\u044f \u043d\u0430\u043a\u043e\u043f\u0438\u0447\u0435\u043d\u043d\u044f",
+        "account_role_ccAsset": "\u041a\u0440\u0435\u0434\u0438\u0442\u043d\u0430 \u043a\u0430\u0440\u0442\u043a\u0430",
+        "account_role_cashWalletAsset": "\u0413\u0430\u043c\u0430\u043d\u0435\u0446\u044c"
    }
 }
--- a/public/v2/i18n/vi.json
+++ b/public/v2/i18n/vi.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "vi",
        "date_time_fns": "d MMMM yyyy @ HH:mm:ss",
+        "month_and_day_fns": "MMMM d, y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "\u0110\u00e3 chi",
        "left": "C\u00f2n l\u1ea1i",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "M\u00f3n n\u1ee3",
        "account_type_Loan": "Ti\u1ec1n vay",
-        "account_type_Mortgage": "Th\u1ebf ch\u1ea5p"
+        "account_type_Mortgage": "Th\u1ebf ch\u1ea5p",
+        "account_role_defaultAsset": "t\u00e0i kho\u1ea3n m\u1eb7c \u0111\u1ecbnh",
+        "account_role_sharedAsset": "t\u00e0i kho\u1ea3n d\u00f9ng chung",
+        "account_role_savingAsset": "T\u00e0i kho\u1ea3n ti\u1ebft ki\u1ec7m",
+        "account_role_ccAsset": "Th\u1ebb t\u00edn d\u1ee5ng",
+        "account_role_cashWalletAsset": "V\u00ed ti\u1ec1n m\u1eb7t"
    }
 }
--- a/public/v2/i18n/vi_VN.json
+++ b/public/v2/i18n/vi_VN.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "vi",
        "date_time_fns": "d MMMM yyyy @ HH:mm:ss",
+        "month_and_day_fns": "MMMM d, y",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "\u0110\u00e3 chi",
        "left": "C\u00f2n l\u1ea1i",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "M\u00f3n n\u1ee3",
        "account_type_Loan": "Ti\u1ec1n vay",
-        "account_type_Mortgage": "Th\u1ebf ch\u1ea5p"
+        "account_type_Mortgage": "Th\u1ebf ch\u1ea5p",
+        "account_role_defaultAsset": "t\u00e0i kho\u1ea3n m\u1eb7c \u0111\u1ecbnh",
+        "account_role_sharedAsset": "t\u00e0i kho\u1ea3n d\u00f9ng chung",
+        "account_role_savingAsset": "T\u00e0i kho\u1ea3n ti\u1ebft ki\u1ec7m",
+        "account_role_ccAsset": "Th\u1ebb t\u00edn d\u1ee5ng",
+        "account_role_cashWalletAsset": "V\u00ed ti\u1ec1n m\u1eb7t"
    }
 }
--- a/public/v2/i18n/zh-cn.json
+++ b/public/v2/i18n/zh-cn.json
@@ -2,13 +2,18 @@
    "config": {
        "html_language": "zh-cn",
        "date_time_fns": "YYYY\u5e74M\u6708D\u65e5 HH:mm:ss",
-        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
+        "month_and_day_fns": "YYYY\u5e74M\u6708D\u65e5",
+        "date_time_fns_short": "MMMM \u6267\u884c, yyyy @ HH:mm"
+    },
+    "validation": {
+        "bad_type_source": "Firefly III \u65e0\u6cd5\u786e\u5b9a\u57fa\u4e8e\u6b64\u6e90\u8d26\u6237\u7684\u4ea4\u6613\u7c7b\u578b\u3002",
+        "bad_type_destination": "Firefly III \u65e0\u6cd5\u786e\u5b9a\u57fa\u4e8e\u6b64\u76ee\u6807\u5e10\u6237\u7684\u4ea4\u6613\u7c7b\u578b\u3002"
    },
    "firefly": {
        "spent": "\u652f\u51fa",
        "left": "\u5269\u4f59",
        "paid": "\u5df2\u4ed8\u6b3e",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
+        "errors_submission_v2": "\u60a8\u63d0\u4ea4\u7684\u5185\u5bb9\u6709\u8bef\uff0c\u8bf7\u68c0\u67e5\u9519\u8bef\u4fe1\u606f: {{errorMessage}}",
        "unpaid": "\u672a\u4ed8\u6b3e",
        "default_group_title_name_plain": "\u672a\u5206\u7ec4",
        "subscriptions_in_group": "\u5206\u7ec4\u201c%{title}\u201d\u8ba2\u9605",
@@ -23,7 +28,7 @@
        "unknown_dest_plain": "\u672a\u77e5\u76ee\u6807\u8d26\u6237",
        "unknown_any_plain": "\u672a\u77e5\u8d26\u6237",
        "unknown_budget_plain": "\u65e0\u9884\u7b97",
-        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
+        "stored_journal_js": "\u6210\u529f\u521b\u5efa\u65b0\u4ea4\u6613 \"{{description}}\"",
        "wait_loading_transaction": "\u8bf7\u7b49\u5f85\u8868\u5355\u52a0\u8f7d",
        "nothing_found": "(\u6ca1\u6709\u627e\u5230)",
        "wait_loading_data": "\u8bf7\u7b49\u5f85\u60a8\u7684\u4fe1\u606f\u52a0\u8f7d...",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "\u6536\u5165\u8d26\u6237",
        "account_type_Debt": "\u6b20\u6b3e",
        "account_type_Loan": "\u8d37\u6b3e",
-        "account_type_Mortgage": "\u62b5\u62bc"
+        "account_type_Mortgage": "\u62b5\u62bc",
+        "account_role_defaultAsset": "\u9ed8\u8ba4\u8d44\u4ea7\u8d26\u6237",
+        "account_role_sharedAsset": "\u5171\u7528\u8d44\u4ea7\u8d26\u6237",
+        "account_role_savingAsset": "\u50a8\u84c4\u8d26\u6237",
+        "account_role_ccAsset": "\u4fe1\u7528\u5361",
+        "account_role_cashWalletAsset": "\u73b0\u91d1\u94b1\u5305"
    }
 }
--- a/public/v2/i18n/zh-tw.json
+++ b/public/v2/i18n/zh-tw.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "zh-tw",
        "date_time_fns": "YYYY\u5e74 M\u6708 D\u65e5 dddd \u65bc HH:mm:ss",
+        "month_and_day_fns": "YYYY\u5e74 M\u6708 d\u65e5",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "\u652f\u51fa",
        "left": "\u5269\u9918",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "\u8ca0\u50b5",
        "account_type_Loan": "\u8cb8\u6b3e",
-        "account_type_Mortgage": "\u62b5\u62bc"
+        "account_type_Mortgage": "\u62b5\u62bc",
+        "account_role_defaultAsset": "\u9810\u8a2d\u8cc7\u7522\u5e33\u6236",
+        "account_role_sharedAsset": "\u5171\u7528\u8cc7\u7522\u5e33\u6236",
+        "account_role_savingAsset": "\u5132\u84c4\u5e33\u6236",
+        "account_role_ccAsset": "\u4fe1\u7528\u5361",
+        "account_role_cashWalletAsset": "\u73fe\u91d1\u9322\u5305"
    }
 }
--- a/public/v2/i18n/zh_CN.json
+++ b/public/v2/i18n/zh_CN.json
@@ -2,13 +2,18 @@
    "config": {
        "html_language": "zh-cn",
        "date_time_fns": "YYYY\u5e74M\u6708D\u65e5 HH:mm:ss",
-        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
+        "month_and_day_fns": "YYYY\u5e74M\u6708D\u65e5",
+        "date_time_fns_short": "MMMM \u6267\u884c, yyyy @ HH:mm"
+    },
+    "validation": {
+        "bad_type_source": "Firefly III \u65e0\u6cd5\u786e\u5b9a\u57fa\u4e8e\u6b64\u6e90\u8d26\u6237\u7684\u4ea4\u6613\u7c7b\u578b\u3002",
+        "bad_type_destination": "Firefly III \u65e0\u6cd5\u786e\u5b9a\u57fa\u4e8e\u6b64\u76ee\u6807\u5e10\u6237\u7684\u4ea4\u6613\u7c7b\u578b\u3002"
    },
    "firefly": {
        "spent": "\u652f\u51fa",
        "left": "\u5269\u4f59",
        "paid": "\u5df2\u4ed8\u6b3e",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
+        "errors_submission_v2": "\u60a8\u63d0\u4ea4\u7684\u5185\u5bb9\u6709\u8bef\uff0c\u8bf7\u68c0\u67e5\u9519\u8bef\u4fe1\u606f: {{errorMessage}}",
        "unpaid": "\u672a\u4ed8\u6b3e",
        "default_group_title_name_plain": "\u672a\u5206\u7ec4",
        "subscriptions_in_group": "\u5206\u7ec4\u201c%{title}\u201d\u8ba2\u9605",
@@ -23,7 +28,7 @@
        "unknown_dest_plain": "\u672a\u77e5\u76ee\u6807\u8d26\u6237",
        "unknown_any_plain": "\u672a\u77e5\u8d26\u6237",
        "unknown_budget_plain": "\u65e0\u9884\u7b97",
-        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
+        "stored_journal_js": "\u6210\u529f\u521b\u5efa\u65b0\u4ea4\u6613 \"{{description}}\"",
        "wait_loading_transaction": "\u8bf7\u7b49\u5f85\u8868\u5355\u52a0\u8f7d",
        "nothing_found": "(\u6ca1\u6709\u627e\u5230)",
        "wait_loading_data": "\u8bf7\u7b49\u5f85\u60a8\u7684\u4fe1\u606f\u52a0\u8f7d...",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "\u6536\u5165\u8d26\u6237",
        "account_type_Debt": "\u6b20\u6b3e",
        "account_type_Loan": "\u8d37\u6b3e",
-        "account_type_Mortgage": "\u62b5\u62bc"
+        "account_type_Mortgage": "\u62b5\u62bc",
+        "account_role_defaultAsset": "\u9ed8\u8ba4\u8d44\u4ea7\u8d26\u6237",
+        "account_role_sharedAsset": "\u5171\u7528\u8d44\u4ea7\u8d26\u6237",
+        "account_role_savingAsset": "\u50a8\u84c4\u8d26\u6237",
+        "account_role_ccAsset": "\u4fe1\u7528\u5361",
+        "account_role_cashWalletAsset": "\u73b0\u91d1\u94b1\u5305"
    }
 }
--- a/public/v2/i18n/zh_TW.json
+++ b/public/v2/i18n/zh_TW.json
@@ -2,8 +2,13 @@
    "config": {
        "html_language": "zh-tw",
        "date_time_fns": "YYYY\u5e74 M\u6708 D\u65e5 dddd \u65bc HH:mm:ss",
+        "month_and_day_fns": "YYYY\u5e74 M\u6708 d\u65e5",
        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
    },
+    "validation": {
+        "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
+        "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
+    },
    "firefly": {
        "spent": "\u652f\u51fa",
        "left": "\u5269\u9918",
@@ -38,6 +43,11 @@
        "account_type_Revenue account": "Revenue account",
        "account_type_Debt": "\u8ca0\u50b5",
        "account_type_Loan": "\u8cb8\u6b3e",
-        "account_type_Mortgage": "\u62b5\u62bc"
+        "account_type_Mortgage": "\u62b5\u62bc",
+        "account_role_defaultAsset": "\u9810\u8a2d\u8cc7\u7522\u5e33\u6236",
+        "account_role_sharedAsset": "\u5171\u7528\u8cc7\u7522\u5e33\u6236",
+        "account_role_savingAsset": "\u5132\u84c4\u5e33\u6236",
+        "account_role_ccAsset": "\u4fe1\u7528\u5361",
+        "account_role_cashWalletAsset": "\u73fe\u91d1\u9322\u5305"
    }
 }
--- a/resources/assets/js/locales/zh-cn.json
+++ b/resources/assets/js/locales/zh-cn.json
@@ -5,8 +5,8 @@
        "flash_warning": "\u8b66\u544a\uff01",
        "flash_success": "\u6210\u529f\uff01",
        "close": "\u5173\u95ed",
-        "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": "\u8bf7\u9009\u62e9\u6216\u8f93\u5165\u4e00\u4e2a\u6709\u6548\u7684\u76ee\u6807\u5e10\u6237\u540d\u79f0",
+        "select_source_account": "\u8bf7\u9009\u62e9\u6216\u8f93\u5165\u4e00\u4e2a\u6709\u6548\u7684\u6e90\u5e10\u6237\u540d\u79f0",
        "split_transaction_title": "\u62c6\u5206\u4ea4\u6613\u7684\u63cf\u8ff0",
        "errors_submission": "\u60a8\u7684\u63d0\u4ea4\u6709\u8bef\uff0c\u8bf7\u67e5\u770b\u4e0b\u9762\u8f93\u51fa\u7684\u9519\u8bef\u4fe1\u606f\u3002",
        "split": "\u62c6\u5206",
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -1989,7 +1989,7 @@ return [
    'deleted_transfer'                                    => 'Opération ":description" correctement supprimée',
    'deleted_reconciliation'                              => 'Opération ":description" supprimée avec succès',
    'stored_journal'                                      => 'Opération ":description" créée avec succès',
-    'stored_journal_js'                                   => 'Successfully created new transaction "{{description}}"',
+    'stored_journal_js'                                   => 'Opération "{{description}}" créée avec succès',
    'stored_journal_no_descr'                             => 'Nouvelle opération créée avec succès',
    'updated_journal_no_descr'                            => 'Votre opération a été mise à jour avec succès',
    'select_transactions'                                 => 'Sélectionner des opérations',
@@ -2297,7 +2297,7 @@ return [
    'description'                                         => 'Description',
    'sum_of_period'                                       => 'Somme pour la période',
    'average_in_period'                                   => 'Moyenne pour la période',
-    'no_account_role'                                     => '(no role)',
+    'no_account_role'                                     => '(aucun rôle)',
    'account_role_defaultAsset'                           => 'Compte d\'actif par défaut',
    'account_role_sharedAsset'                            => 'Compte d\'actif partagé',
    'account_role_savingAsset'                            => 'Compte d’épargne',
@@ -2570,9 +2570,9 @@ return [
    'store_as_new'                                        => 'Enregistrer comme une nouvelle opération au lieu de mettre à jour.',
    'reset_after'                                         => 'Réinitialiser le formulaire après soumission',
    'errors_submission'                                   => 'Certaines informations ne sont pas correctes dans votre formulaire. Veuillez vérifier les erreurs ci-dessous.',
-    'errors_submission_v2'                                => 'There was something wrong with your submission. Please check out the errors below: {{errorMessage}}',
+    'errors_submission_v2'                                => 'Certaines informations ne sont pas correctes dans votre formulaire. Veuillez vérifier les erreurs ci-dessous : {{errorMessage}}',
    'transaction_expand_split'                            => 'Développer la séparation',
-    'transaction_remove_split'                            => 'Remove split',
+    'transaction_remove_split'                            => 'Supprimer la division',
    'transaction_collapse_split'                          => 'Réduire la séparation',

    // object groups
--- a/resources/lang/zh_CN/config.php
+++ b/resources/lang/zh_CN/config.php
@@ -64,7 +64,7 @@ return [
    // 'date_time'               => '%B %e, %Y, @ %T',
    'date_time_js'             => 'YYYY年M月D日 HH:mm:ss',
    'date_time_fns'            => 'YYYY年M月D日 HH:mm:ss',
-    'date_time_fns_short'      => 'MMMM do, yyyy @ HH:mm',
+    'date_time_fns_short'      => 'MMMM 执行, yyyy @ HH:mm',

    // 'specific_day'            => '%e %B %Y',
    'specific_day_js'          => 'YYYY年M月D日',
--- a/resources/lang/zh_CN/errors.php
+++ b/resources/lang/zh_CN/errors.php
@@ -42,7 +42,7 @@ return [
    'fatal_error'             => '发生致命错误：请检查位于“storage/logs”目录的日志文件，或使用“docker logs -f [container]”命令查看相关信息。',
    'maintenance_mode'        => 'Firefly III 已启用维护模式',
    'be_right_back'           => '敬请期待！',
-    '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 是为了一些必要的维护。请稍后再试。 如果您正好在演示站点看到此消息，请等待几分钟。数据库将每隔几小时重置。',
    'error_occurred'          => '很抱歉，出现错误',
    'db_error_occurred'       => '哎呀！发生数据库错误。',
    'error_not_recoverable'   => '很遗憾，该错误无法恢复 :( Firefly III 已崩溃。错误信息：',
--- a/resources/lang/zh_CN/firefly.php
+++ b/resources/lang/zh_CN/firefly.php
@@ -113,7 +113,7 @@ return [
    'two_factor_forgot'                                   => '我忘记了两步验证码',
    'two_factor_lost_header'                              => '遗失了您的两步验证吗？',
    'two_factor_lost_intro'                               => '如果您同时遗失了备份代码，很抱歉，您无法通过网页进行恢复。您可以通过下述方式进行操作。',
-    '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'                            => '若您自行运行 Firefly III 服务，查看 <a href="https://docs.firefly-iii.org/references/faq/firefly-iii/using/#i-lost-my-2fa-token-generator-or-2fa-has-stopped-working">常见问题解答</a> 来参考',
    'two_factor_lost_fix_owner'                           => '如果这不是您自己的 Firefly III 站点，请邮件联系站点管理员（<a href="mailto::site_owner">:site_owner</a>）协助您重置两步验证。',
    'mfa_backup_code'                                     => '您已使用备用代码登录到 Firefly III 。 您不能再使用它，因此请将其划掉。',
    'pref_two_factor_new_backup_codes'                    => '获取新的备份代码',
@@ -317,8 +317,8 @@ return [
    'update_new_version_alert'                            => '发现可用的 Firefly III 新版本，您正在运行的版本是 :your_version，最新版本是 :new_version（发布于 :date）。',
    'update_version_beta'                                 => '此版本是 BETA 版本。您可能会遇到问题。',
    'update_version_alpha'                                => '此版本是 ALPHA 版本。您可能会遇到问题。',
-    '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'                            => '您正在运行开发版本 ":version", 该版本比最新版本的 :new_version旧。请更新！',
+    'update_current_dev_newer'                            => '您正在运行开发版本 ":version", 它比最新版本 :new_version 更新。',
    'update_current_version_alert'                        => '您正在运行 :version，这是最新的可用版本。',
    'update_newer_version_alert'                          => '您正在运行 :your_version，它比最新发布的 :new_version 更新。',
    'update_check_error'                                  => '检查更新时发生错误：:error',
@@ -896,12 +896,12 @@ return [
    'rule_trigger_budget_is'                              => '预算为 ":trigger_value"',
    'rule_trigger_tag_is_choice'                          => '其中一个标签为...',
    'rule_trigger_tag_is'                                 => '其中一个标签为":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'                    => '任何标签包含...',
+    'rule_trigger_tag_contains'                           => '任何标签包含 ":trigger_value"',
+    'rule_trigger_tag_ends_choice'                        => '任何标签结尾...',
+    'rule_trigger_tag_ends'                               => '任何标签以 ":trigger_value " 结尾',
+    'rule_trigger_tag_starts_choice'                      => '任何标签开头...',
+    'rule_trigger_tag_starts'                             => '任何标签以 ":trigger_value " 开头',
    'rule_trigger_currency_is_choice'                     => '交易货币为…',
    'rule_trigger_currency_is'                            => '交易货币为“:trigger_value”',
    'rule_trigger_foreign_currency_is_choice'             => '交易外币为...',
@@ -1203,7 +1203,7 @@ return [
    'rule_trigger_not_exists'                             => '交易不存在',
    'rule_trigger_not_has_attachments'                    => '交易不含附件',
    'rule_trigger_not_has_any_category'                   => '交易不含分类',
-    'rule_trigger_not_has_any_budget'                     => 'Transaction has no budget',
+    'rule_trigger_not_has_any_budget'                     => '交易没有预算',
    'rule_trigger_not_has_any_bill'                       => '交易不含账单',
    'rule_trigger_not_has_any_tag'                        => '交易不含标签',
    'rule_trigger_not_any_notes'                          => '交易不含备注',
@@ -1286,8 +1286,8 @@ return [
    'rule_action_append_notes_to_descr'                   => '在描述后追加备注',
    'rule_action_move_descr_to_notes'                     => '用描述替换备注',
    'rule_action_move_notes_to_descr'                     => '用备注替换描述',
-    'rule_action_set_amount_choice'                       => 'Set amount to ..',
-    'rule_action_set_amount'                              => 'Set amount to ":action_value"',
+    'rule_action_set_amount_choice'                       => '设置金额为 ...',
+    'rule_action_set_amount'                              => '设置金额为 ":action_value"',
    'rule_action_set_destination_to_cash_choice'          => '将目标帐户设置为 (现金)',
    'rule_action_set_source_to_cash_choice'               => '将源账户设置为 (现金)',
    'rulegroup_for_bills_title'                           => '账单规则组',
@@ -1589,8 +1589,8 @@ return [
    'submission_options'                                  => '提交选项',
    'apply_rules_checkbox'                                => '应用规则',
    'fire_webhooks_checkbox'                              => '触发 webhook',
-    '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'                               => '请选择或输入一个有效的源帐户名称',
+    'select_dest_account'                                 => '请选择或输入一个有效的目标帐户名称',

    // convert stuff:
    'convert_is_already_type_Withdrawal'                  => '此交易已经为支出',
@@ -1990,7 +1990,7 @@ return [
    'deleted_transfer'                                    => '已成功删除转账“:description”',
    'deleted_reconciliation'                              => '成功删除对账交易“:description”',
    'stored_journal'                                      => '成功创建新交易“:description”',
-    'stored_journal_js'                                   => 'Successfully created new transaction "{{description}}"',
+    'stored_journal_js'                                   => '成功创建新交易 "{{description}}"',
    'stored_journal_no_descr'                             => '成功创建您的新交易',
    'updated_journal_no_descr'                            => '成功更新您的交易',
    'select_transactions'                                 => '选择交易',
@@ -2298,7 +2298,7 @@ return [
    'description'                                         => '描述',
    'sum_of_period'                                       => '区间内的总和',
    'average_in_period'                                   => '区间平均',
-    'no_account_role'                                     => '(no role)',
+    'no_account_role'                                     => '(无角色)',
    'account_role_defaultAsset'                           => '默认资产账户',
    'account_role_sharedAsset'                            => '共用资产账户',
    'account_role_savingAsset'                            => '储蓄账户',
@@ -2463,7 +2463,7 @@ return [
    'block_code_bounced'                                  => '电子邮件被退回',
    'block_code_expired'                                  => '演示账户已过期',
    'no_block_code'                                       => '无封禁理由或用户未被封禁',
-    'demo_user_export'                                    => 'The demo user cannot export data',
+    'demo_user_export'                                    => '演示用户不能导出数据',
    'block_code_email_changed'                            => '用户尚未确认新的电子邮件地址',
    'admin_update_email'                                  => '与个人档案页面相反，用户不会被通知他们的电子邮件地址已变更！',
    'update_user'                                         => '更新用户',
@@ -2571,9 +2571,9 @@ return [
    'store_as_new'                                        => '保存为新交易而不是更新此交易。',
    'reset_after'                                         => '提交后重置表单',
    'errors_submission'                                   => '您的提交有误，请查看下面输出的错误信息。',
-    'errors_submission_v2'                                => 'There was something wrong with your submission. Please check out the errors below: {{errorMessage}}',
+    'errors_submission_v2'                                => '您提交的内容有误，请检查错误信息: {{errorMessage}}',
    'transaction_expand_split'                            => '展开拆分',
-    'transaction_remove_split'                            => 'Remove split',
+    'transaction_remove_split'                            => '移除拆分',
    'transaction_collapse_split'                          => '折叠拆分',

    // object groups
@@ -2773,7 +2773,7 @@ return [
    'ale_action_add_to_piggy'                             => '存钱罐',
    'ale_action_remove_from_piggy'                        => '存钱罐',
    'ale_action_add_tag'                                  => '添加标签',
-    'ale_action_update_amount'                            => 'Updated amount',
+    'ale_action_update_amount'                            => '更新金额',

    // dashboard
    'enable_auto_convert'                                 => '启用货币转换',
--- a/resources/lang/zh_CN/rules.php
+++ b/resources/lang/zh_CN/rules.php
@@ -70,5 +70,5 @@ return [
    'cannot_find_budget'                          => 'Firefly III 找不到预算“:name”',
    'cannot_find_category'                        => 'Firefly III 找不到分类“:name”',
    'cannot_set_budget'                           => 'Firefly III 无法设置预算“:name”为类型“:type”的交易',
-    'journal_invalid_amount'                      => 'Firefly III can\'t set amount ":amount" because it is not a valid number.',
+    'journal_invalid_amount'                      => 'Firefly III 无法设置金额 ":amount" 因为它不是一个有效的数字。',
 ];
--- a/resources/lang/zh_CN/validation.php
+++ b/resources/lang/zh_CN/validation.php
@@ -55,11 +55,11 @@ return [
    'reconciled_forbidden_field'      => '这笔交易已经对账，您无法更改“:field”',
    'deleted_user'                    => '由于安全限制，您无法使用此电子邮件地址注册',
    'rule_trigger_value'              => '此值不能用于所选触发条件',
-    'rule_action_expression'          => 'Invalid expression. :error',
+    'rule_action_expression'          => '无效表达式. :error',
    'rule_action_value'               => '此值不能用于所选动作',
    'file_already_attached'           => '上传的文件“:name”已添加到此对象',
    'file_attached'                   => '成功上传文件“:name”',
-    'file_zero'                       => 'The file is zero bytes in size.',
+    'file_zero'                       => '文件大小为零字节。',
    'must_exist'                      => '数据库中不存在字段 :attribute 的 ID',
    'all_accounts_equal'              => '此字段中的所有账户必须相同',
    'group_title_mandatory'           => '在有超过一笔交易时，组标题为必填项',
@@ -197,7 +197,7 @@ return [
 *
 */

-    'secure_password'                 => 'This is not a secure password. Please try again. For more information, visit https://bit.ly/FF3-password',
+    'secure_password'                 => '这不是一个安全的密码。请再试一次。欲了解更多信息，请访问 https://bit.ly/FF3-password',
    'valid_recurrence_rep_type'       => '此重复类型不能用于定期交易',
    'valid_recurrence_rep_moment'     => '此重复时刻不能用于此重复类型',
    'invalid_account_info'            => '无效的账户信息',
--- a/resources/views/budgets/index.twig
+++ b/resources/views/budgets/index.twig
@@ -324,7 +324,11 @@
                                                        {# the amount left is automatically calculated. #}
                                                        {{ formatAmountBySymbol(spentInfo.spent + budgetLimit.amount, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }}
                                                        {% if spentInfo.spent + budgetLimit.amount > 0 %}
-                                                            ({{ formatAmountBySymbol((spentInfo.spent + budgetLimit.amount) / activeDaysLeft, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }})
+                                                            {% if 0 == activeDaysLeft %}
+                                                                ({{ formatAmountBySymbol(spentInfo.spent + budgetLimit.amount, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }})
+                                                            {% else %}
+                                                                ({{ formatAmountBySymbol((spentInfo.spent + budgetLimit.amount) / activeDaysLeft, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }})
+                                                            {% endif %}
                                                        {% else %}
                                                            ({{ formatAmountBySymbol(0, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }})
                                                        {% endif %}
@@ -347,7 +351,11 @@
                                                      data-value="{{ spentInfo.spent + budgetLimit.amount }}" class="amount_left">
                                                {{ formatAmountBySymbol(budgetLimit.amount, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }}
                                                    {% if budgetLimit.in_range %}
-                                                        ({{ formatAmountBySymbol(budgetLimit.amount / activeDaysLeft, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})
+                                                        {% if 0 == activeDaysLeft %}
+                                                            ({{ formatAmountBySymbol(budgetLimit.amount, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})
+                                                        {% else %}
+                                                            ({{ formatAmountBySymbol(budgetLimit.amount / activeDaysLeft, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})
+                                                        {% endif %}
                                                    {% endif %}
                                            </span>
                                                <br/>
Author	SHA1	Message	Date
James Cole	e8618047bd	More readable fix for division by zero error.	2024-03-31 08:40:47 +02:00
James Cole	f104b76f73	Merge pull request #8735 from mansuf/develop Fix `Division error by zero` in budget views	2024-03-31 08:37:09 +02:00
Rahman Yusuf	cb701d8506	Fix Division error by zero in budget views	2024-03-31 12:03:54 +07:00
James Cole	70a334c56e	Merge branch 'main' into develop	2024-03-31 03:16:54 +02:00
github-actions	e6b2db1e29	Auto commit for release 'develop' on 2024-03-31	2024-03-31 03:14:08 +02:00
James Cole	e8dffa0052	Update script version	2024-03-31 03:09:00 +02:00
James Cole	c4f0512f39	Run another composer, and dump the autoload files.	2024-03-31 03:06:58 +02:00
James Cole	3268019d0c	Fix #8732	2024-03-31 01:24:18 +01:00
James Cole	a0ef6a1fc8	Fix https://github.com/firefly-iii/firefly-iii/issues/8725	2024-03-30 09:56:51 +01:00
James Cole	99d0098b20	Merge branch 'main' into develop	2024-03-28 05:59:30 +01:00
James Cole	a7a54c042c	Touch and exclude tar name	2024-03-28 05:53:31 +01:00
github-actions	c44e48a793	Auto commit for release 'develop' on 2024-03-28	2024-03-28 04:10:19 +01:00
James Cole	53b501ca73	Add tar.gz file	2024-03-27 20:04:14 +01:00
James Cole	322f70bcca	Merge branch 'main' into develop # Conflicts: # .github/workflows/release.yml	2024-03-27 07:10:24 +01:00
James Cole	35559c077b	Update text in output.	2024-03-27 06:59:48 +01:00
github-actions	590ffe7c76	Auto commit for release 'develop' on 2024-03-27	2024-03-27 06:58:44 +01:00
James Cole	8a2d8f148e	Expand text under development release	2024-03-27 06:50:39 +01:00
James Cole	4f0e15e07d	Expand text in dev release.	2024-03-27 06:49:56 +01:00
James Cole	7463861e0c	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop	2024-03-26 07:40:51 +01:00
James Cole	1e70fa28be	Fix https://github.com/firefly-iii/firefly-iii/issues/8648	2024-03-26 07:37:21 +01:00