More readable fix for division by zero error.

Fix `Division error by zero` in budget views

.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",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/4f988f8fdf580d53bdb2d1278fe93d1ed5462255",
-                "reference": "ced299686f41dce890debac69273b47ffe98a40c",
+                "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,20 +222,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-25T21:32:43+00:00"
+            "time": "2024-03-26T18:29:49+00:00"
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.52.0",
+            "version": "v3.52.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "a3564bd66f4bce9bc871ef18b690e2dc67a7f969"
+                "reference": "6e77207f0d851862ceeb6da63e6e22c01b1587bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/a3564bd66f4bce9bc871ef18b690e2dc67a7f969",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/6e77207f0d851862ceeb6da63e6e22c01b1587bc",
-                "reference": "a3564bd66f4bce9bc871ef18b690e2dc67a7f969",
+                "reference": "6e77207f0d851862ceeb6da63e6e22c01b1587bc",
                 "shasum": ""
             },
             "require": {
@@ -306,7 +306,7 @@
             ],
             "support": {
                 "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.52.0"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.52.1"
             },
             "funding": [
                 {
@@ -314,7 +314,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-18T18:40:11+00:00"
+            "time": "2024-03-19T21:02:43+00:00"
         },
         {
             "name": "psr/container",

.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

.github/workflows/cleanup.yml

@@ -7,7 +7,7 @@ permissions:
 
 on:
   schedule:
-    - cron: '0 0 * * *'
+    - cron: '0 1 * * *'
   workflow_dispatch:
 jobs:
   prune:

.github/workflows/lock.yml

@@ -3,7 +3,7 @@ name: 'Issues - Lock old issues'
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 0 * * *'
+    - cron: '0 2 * * *'
 
 concurrency:
   group: lock-threads

.github/workflows/release.yml

@@ -8,7 +8,7 @@ on:
         required: true
         default: 'develop'
   schedule:
-    - cron:  '15 0 * * MON,THU'
+    - cron:  '0 3 * * MON,THU'
 
 jobs:
   build:
@@ -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: ''
@@ -115,12 +115,12 @@ jobs:
           GH_TOKEN: ''
       - name: Build new JS
         run: |
-          pwd
           npm install
+          npm update
           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,8 +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
@@ -152,19 +164,64 @@ jobs:
           git commit -m "Auto commit for release '$version' on $(date +'%Y-%m-%d')" || true
           git push
 
+          # 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
-            echo "Create nightly release."
+            # add text to output.txt (instructions)
-            git tag -a $version-$(date +'%Y%m%d') -m "Nightly development release '$version' on $(date +'%Y-%m-%d')"
-            git push origin $version-$(date +'%Y%m%d')
-            gh release create $version-$(date +'%Y%m%d') -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."
-          else
-            echo "Create default release."
-            git tag -a $version -m "Here be changelog"
-            git push origin $version
-            gh release create $version -F output.txt -t "$version" --verify-tag
             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')" \
+              -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
+            gh release create $releaseName -F output.txt -t "$releaseName" --verify-tag
+            # add zip file to release.
+            gh release upload $releaseName $zipName
+            # add sha256 sum to release
+            gh release upload $releaseName $zipName.sha256
+            rm output.txt
+            rm $zipName
+            rm $zipName.sha256
             git checkout develop
             git merge main
             git push

.github/workflows/stale.yml

@@ -1,7 +1,7 @@
 name: "Issues - Mark and close stale issues"
 on:
   schedule:
-    - cron: "30 1 * * *"
+    - cron: "0 4 * * *"
   workflow_dispatch:
 
 permissions:
@@ -18,16 +18,16 @@ jobs:
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           stale-issue-message: >
-            Hi there! 
+            Hi there!
-            
+
             This is an automatic reply. `Share and enjoy`
 
             This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs.
 
             Thank you for your contributions.
           stale-pr-message: >
-            Hi there! 
+            Hi there!
-            
+
             This is an automatic reply. `Share and enjoy`
 
             This PR has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs.

app/Console/Commands/System/LaravelPassportKeys.php

@@ -0,0 +1,65 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * LaravelPassportKeys.php
+ * Copyright (c) 2024 james@firefly-iii.org.
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+
+namespace FireflyIII\Console\Commands\System;
+
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Artisan;
+use Symfony\Component\Console\Command\Command as CommandAlias;
+
+class LaravelPassportKeys extends Command
+{
+    use ShowsFriendlyMessages;
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature   = 'firefly-iii:laravel-passport-keys';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Calls the Laravel "passport:keys" but doesn\'t exit 1.';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        Artisan::call('passport:keys --no-interaction', []);
+        $result = Artisan::output();
+        if (str_contains($result, 'Encryption keys already exist')) {
+            $this->friendlyInfo('Encryption keys exist already.');
+
+            return CommandAlias::SUCCESS;
+        }
+        $this->friendlyPositive('Encryption keys have been created, nice!');
+
+        return CommandAlias::SUCCESS;
+    }
+}

app/Console/Commands/Tools/ApplyRules.php

@@ -1,7 +1,7 @@
 <?php
-/**
+/*
  * ApplyRules.php
- * Copyright (c) 2020 james@firefly-iii.org
+ * Copyright (c) 2024 james@firefly-iii.org.
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -16,7 +16,7 @@
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
  */
 
 declare(strict_types=1);

app/Console/Commands/Tools/Cron.php

@@ -1,8 +1,8 @@
 <?php
 
-/**
+/*
  * Cron.php
- * Copyright (c) 2020 james@firefly-iii.org
+ * Copyright (c) 2024 james@firefly-iii.org.
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -17,7 +17,7 @@
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
  */
 
 declare(strict_types=1);

app/Http/Controllers/HomeController.php

@@ -89,7 +89,7 @@ class HomeController extends Controller
         $label         = $request->get('label');
         $isCustomRange = false;
 
-        app('log')->debug('Received dateRange', ['start' => $stringStart, 'end' => $stringEnd, 'label' => $request->get('label')]);
+        app('log')->debug('dateRange: Received dateRange', ['start' => $stringStart, 'end' => $stringEnd, 'label' => $request->get('label')]);
         // check if the label is "everything" or "Custom range" which will betray
         // a possible problem with the budgets.
         if ($label === (string)trans('firefly.everything') || $label === (string)trans('firefly.customRange')) {
@@ -99,7 +99,7 @@ class HomeController extends Controller
 
         $diff          = $start->diffInDays($end, true) + 1;
 
-        if ($diff > 50) {
+        if ($diff > 366) {
             $request->session()->flash('warning', (string)trans('firefly.warning_much_data', ['days' => (int)$diff]));
         }
 

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));
             }
         }

app/Providers/AppServiceProvider.php

@@ -25,10 +25,9 @@ namespace FireflyIII\Providers;
 
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\ServiceProvider;
-use Laravel\Passport\Passport;
-use Laravel\Sanctum\Sanctum;
 
 /**
  * Class AppServiceProvider
@@ -65,9 +64,14 @@ class AppServiceProvider extends ServiceProvider
 
             return '';
         });
-        Blade::if('partialroute', function (string $route) {
+        Blade::if('partialroute', function (string $route, string $firstParam = '') {
-            $name = \Route::getCurrentRoute()->getName() ?? '';
+            $name       = Route::getCurrentRoute()->getName() ?? '';
-            if (str_contains($name, $route)) {
+            if ('' === $firstParam && str_contains($name, $route)) {
+                return true;
+            }
+            $params     = Route::getCurrentRoute()->parameters() ?? [];
+            $objectType = $params['objectType'] ?? '';
+            if ($objectType === $firstParam && str_contains($name, $route)) {
                 return true;
             }
 

app/Repositories/UserGroups/Account/AccountRepository.php

@@ -240,15 +240,19 @@ class AccountRepository implements AccountRepositoryInterface
 
     public function getAccountsByType(array $types, ?array $sort = []): Collection
     {
-        $sortable = ['name', 'active']; // TODO yes this is a duplicate array.
+        $sortable        = ['name', 'active']; // TODO yes this is a duplicate array.
-        $res      = array_intersect([AccountType::ASSET, AccountType::MORTGAGE, AccountType::LOAN, AccountType::DEBT], $types);
+        $res             = array_intersect([AccountType::ASSET, AccountType::MORTGAGE, AccountType::LOAN, AccountType::DEBT], $types);
-        $query    = $this->userGroup->accounts();
+        $query           = $this->userGroup->accounts();
         if (0 !== count($types)) {
             $query->accountTypeIn($types);
         }
 
         // add sort parameters. At this point they're filtered to allowed fields to sort by:
+        $hasActiveColumn = array_key_exists('active', $sort);
         if (count($sort) > 0) {
+            if (false === $hasActiveColumn) {
+                $query->orderBy('accounts.active', 'DESC');
+            }
             foreach ($sort as $column => $direction) {
                 if (in_array($column, $sortable, true)) {
                     $query->orderBy(sprintf('accounts.%s', $column), $direction);
@@ -258,9 +262,9 @@ class AccountRepository implements AccountRepositoryInterface
 
         if (0 === count($sort)) {
             if (0 !== count($res)) {
-                $query->orderBy('accounts.order', 'ASC');
+                $query->orderBy('accounts.active', 'DESC');
             }
-            $query->orderBy('accounts.active', 'DESC');
+            $query->orderBy('accounts.order', 'ASC');
             $query->orderBy('accounts.name', 'ASC');
         }
 

app/Support/Binder/EitherConfigKey.php

@@ -34,6 +34,10 @@ class EitherConfigKey
 {
     public static array $static
         = [
+            // currency conversion
+            'cer.enabled',
+
+            // firefly iii settings
             'firefly.version',
             'firefly.api_version',
             'firefly.default_location',

app/Support/Http/Controllers/GetConfigurationData.php

@@ -25,6 +25,7 @@ namespace FireflyIII\Support\Http\Controllers;
 
 use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Trait GetConfigurationData
@@ -82,6 +83,8 @@ trait GetConfigurationData
     {
         $viewRange      = app('navigation')->getViewRange(false);
 
+        Log::debug(sprintf('dateRange: the view range is "%s"', $viewRange));
+
         /** @var Carbon $start */
         $start          = session('start');
 
@@ -97,6 +100,7 @@ trait GetConfigurationData
             // first range is the current range:
             $title => [$start, $end],
         ];
+        Log::debug(sprintf('dateRange: the date range in the session is"%s" - "%s"', $start->format('Y-m-d'), $end->format('Y-m-d')));
 
         // when current range is a custom range, add the current period as the next range.
         if ($isCustom) {

app/Support/Notifications/UrlValidator.php

@@ -31,6 +31,6 @@ class UrlValidator
 {
     public static function isValidWebhookURL(string $url): bool
     {
-        return str_starts_with($url, 'https://hooks.slack.com/services/') || str_starts_with($url, 'https://discord.com/api/webhooks/');
+        return str_starts_with($url, 'https://hooks.slack.com/services/') || str_starts_with($url, 'https://discord.com/api/webhooks/') || str_ends_with($url, '/slack');
     }
 }

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:

app/Support/System/OAuthKeys.php

@@ -88,7 +88,7 @@ class OAuthKeys
     public static function generateKeys(): void
     {
         \Artisan::registerCommand(new KeysCommand());
-        \Artisan::call('passport:keys');
+        \Artisan::call('firefly-iii:laravel-passport-keys');
     }
 
     public static function storeKeysInDB(): void

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;

app/Transformers/V2/AccountTransformer.php

@@ -137,6 +137,18 @@ class AccountTransformer extends AbstractTransformer
                         return $rightBalance <=> $leftBalance;
                     });
                 }
+                if ('last_activity' === $column) {
+                    $dates   = $this->lastActivity;
+                    $objects = $objects->sort(function (Account $left, Account $right) use ($dates, $direction) {
+                        $leftDate  = $dates[$left->id] ?? Carbon::create(1900, 1, 1, 0, 0, 0);
+                        $rightDate = $dates[$right->id] ?? Carbon::create(1900, 1, 1, 0, 0, 0);
+                        if ('asc' === $direction) {
+                            return $leftDate->gt($rightDate) ? 1 : -1;
+                        }
+
+                        return $rightDate->gt($leftDate) ? 1 : -1;
+                    });
+                }
             }
         }
 
@@ -168,7 +180,7 @@ class AccountTransformer extends AbstractTransformer
 
         // no currency? use default
         $currency      = $this->default;
-        if (array_key_exists($id, $this->accountMeta) && 0 !== (int)$this->accountMeta[$id]['currency_id']) {
+        if (array_key_exists($id, $this->accountMeta) && 0 !== (int)($this->accountMeta[$id]['currency_id'] ?? 0)) {
             $currency = $this->currencies[(int)$this->accountMeta[$id]['currency_id']];
         }
         // amounts and calculation.

changelog.md

@@ -3,14 +3,50 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## 6.1.11 - 2024-03-25
+## 6.1.12 - 2024-03-21
+
+### Fixed
+
+- Exclude debug files from release zip file
+- Drop a duplicate index
+- Replace broken Laravel Passport commands
+- [Issue 8692](https://github.com/firefly-iii/firefly-iii/issues/8692) (passport:install step issue when upgrading to 6.1.11) reported by @captainark
+- [Discussion 8694](https://github.com/orgs/firefly-iii/discussions/8694) (Getting error on accessing admin panel of Firefly 6.1.11) started by @jameswill
+
+## 6.1.11 - 2024-03-20
+
+### Added
+
+- New expression engine by @michaelhthomas, still disabled though.
+- Missing database indexes to speed up performance.
+- A button to the experimental `v2`-layout to go back to `v1`.
+
+### Changed
+
+- New login/register screens
+- New CSP headers
+
+### Deprecated
+
+- Dropped all old v3 code.
+- Dropped all generated JS and CSS, thanks @paulius-valiunas!
+
+### Fixed
+
+- [Discussion 8569](https://github.com/orgs/firefly-iii/discussions/8569) (What is classed as an "automatic transaction" when it comes to notifications?) started by @digitlength
+- [Issue 8608](https://github.com/firefly-iii/firefly-iii/issues/8608) (404 error when deleting a category) reported by @Jademalo
+- [Issue 8616](https://github.com/firefly-iii/firefly-iii/issues/8616) (Create right now option for recurring transaction missing during weekend) reported by @Transportman
+- [PR 8634](https://github.com/firefly-iii/firefly-iii/pull/8634) ([trivial] fix broken link in readme) reported by @WardenJakx
+- [Issue 8632](https://github.com/firefly-iii/firefly-iii/issues/8632) (No search results returned when using `tag_contains` and `tag_starts`) reported by @Call-Me-G-Now
+- [Issue 8663](https://github.com/firefly-iii/firefly-iii/issues/8663) (Graph error on Reports) reported by @nicolopozzato
+- [Issue 8671](https://github.com/firefly-iii/firefly-iii/issues/8671) (Rule with -has_any_category:true trigger not triggering) reported by @pvieira84
+- [Issue 8672](https://github.com/firefly-iii/firefly-iii/issues/8672) (Can't remove foreign amount using the trash icon) reported by @danielnetop
+- [Issue 8668](https://github.com/firefly-iii/firefly-iii/issues/8668) (Not possible to upload CSV file as an attachment) reported by @dbtdsilva
 
 ### Removed
 
 - Support for Mandrill because the necessary packages aren't maintained anymore.
 
-
-
 ## 6.1.10 - 2024-03-03
 
 ### Added

composer.json

@@ -167,7 +167,7 @@
             "@php artisan firefly-iii:upgrade-database",
             "@php artisan firefly-iii:correct-database",
             "@php artisan firefly-iii:report-integrity",
-            "@php artisan passport:install",
+            "@php artisan firefly-iii:laravel-passport-keys",
             "@php artisan firefly:instructions update"
         ],
         "post-install-cmd": [

composer.lock

@@ -1670,16 +1670,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.0.7",
+            "version": "v11.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "28eabe9dcdcb017a21ce226eda4538c5c8c93b1c"
+                "reference": "1437cea6d2b04cbc83743fbb208e1a01efccd9ec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/28eabe9dcdcb017a21ce226eda4538c5c8c93b1c",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/1437cea6d2b04cbc83743fbb208e1a01efccd9ec",
-                "reference": "28eabe9dcdcb017a21ce226eda4538c5c8c93b1c",
+                "reference": "1437cea6d2b04cbc83743fbb208e1a01efccd9ec",
                 "shasum": ""
             },
             "require": {
@@ -1782,7 +1782,7 @@
                 "league/flysystem-sftp-v3": "^3.0",
                 "mockery/mockery": "^1.6",
                 "nyholm/psr7": "^1.2",
-                "orchestra/testbench-core": "^9.0",
+                "orchestra/testbench-core": "^9.0.6",
                 "pda/pheanstalk": "^5.0",
                 "phpstan/phpstan": "^1.4.7",
                 "phpunit/phpunit": "^10.5|^11.0",
@@ -1871,20 +1871,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-03-15T23:17:58+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",
+                "url": "https://api.github.com/repos/laravel/passport/zipball/21099f1aff81706781578a19335d8a4c7c96422a",
-                "reference": "37a5b5fbcae25dbb7c6a973957c2ce490e76946e",
+                "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",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/8ee9f87f7f9eadcbe21e9e72cd4176b2f06cd5b5",
-                "reference": "ca6872ab6aec3ab61db3a61f83a6caf764ec7781",
+                "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",
+                "url": "https://api.github.com/repos/laravel/sanctum/zipball/d1de99bf8d31199aaf93881561622489ab91ba58",
-                "reference": "9e6e561308cace166de9ceae4ced820309fa8e13",
+                "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",
+                "url": "https://api.github.com/repos/laravel/ui/zipball/a3562953123946996a503159199d6742d5534e61",
-                "reference": "da3811f409297d13feccd5858ce748e7474b3d11",
+                "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",
@@ -2725,16 +2728,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "3.25.1",
+            "version": "3.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "abbd664eb4381102c559d358420989f835208f18"
+                "reference": "072735c56cc0da00e10716dd90d5a7f7b40b36be"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/abbd664eb4381102c559d358420989f835208f18",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/072735c56cc0da00e10716dd90d5a7f7b40b36be",
-                "reference": "abbd664eb4381102c559d358420989f835208f18",
+                "reference": "072735c56cc0da00e10716dd90d5a7f7b40b36be",
                 "shasum": ""
             },
             "require": {
@@ -2799,7 +2802,7 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/3.25.1"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.26.0"
             },
             "funding": [
                 {
@@ -2811,7 +2814,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-16T12:53:19+00:00"
+            "time": "2024-03-25T11:49:53+00:00"
         },
         {
             "name": "league/flysystem-local",
@@ -3088,16 +3091,16 @@
         },
         {
             "name": "league/uri",
-            "version": "7.4.0",
+            "version": "7.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/uri.git",
-                "reference": "bf414ba956d902f5d98bf9385fcf63954f09dce5"
+                "reference": "bedb6e55eff0c933668addaa7efa1e1f2c417cc4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/uri/zipball/bf414ba956d902f5d98bf9385fcf63954f09dce5",
+                "url": "https://api.github.com/repos/thephpleague/uri/zipball/bedb6e55eff0c933668addaa7efa1e1f2c417cc4",
-                "reference": "bf414ba956d902f5d98bf9385fcf63954f09dce5",
+                "reference": "bedb6e55eff0c933668addaa7efa1e1f2c417cc4",
                 "shasum": ""
             },
             "require": {
@@ -3166,7 +3169,7 @@
                 "docs": "https://uri.thephpleague.com",
                 "forum": "https://thephpleague.slack.com",
                 "issues": "https://github.com/thephpleague/uri-src/issues",
-                "source": "https://github.com/thephpleague/uri/tree/7.4.0"
+                "source": "https://github.com/thephpleague/uri/tree/7.4.1"
             },
             "funding": [
                 {
@@ -3174,20 +3177,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-12-01T06:24:25+00:00"
+            "time": "2024-03-23T07:42:40+00:00"
         },
         {
             "name": "league/uri-interfaces",
-            "version": "7.4.0",
+            "version": "7.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/uri-interfaces.git",
-                "reference": "bd8c487ec236930f7bbc42b8d374fa882fbba0f3"
+                "reference": "8d43ef5c841032c87e2de015972c06f3865ef718"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/bd8c487ec236930f7bbc42b8d374fa882fbba0f3",
+                "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/8d43ef5c841032c87e2de015972c06f3865ef718",
-                "reference": "bd8c487ec236930f7bbc42b8d374fa882fbba0f3",
+                "reference": "8d43ef5c841032c87e2de015972c06f3865ef718",
                 "shasum": ""
             },
             "require": {
@@ -3250,7 +3253,7 @@
                 "docs": "https://uri.thephpleague.com",
                 "forum": "https://thephpleague.slack.com",
                 "issues": "https://github.com/thephpleague/uri-src/issues",
-                "source": "https://github.com/thephpleague/uri-interfaces/tree/7.4.0"
+                "source": "https://github.com/thephpleague/uri-interfaces/tree/7.4.1"
             },
             "funding": [
                 {
@@ -3258,7 +3261,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-11-24T15:40:42+00:00"
+            "time": "2024-03-23T07:42:40+00:00"
         },
         {
             "name": "monolog/monolog",
@@ -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",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4d599a6e2351d6b6bf21737accdfe1a4ce3fdbb1",
-                "reference": "34ccf6f6b49c915421c7886c88c0cb77f3ebbfd2",
+                "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",
+                "friendsofphp/php-cs-fixer": "^3.52.1",
-                "kylekatarnls/multi-tester": "^2.2.0",
+                "kylekatarnls/multi-tester": "^2.5.3",
-                "ondrejmirtes/better-reflection": "^6.11.0.0",
+                "ondrejmirtes/better-reflection": "^6.25.0.4",
-                "phpmd/phpmd": "^2.13.0",
+                "phpmd/phpmd": "^2.15.0",
-                "phpstan/extension-installer": "^1.3.0",
+                "phpstan/extension-installer": "^1.3.1",
-                "phpstan/phpstan": "^1.10.20",
+                "phpstan/phpstan": "^1.10.65",
-                "phpunit/phpunit": "^10.2.2",
+                "phpunit/phpunit": "^10.5.15",
-                "squizlabs/php_codesniffer": "^3.7.2"
+                "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",
+                "url": "https://api.github.com/repos/spatie/ignition/zipball/889bf1dfa59e161590f677728b47bf4a6893983b",
-                "reference": "5b6f801c605a593106b623e45ca41496a6e7d56d",
+                "reference": "889bf1dfa59e161590f677728b47bf4a6893983b",
                 "shasum": ""
             },
             "require": {
@@ -5396,20 +5399,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-01-03T15:49:39+00:00"
+            "time": "2024-03-29T14:03:47+00:00"
         },
         {
             "name": "spatie/laravel-html",
-            "version": "3.6.0",
+            "version": "3.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-html.git",
-                "reference": "96ee6fc6b6484150c10c23985b3826b066aafc52"
+                "reference": "df15763c190954ee46a74e0bf5b4b5bbf2e1f170"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-html/zipball/96ee6fc6b6484150c10c23985b3826b066aafc52",
+                "url": "https://api.github.com/repos/spatie/laravel-html/zipball/df15763c190954ee46a74e0bf5b4b5bbf2e1f170",
-                "reference": "96ee6fc6b6484150c10c23985b3826b066aafc52",
+                "reference": "df15763c190954ee46a74e0bf5b4b5bbf2e1f170",
                 "shasum": ""
             },
             "require": {
@@ -5466,7 +5469,7 @@
                 "spatie"
             ],
             "support": {
-                "source": "https://github.com/spatie/laravel-html/tree/3.6.0"
+                "source": "https://github.com/spatie/laravel-html/tree/3.7.0"
             },
             "funding": [
                 {
@@ -5474,20 +5477,20 @@
                     "type": "custom"
                 }
             ],
-            "time": "2024-03-08T11:56:06+00:00"
+            "time": "2024-03-23T11:28:29+00:00"
         },
         {
             "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",
+                "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/e23f4e8ce6644dc3d68b9d8a0aed3beaca0d6ada",
-                "reference": "351504f4570e32908839fc5a2dc53bf77d02f85e",
+                "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",
@@ -9669,16 +9672,16 @@
         },
         {
             "name": "mockery/mockery",
-            "version": "1.6.9",
+            "version": "1.6.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mockery/mockery.git",
-                "reference": "0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06"
+                "reference": "81a161d0b135df89951abd52296adf97deb0723d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mockery/mockery/zipball/0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06",
+                "url": "https://api.github.com/repos/mockery/mockery/zipball/81a161d0b135df89951abd52296adf97deb0723d",
-                "reference": "0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06",
+                "reference": "81a161d0b135df89951abd52296adf97deb0723d",
                 "shasum": ""
             },
             "require": {
@@ -9690,8 +9693,8 @@
                 "phpunit/phpunit": "<8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5 || ^9.6.10",
+                "phpunit/phpunit": "^8.5 || ^9.6.17",
-                "symplify/easy-coding-standard": "^12.0.8"
+                "symplify/easy-coding-standard": "^12.1.14"
             },
             "type": "library",
             "autoload": {
@@ -9748,7 +9751,7 @@
                 "security": "https://github.com/mockery/mockery/security/advisories",
                 "source": "https://github.com/mockery/mockery"
             },
-            "time": "2023-12-10T02:24:34+00:00"
+            "time": "2024-03-21T18:34:15+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -10230,16 +10233,16 @@
         },
         {
             "name": "phpstan/phpdoc-parser",
-            "version": "1.26.0",
+            "version": "1.27.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "231e3186624c03d7e7c890ec662b81e6b0405227"
+                "reference": "86e4d5a4b036f8f0be1464522f4c6b584c452757"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/231e3186624c03d7e7c890ec662b81e6b0405227",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/86e4d5a4b036f8f0be1464522f4c6b584c452757",
-                "reference": "231e3186624c03d7e7c890ec662b81e6b0405227",
+                "reference": "86e4d5a4b036f8f0be1464522f4c6b584c452757",
                 "shasum": ""
             },
             "require": {
@@ -10271,22 +10274,22 @@
             "description": "PHPDoc parser with support for nullable, intersection and generic types",
             "support": {
                 "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.26.0"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.27.0"
             },
-            "time": "2024-02-23T16:05:55+00:00"
+            "time": "2024-03-21T13:14:53+00:00"
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.63",
+            "version": "1.10.66",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "ad12836d9ca227301f5fb9960979574ed8628339"
+                "reference": "94779c987e4ebd620025d9e5fdd23323903950bd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ad12836d9ca227301f5fb9960979574ed8628339",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/94779c987e4ebd620025d9e5fdd23323903950bd",
-                "reference": "ad12836d9ca227301f5fb9960979574ed8628339",
+                "reference": "94779c987e4ebd620025d9e5fdd23323903950bd",
                 "shasum": ""
             },
             "require": {
@@ -10335,7 +10338,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-03-18T16:53:53+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.13",
+            "version": "10.5.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "20a63fc1c6db29b15da3bd02d4b6cf59900088a7"
+                "reference": "18f8d4a5f52b61fdd9370aaae3167daa0eeb69cd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/20a63fc1c6db29b15da3bd02d4b6cf59900088a7",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/18f8d4a5f52b61fdd9370aaae3167daa0eeb69cd",
-                "reference": "20a63fc1c6db29b15da3bd02d4b6cf59900088a7",
+                "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.13"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.16"
             },
             "funding": [
                 {
@@ -10854,7 +10857,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-03-12T15:37:41+00:00"
+            "time": "2024-03-28T10:08:10+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -11228,16 +11231,16 @@
         },
         {
             "name": "sebastian/environment",
-            "version": "6.0.1",
+            "version": "6.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "43c751b41d74f96cbbd4e07b7aec9675651e2951"
+                "reference": "8074dbcd93529b357029f5cc5058fd3e43666984"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/43c751b41d74f96cbbd4e07b7aec9675651e2951",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/8074dbcd93529b357029f5cc5058fd3e43666984",
-                "reference": "43c751b41d74f96cbbd4e07b7aec9675651e2951",
+                "reference": "8074dbcd93529b357029f5cc5058fd3e43666984",
                 "shasum": ""
             },
             "require": {
@@ -11252,7 +11255,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "6.0-dev"
+                    "dev-main": "6.1-dev"
                 }
             },
             "autoload": {
@@ -11280,7 +11283,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
                 "security": "https://github.com/sebastianbergmann/environment/security/policy",
-                "source": "https://github.com/sebastianbergmann/environment/tree/6.0.1"
+                "source": "https://github.com/sebastianbergmann/environment/tree/6.1.0"
             },
             "funding": [
                 {
@@ -11288,7 +11291,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-04-11T05:39:26+00:00"
+            "time": "2024-03-23T08:47:14+00:00"
         },
         {
             "name": "sebastian/exporter",

config/firefly.php

@@ -117,8 +117,8 @@ return [
         'expression_engine' => false,
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => 'develop/2024-03-19',
+    'version'                      => 'develop/2024-03-31',
-    'api_version'                  => '2.0.12',
+    'api_version'                  => '2.0.13',
     'db_version'                   => 23,
 
     // generic settings
@@ -922,7 +922,7 @@ return [
     'sorting'                      => [
         'allowed' => [
             'transactions' => ['description', 'amount'],
-            'accounts'     => ['name', 'active', 'iban', 'balance'],
+            'accounts'     => ['name', 'active', 'iban', 'balance', 'last_activity'],
         ],
     ],
 ];

database/migrations/2024_03_03_174645_add_indices.php

@@ -24,7 +24,6 @@ return new class () extends Migration {
             'journal_meta'                 => ['transaction_journal_id', 'data', 'name'],
             'category_transaction_journal' => ['transaction_journal_id'],
             'categories'                   => ['user_id', 'user_group_id'],
-            'transaction_currencies'       => ['code'],
             'transaction_groups'           => ['user_id', 'user_group_id'],
             'transaction_journals'         => ['user_id', 'user_group_id', 'date', 'transaction_group_id', 'transaction_type_id', 'transaction_currency_id', 'bill_id'],
             'transactions'                 => ['account_id', 'transaction_journal_id', 'transaction_currency_id', 'foreign_currency_id'],

package-lock.json

@@ -33,40 +33,45 @@
                 "laravel-vite-plugin": "^0.8.1",
                 "patch-package": "^8.0.0",
                 "sass": "^1.72.0",
-                "vite": "^4.5.2",
+                "vite": "^4.5.3",
                 "vite-plugin-manifest-sri": "^0.1.0"
             }
         },
         "node_modules/@ag-grid-community/client-side-row-model": {
-            "version": "31.1.1",
+            "version": "31.2.0",
-            "resolved": "https://registry.npmjs.org/@ag-grid-community/client-side-row-model/-/client-side-row-model-31.1.1.tgz",
+            "resolved": "https://registry.npmjs.org/@ag-grid-community/client-side-row-model/-/client-side-row-model-31.2.0.tgz",
-            "integrity": "sha512-KBSPaEJ1q97xooJd7U6W8PUfzUDecnsvE+Y05Xg/s6i61fLKyDTxDVJB/kETxdST0+T8FgjFMaPjY0hAZBOhWg==",
+            "integrity": "sha512-fiXFGUaOCZdJ5QSJaWIyeA+hzjOe0+KzU1PdxqUdUZiNmDv/MFQQd99Biyk76OS6i8eWDFcC1O/V7owfVTWflw==",
             "dependencies": {
-                "@ag-grid-community/core": "31.1.1"
+                "@ag-grid-community/core": "31.2.0",
+                "tslib": "^2.3.0"
             }
         },
         "node_modules/@ag-grid-community/core": {
-            "version": "31.1.1",
+            "version": "31.2.0",
-            "resolved": "https://registry.npmjs.org/@ag-grid-community/core/-/core-31.1.1.tgz",
+            "resolved": "https://registry.npmjs.org/@ag-grid-community/core/-/core-31.2.0.tgz",
-            "integrity": "sha512-WFN3yXpFR0uMJQZak6x4kzLl7nJPrrorUWf/KWH4ToP6PMZcc6cKT3jge3bJ0SBkzs2m7oQGnmi8rfTaHuXI4Q=="
+            "integrity": "sha512-297AR2Z0i6zdpo+d1riWE9TpbsQ956Sd3rkgnjDaFzgGClsdy0SwInBs2281CHjaLQAhPzFelZ5XwcDTxHl4Tw==",
+            "dependencies": {
+                "tslib": "^2.3.0"
+            }
         },
         "node_modules/@ag-grid-community/infinite-row-model": {
-            "version": "31.1.1",
+            "version": "31.2.0",
-            "resolved": "https://registry.npmjs.org/@ag-grid-community/infinite-row-model/-/infinite-row-model-31.1.1.tgz",
+            "resolved": "https://registry.npmjs.org/@ag-grid-community/infinite-row-model/-/infinite-row-model-31.2.0.tgz",
-            "integrity": "sha512-cOuqOZD+V0ShwlxZy0Q5UJAD4ixO9GteCsJyvueAybq7BO8MfYCfjAS+Wk/z6hPEsuoGLk6lupIzneNVyDmzfA==",
+            "integrity": "sha512-SS+RqziA1koxMruHnL3hwJCv8RALldmueah9NrqDj2HSja83NLf+gKluBGfKsFlQei+wG0+vF50fOrtb2OGu2Q==",
             "dependencies": {
-                "@ag-grid-community/core": "31.1.1"
+                "@ag-grid-community/core": "31.2.0",
+                "tslib": "^2.3.0"
             }
         },
         "node_modules/@ag-grid-community/styles": {
-            "version": "31.1.1",
+            "version": "31.2.0",
-            "resolved": "https://registry.npmjs.org/@ag-grid-community/styles/-/styles-31.1.1.tgz",
+            "resolved": "https://registry.npmjs.org/@ag-grid-community/styles/-/styles-31.2.0.tgz",
-            "integrity": "sha512-Q44beV3vD1jydB0smro9+nJY9g60uSjQ+cM8cHEIS9gDCG/37WiabdtQybJceeIHbne51MJPtOAa89y/TfnbQg=="
+            "integrity": "sha512-fU6wDpK0//dJLp5pwojuTUQPi4nVZ4iTBF1yaQw+6NXeGi0ma7rz7IOS6Idw0XXE3ELKGTuO7QUJmxxdL7kykw=="
         },
         "node_modules/@babel/runtime": {
-            "version": "7.24.0",
+            "version": "7.24.1",
-            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.0.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.1.tgz",
-            "integrity": "sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw==",
+            "integrity": "sha512-+BIznRzyqBf+2wCTxcKE3wDjfGeCoVE61KSHGpkzqrLi8qxqFwBeUFyId2cxkTmm55fzDGnm0+yCxaxygrLUnQ==",
             "dependencies": {
                 "regenerator-runtime": "^0.14.0"
             },
@@ -542,12 +547,15 @@
             "dev": true
         },
         "node_modules/binary-extensions": {
-            "version": "2.2.0",
+            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+            "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
-            "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+            "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
             "dev": true,
             "engines": {
                 "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
         "node_modules/bootstrap": {
@@ -1067,9 +1075,9 @@
             }
         },
         "node_modules/hasown": {
-            "version": "2.0.1",
+            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.1.tgz",
+            "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-            "integrity": "sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==",
+            "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
             "dev": true,
             "dependencies": {
                 "function-bind": "^1.1.2"
@@ -1519,9 +1527,9 @@
             }
         },
         "node_modules/postcss": {
-            "version": "8.4.35",
+            "version": "8.4.38",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
-            "integrity": "sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==",
+            "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
             "dev": true,
             "funding": [
                 {
@@ -1540,7 +1548,7 @@
             "dependencies": {
                 "nanoid": "^3.3.7",
                 "picocolors": "^1.0.0",
-                "source-map-js": "^1.0.2"
+                "source-map-js": "^1.2.0"
             },
             "engines": {
                 "node": "^10 || ^12 || >=14"
@@ -1630,17 +1638,17 @@
             }
         },
         "node_modules/set-function-length": {
-            "version": "1.2.1",
+            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.1.tgz",
+            "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
-            "integrity": "sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==",
+            "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
             "dev": true,
             "dependencies": {
-                "define-data-property": "^1.1.2",
+                "define-data-property": "^1.1.4",
                 "es-errors": "^1.3.0",
                 "function-bind": "^1.1.2",
-                "get-intrinsic": "^1.2.3",
+                "get-intrinsic": "^1.2.4",
                 "gopd": "^1.0.1",
-                "has-property-descriptors": "^1.0.1"
+                "has-property-descriptors": "^1.0.2"
             },
             "engines": {
                 "node": ">= 0.4"
@@ -1677,9 +1685,9 @@
             }
         },
         "node_modules/source-map-js": {
-            "version": "1.0.2",
+            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+            "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
-            "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+            "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
             "dev": true,
             "engines": {
                 "node": ">=0.10.0"
@@ -1734,6 +1742,11 @@
             "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
             "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
         },
+        "node_modules/tslib": {
+            "version": "2.6.2",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+            "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+        },
         "node_modules/universalify": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
@@ -1744,9 +1757,9 @@
             }
         },
         "node_modules/vite": {
-            "version": "4.5.2",
+            "version": "4.5.3",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.2.tgz",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.3.tgz",
-            "integrity": "sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==",
+            "integrity": "sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==",
             "dev": true,
             "dependencies": {
                 "esbuild": "^0.18.10",

package.json

@@ -11,7 +11,7 @@
         "laravel-vite-plugin": "^0.8.1",
         "patch-package": "^8.0.0",
         "sass": "^1.72.0",
-        "vite": "^4.5.2",
+        "vite": "^4.5.3",
         "vite-plugin-manifest-sri": "^0.1.0"
     },
     "dependencies": {

public/v2/i18n/bg.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "\u041f\u043b\u0430\u0442\u0435\u043d\u0438",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "\u041d\u0435\u043f\u043b\u0430\u0442\u0435\u043d\u0438",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Suscripciones en el grupo \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unknown destination account",
         "unknown_any_plain": "Unknown account",
         "unknown_budget_plain": "No budget",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/bg_BG.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "\u041f\u043b\u0430\u0442\u0435\u043d\u0438",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "\u041d\u0435\u043f\u043b\u0430\u0442\u0435\u043d\u0438",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Suscripciones en el grupo \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unknown destination account",
         "unknown_any_plain": "Unknown account",
         "unknown_budget_plain": "No budget",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/ca.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Pagat",
-        "errors_submission_v2": "Hi ha hagut un error amb el teu enviament. Per favor, comprova els seg\u00fcents errors: %{errorMessage}",
+        "errors_submission_v2": "Hi ha hagut un error amb el teu enviament. Per favor, comprova els seg\u00fcents errors: {{errorMessage}}",
         "unpaid": "Pendent de pagament",
         "default_group_title_name_plain": "no agrupades",
         "subscriptions_in_group": "Subscripcions al grup \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Compte de dest\u00ed desconegut",
         "unknown_any_plain": "Compte desconegut",
         "unknown_budget_plain": "Cap pressupost",
-        "stored_journal_js": "S'ha creat la transacci\u00f3 \"%{description}\" correctament",
+        "stored_journal_js": "S'ha creat la transacci\u00f3 \"{{description}}\" correctament",
         "wait_loading_transaction": "Per favor, espera que carregui el formulari",
         "nothing_found": "(no s'ha trobat res)",
         "wait_loading_data": "Per favor, espera que carregui la teva informaci\u00f3...",
@@ -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"
     }
 }

public/v2/i18n/ca_ES.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Pagat",
-        "errors_submission_v2": "Hi ha hagut un error amb el teu enviament. Per favor, comprova els seg\u00fcents errors: %{errorMessage}",
+        "errors_submission_v2": "Hi ha hagut un error amb el teu enviament. Per favor, comprova els seg\u00fcents errors: {{errorMessage}}",
         "unpaid": "Pendent de pagament",
         "default_group_title_name_plain": "no agrupades",
         "subscriptions_in_group": "Subscripcions al grup \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Compte de dest\u00ed desconegut",
         "unknown_any_plain": "Compte desconegut",
         "unknown_budget_plain": "Cap pressupost",
-        "stored_journal_js": "S'ha creat la transacci\u00f3 \"%{description}\" correctament",
+        "stored_journal_js": "S'ha creat la transacci\u00f3 \"{{description}}\" correctament",
         "wait_loading_transaction": "Per favor, espera que carregui el formulari",
         "nothing_found": "(no s'ha trobat res)",
         "wait_loading_data": "Per favor, espera que carregui la teva informaci\u00f3...",
@@ -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"
     }
 }

public/v2/i18n/cs.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Zaplaceno",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Nezaplaceno",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unknown destination account",
         "unknown_any_plain": "Unknown account",
         "unknown_budget_plain": "No budget",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/cs_CZ.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Zaplaceno",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Nezaplaceno",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unknown destination account",
         "unknown_any_plain": "Unknown account",
         "unknown_budget_plain": "No budget",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/da.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Paid",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Ubetalt",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unknown destination account",
         "unknown_any_plain": "Unknown account",
         "unknown_budget_plain": "No budget",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/da_DK.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Paid",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Ubetalt",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unknown destination account",
         "unknown_any_plain": "Unknown account",
         "unknown_budget_plain": "No budget",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/de.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Bezahlt",
-        "errors_submission_v2": "Bei Ihren Eingaben stimmt etwas nicht. Bitte \u00fcberpr\u00fcfen Sie die nachfolgenden Fehler: %{errorMessage}",
+        "errors_submission_v2": "Bei Ihrer \u00dcbermittlung ist ein Fehler aufgetreten. Bitte \u00fcberpr\u00fcfen Sie die unten stehenden Fehler: {{errorMessage}}",
         "unpaid": "Unbezahlt",
         "default_group_title_name_plain": "ungruppiert",
         "subscriptions_in_group": "Abonnements in Gruppe \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unbekanntes Zielkonto",
         "unknown_any_plain": "Unbekanntes Konto",
         "unknown_budget_plain": "Kein Budget",
-        "stored_journal_js": "Neue Buchung \u201e%{description}\u201d erfolgreich erstellt",
+        "stored_journal_js": "Neue Buchung \u201e{{description}}\u201d erfolgreich erstellt",
         "wait_loading_transaction": "Bitte warten Sie, bis das Formular geladen wurde",
         "nothing_found": "(nichts gefunden)",
         "wait_loading_data": "Bitte warten Sie, bis Ihre Informationen geladen wurden \u2026",
@@ -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"
     }
 }

public/v2/i18n/de_DE.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Bezahlt",
-        "errors_submission_v2": "Bei Ihren Eingaben stimmt etwas nicht. Bitte \u00fcberpr\u00fcfen Sie die nachfolgenden Fehler: %{errorMessage}",
+        "errors_submission_v2": "Bei Ihrer \u00dcbermittlung ist ein Fehler aufgetreten. Bitte \u00fcberpr\u00fcfen Sie die unten stehenden Fehler: {{errorMessage}}",
         "unpaid": "Unbezahlt",
         "default_group_title_name_plain": "ungruppiert",
         "subscriptions_in_group": "Abonnements in Gruppe \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unbekanntes Zielkonto",
         "unknown_any_plain": "Unbekanntes Konto",
         "unknown_budget_plain": "Kein Budget",
-        "stored_journal_js": "Neue Buchung \u201e%{description}\u201d erfolgreich erstellt",
+        "stored_journal_js": "Neue Buchung \u201e{{description}}\u201d erfolgreich erstellt",
         "wait_loading_transaction": "Bitte warten Sie, bis das Formular geladen wurde",
         "nothing_found": "(nichts gefunden)",
         "wait_loading_data": "Bitte warten Sie, bis Ihre Informationen geladen wurden \u2026",
@@ -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"
     }
 }

public/v2/i18n/el.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "\u03a0\u03bb\u03b7\u03c1\u03c9\u03bc\u03ad\u03bd\u03bf",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "\u0391\u03c0\u03bb\u03ae\u03c1\u03c9\u03c4\u03bf",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unknown destination account",
         "unknown_any_plain": "Unknown account",
         "unknown_budget_plain": "No budget",
-        "stored_journal_js": "\u0394\u03b7\u03bc\u03b9\u03bf\u03c5\u03c1\u03b3\u03ae\u03b8\u03b7\u03ba\u03b5 \u03b5\u03c0\u03b9\u03c4\u03c5\u03c7\u03ce\u03c2 \u03b7 \u03bd\u03ad\u03b1 \u03c3\u03c5\u03bd\u03b1\u03bb\u03bb\u03b1\u03b3\u03ae \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/el_GR.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "\u03a0\u03bb\u03b7\u03c1\u03c9\u03bc\u03ad\u03bd\u03bf",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "\u0391\u03c0\u03bb\u03ae\u03c1\u03c9\u03c4\u03bf",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unknown destination account",
         "unknown_any_plain": "Unknown account",
         "unknown_budget_plain": "No budget",
-        "stored_journal_js": "\u0394\u03b7\u03bc\u03b9\u03bf\u03c5\u03c1\u03b3\u03ae\u03b8\u03b7\u03ba\u03b5 \u03b5\u03c0\u03b9\u03c4\u03c5\u03c7\u03ce\u03c2 \u03b7 \u03bd\u03ad\u03b1 \u03c3\u03c5\u03bd\u03b1\u03bb\u03bb\u03b1\u03b3\u03ae \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/en-gb.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Paid",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Unpaid",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unknown destination account",
         "unknown_any_plain": "Unknown account",
         "unknown_budget_plain": "No budget",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/en.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Paid",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Unpaid",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unknown destination account",
         "unknown_any_plain": "Unknown account",
         "unknown_budget_plain": "No budget",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/en_GB.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Paid",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Unpaid",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unknown destination account",
         "unknown_any_plain": "Unknown account",
         "unknown_budget_plain": "No budget",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/en_US.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Paid",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Unpaid",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unknown destination account",
         "unknown_any_plain": "Unknown account",
         "unknown_budget_plain": "No budget",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/es.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Pagado",
-        "errors_submission_v2": "Hubo un problema con su env\u00edo. Por favor, compruebe los siguientes errores: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "No pagado",
         "default_group_title_name_plain": "sin agrupar",
         "subscriptions_in_group": "Suscripciones en el grupo \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Direcci\u00f3n de destino desconocida",
         "unknown_any_plain": "Cuenta desconocida",
         "unknown_budget_plain": "Sin presupuesto",
-        "stored_journal_js": "Nueva transacci\u00f3n creada con \u00e9xito \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Por favor, espere a que se cargue el formulario",
         "nothing_found": "(no se encontr\u00f3 nada)",
         "wait_loading_data": "Por favor, espere a que su informaci\u00f3n se cargue...",
@@ -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"
     }
 }

public/v2/i18n/es_ES.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Pagado",
-        "errors_submission_v2": "Hubo un problema con su env\u00edo. Por favor, compruebe los siguientes errores: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "No pagado",
         "default_group_title_name_plain": "sin agrupar",
         "subscriptions_in_group": "Suscripciones en el grupo \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Direcci\u00f3n de destino desconocida",
         "unknown_any_plain": "Cuenta desconocida",
         "unknown_budget_plain": "Sin presupuesto",
-        "stored_journal_js": "Nueva transacci\u00f3n creada con \u00e9xito \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Por favor, espere a que se cargue el formulario",
         "nothing_found": "(no se encontr\u00f3 nada)",
         "wait_loading_data": "Por favor, espere a que su informaci\u00f3n se cargue...",
@@ -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"
     }
 }

public/v2/i18n/fi.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Maksettu",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Maksamatta",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unknown destination account",
         "unknown_any_plain": "Unknown account",
         "unknown_budget_plain": "No budget",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/fi_FI.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Maksettu",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Maksamatta",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unknown destination account",
         "unknown_any_plain": "Unknown account",
         "unknown_budget_plain": "No budget",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/fr.json

@@ -2,13 +2,18 @@
     "config": {
         "html_language": "fr",
         "date_time_fns": "do MMMM, yyyy @ HH:mm:ss",
-        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
+        "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": "Certaines informations ne sont pas correctes dans votre formulaire. Veuillez v\u00e9rifier les erreurs ci-dessous : %{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": "Op\u00e9ration \"%{description}\" cr\u00e9\u00e9e avec succ\u00e8s",
+        "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"
     }
 }

public/v2/i18n/fr_FR.json

@@ -2,13 +2,18 @@
     "config": {
         "html_language": "fr",
         "date_time_fns": "do MMMM, yyyy @ HH:mm:ss",
-        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
+        "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": "Certaines informations ne sont pas correctes dans votre formulaire. Veuillez v\u00e9rifier les erreurs ci-dessous : %{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": "Op\u00e9ration \"%{description}\" cr\u00e9\u00e9e avec succ\u00e8s",
+        "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"
     }
 }

public/v2/i18n/hu.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Kifizetve",
-        "errors_submission_v2": "Hiba t\u00f6rt\u00e9nt a bek\u00fcld\u00e9s sor\u00e1n. K\u00e9rlek jav\u00edtsd az al\u00e1bbi hib\u00e1kat: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Nincs fizetve",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unknown destination account",
         "unknown_any_plain": "Unknown account",
         "unknown_budget_plain": "No budget",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "\"{{description}}\" \u00faj tranzakci\u00f3 sikeresen l\u00e9trehozva",
         "wait_loading_transaction": "K\u00e9rlek v\u00e1rj az \u0171rlap bet\u00f6lt\u00e9s\u00e9ig",
         "nothing_found": "(nincs tal\u00e1lat)",
         "wait_loading_data": "K\u00e9rlek v\u00e1rj am\u00edg bet\u00f6ltj\u00fck az adatokat...",
@@ -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"
     }
 }

public/v2/i18n/hu_HU.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Kifizetve",
-        "errors_submission_v2": "Hiba t\u00f6rt\u00e9nt a bek\u00fcld\u00e9s sor\u00e1n. K\u00e9rlek jav\u00edtsd az al\u00e1bbi hib\u00e1kat: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Nincs fizetve",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unknown destination account",
         "unknown_any_plain": "Unknown account",
         "unknown_budget_plain": "No budget",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "\"{{description}}\" \u00faj tranzakci\u00f3 sikeresen l\u00e9trehozva",
         "wait_loading_transaction": "K\u00e9rlek v\u00e1rj az \u0171rlap bet\u00f6lt\u00e9s\u00e9ig",
         "nothing_found": "(nincs tal\u00e1lat)",
         "wait_loading_data": "K\u00e9rlek v\u00e1rj am\u00edg bet\u00f6ltj\u00fck az adatokat...",
@@ -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"
     }
 }

public/v2/i18n/id.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Dibayar",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Tidak dibayar",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unknown destination account",
         "unknown_any_plain": "Unknown account",
         "unknown_budget_plain": "No budget",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/id_ID.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Dibayar",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Tidak dibayar",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unknown destination account",
         "unknown_any_plain": "Unknown account",
         "unknown_budget_plain": "No budget",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/it.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Pagati",
-        "errors_submission_v2": "Errore durante l'invio. Controlla gli errori segnalati qui sotto: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Da pagare",
         "default_group_title_name_plain": "non raggruppato",
         "subscriptions_in_group": "Abbonamenti nel gruppo \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Conto di destinazione sconosciuto",
         "unknown_any_plain": "Conto sconosciuto",
         "unknown_budget_plain": "Nessun budget",
-        "stored_journal_js": "Nuova transazione \"%{description}\" creata correttamente",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Attendi il caricamento del modello",
         "nothing_found": "(nessun risultato)",
         "wait_loading_data": "Ti preghiamo di attendere il caricamento delle tue informazioni...",
@@ -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"
     }
 }

public/v2/i18n/it_IT.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Pagati",
-        "errors_submission_v2": "Errore durante l'invio. Controlla gli errori segnalati qui sotto: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Da pagare",
         "default_group_title_name_plain": "non raggruppato",
         "subscriptions_in_group": "Abbonamenti nel gruppo \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Conto di destinazione sconosciuto",
         "unknown_any_plain": "Conto sconosciuto",
         "unknown_budget_plain": "Nessun budget",
-        "stored_journal_js": "Nuova transazione \"%{description}\" creata correttamente",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Attendi il caricamento del modello",
         "nothing_found": "(nessun risultato)",
         "wait_loading_data": "Ti preghiamo di attendere il caricamento delle tue informazioni...",
@@ -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"
     }
 }

public/v2/i18n/ja.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "\u652f\u6255\u3044\u6e08\u307f",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "\u672a\u6255\u3044",
         "default_group_title_name_plain": "\u30b0\u30eb\u30fc\u30d7\u89e3\u9664",
         "subscriptions_in_group": "\u30b0\u30eb\u30fc\u30d7\u300c%{title}\u300d\u306e\u30b5\u30d6\u30b9\u30af\u30ea\u30d7\u30b7\u30e7\u30f3",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "\u4e0d\u660e\u306a\u9810\u3051\u5165\u308c\u53e3\u5ea7",
         "unknown_any_plain": "\u4e0d\u660e\u306a\u53e3\u5ea7",
         "unknown_budget_plain": "\u4e88\u7b97\u306a\u3057",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/ja_JP.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "\u652f\u6255\u3044\u6e08\u307f",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "\u672a\u6255\u3044",
         "default_group_title_name_plain": "\u30b0\u30eb\u30fc\u30d7\u89e3\u9664",
         "subscriptions_in_group": "\u30b0\u30eb\u30fc\u30d7\u300c%{title}\u300d\u306e\u30b5\u30d6\u30b9\u30af\u30ea\u30d7\u30b7\u30e7\u30f3",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "\u4e0d\u660e\u306a\u9810\u3051\u5165\u308c\u53e3\u5ea7",
         "unknown_any_plain": "\u4e0d\u660e\u306a\u53e3\u5ea7",
         "unknown_budget_plain": "\u4e88\u7b97\u306a\u3057",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/ko.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "\uc9c0\ubd88\ub428",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "\ubbf8\uc9c0\ubd88",
         "default_group_title_name_plain": "\uadf8\ub8f9 \ud574\uc81c\ub428",
         "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "\uc54c \uc218 \uc5c6\ub294 \ub300\uc0c1 \uacc4\uc815",
         "unknown_any_plain": "\uc54c \uc218 \uc5c6\ub294 \uacc4\uc815",
         "unknown_budget_plain": "\uc608\uc0b0 \uc5c6\uc74c",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/ko_KR.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "\uc9c0\ubd88\ub428",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "\ubbf8\uc9c0\ubd88",
         "default_group_title_name_plain": "\uadf8\ub8f9 \ud574\uc81c\ub428",
         "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "\uc54c \uc218 \uc5c6\ub294 \ub300\uc0c1 \uacc4\uc815",
         "unknown_any_plain": "\uc54c \uc218 \uc5c6\ub294 \uacc4\uc815",
         "unknown_budget_plain": "\uc608\uc0b0 \uc5c6\uc74c",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/nb.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Betalt",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Ikke betalt",
         "default_group_title_name_plain": "ikke gruppert",
         "subscriptions_in_group": "Abonnementer i gruppe \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Ukjent destinasjonskonto",
         "unknown_any_plain": "Ukjent konto",
         "unknown_budget_plain": "Mangler budsjett",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/nb_NO.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Betalt",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Ikke betalt",
         "default_group_title_name_plain": "ikke gruppert",
         "subscriptions_in_group": "Abonnementer i gruppe \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Ukjent destinasjonskonto",
         "unknown_any_plain": "Ukjent konto",
         "unknown_budget_plain": "Mangler budsjett",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/nl.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Betaald",
-        "errors_submission_v2": "Er ging iets mis. Check de errors: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Niet betaald",
         "default_group_title_name_plain": "ongegroepeerd",
         "subscriptions_in_group": "Abonnementen in groep \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Onbekende doelrekening",
         "unknown_any_plain": "Onbekende rekening",
         "unknown_budget_plain": "Geen budget",
-        "stored_journal_js": "Nieuw transactie \"%{description}\" opgeslagen",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Wacht even tot het formulier geladen is",
         "nothing_found": "(niets gevonden)",
         "wait_loading_data": "Wacht even tot de gegevens er zijn...",
@@ -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"
     }
 }

public/v2/i18n/nl_NL.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Betaald",
-        "errors_submission_v2": "Er ging iets mis. Check de errors: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Niet betaald",
         "default_group_title_name_plain": "ongegroepeerd",
         "subscriptions_in_group": "Abonnementen in groep \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Onbekende doelrekening",
         "unknown_any_plain": "Onbekende rekening",
         "unknown_budget_plain": "Geen budget",
-        "stored_journal_js": "Nieuw transactie \"%{description}\" opgeslagen",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Wacht even tot het formulier geladen is",
         "nothing_found": "(niets gevonden)",
         "wait_loading_data": "Wacht even tot de gegevens er zijn...",
@@ -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"
     }
 }

public/v2/i18n/nn.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Betalt",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Ikke betalt",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Abonnement i gruppa \u00ab%{title}\u00bb",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unknown destination account",
         "unknown_any_plain": "Unknown account",
         "unknown_budget_plain": "No budget",
-        "stored_journal_js": "Transaksjonen \u00ab%{description}\u00bb vart oppretta",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/nn_NO.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Betalt",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Ikke betalt",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Abonnement i gruppa \u00ab%{title}\u00bb",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unknown destination account",
         "unknown_any_plain": "Unknown account",
         "unknown_budget_plain": "No budget",
-        "stored_journal_js": "Transaksjonen \u00ab%{description}\u00bb vart oppretta",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/pl.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Zap\u0142acone",
-        "errors_submission_v2": "Co\u015b posz\u0142o nie tak w czasie zapisu. Prosz\u0119, sprawd\u017a b\u0142\u0119dy poni\u017cej: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Niezap\u0142acone",
         "default_group_title_name_plain": "bez grupy",
         "subscriptions_in_group": "Subskrypcje w grupie \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Nieznane konto docelowe",
         "unknown_any_plain": "Nieznane konto",
         "unknown_budget_plain": "Brak bud\u017cetu",
-        "stored_journal_js": "Pomy\u015blnie utworzono now\u0105 transakcj\u0119 \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Poczekaj na za\u0142adowanie formularza",
         "nothing_found": "(nic nie znaleziono)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/pl_PL.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Zap\u0142acone",
-        "errors_submission_v2": "Co\u015b posz\u0142o nie tak w czasie zapisu. Prosz\u0119, sprawd\u017a b\u0142\u0119dy poni\u017cej: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Niezap\u0142acone",
         "default_group_title_name_plain": "bez grupy",
         "subscriptions_in_group": "Subskrypcje w grupie \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Nieznane konto docelowe",
         "unknown_any_plain": "Nieznane konto",
         "unknown_budget_plain": "Brak bud\u017cetu",
-        "stored_journal_js": "Pomy\u015blnie utworzono now\u0105 transakcj\u0119 \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Poczekaj na za\u0142adowanie formularza",
         "nothing_found": "(nic nie znaleziono)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/pt-br.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Pago",
-        "errors_submission_v2": "Algo deu errado com seu envio. Por favor, verifique os erros abaixo: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "N\u00e3o pago",
         "default_group_title_name_plain": "sem grupo",
         "subscriptions_in_group": "Assinaturas no grupo \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Conta de destino desconhecida",
         "unknown_any_plain": "Conta desconhecida",
         "unknown_budget_plain": "Nenhum or\u00e7amento",
-        "stored_journal_js": "Transa\u00e7\u00e3o \"%{description}\" criada com sucesso",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Por favor, aguarde o formul\u00e1rio carregar",
         "nothing_found": "(nada encontrado)",
         "wait_loading_data": "Por favor, aguarde suas informa\u00e7\u00f5es serem carregadas...",
@@ -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"
     }
 }

public/v2/i18n/pt.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Pago",
-        "errors_submission_v2": "Algo correu mal com o envio dos dados. Por favor verifique e corrija os erros abaixo: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Por pagar",
         "default_group_title_name_plain": "sem grupo",
         "subscriptions_in_group": "Subscri\u00e7\u00e3o no grupo \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Conta de destino desconhecida",
         "unknown_any_plain": "Conta desconhecida",
         "unknown_budget_plain": "Sem or\u00e7amento",
-        "stored_journal_js": "A transa\u00e7\u00e3o \"%{description}\" foi criada com sucesso",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Por favor, aguarde o formul\u00e1rio carregar",
         "nothing_found": "(sem resultados)",
         "wait_loading_data": "Por favor, aguarde enquanto carregamos a sua informa\u00e7\u00e3o...",
@@ -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"
     }
 }

public/v2/i18n/pt_BR.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Pago",
-        "errors_submission_v2": "Algo deu errado com seu envio. Por favor, verifique os erros abaixo: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "N\u00e3o pago",
         "default_group_title_name_plain": "sem grupo",
         "subscriptions_in_group": "Assinaturas no grupo \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Conta de destino desconhecida",
         "unknown_any_plain": "Conta desconhecida",
         "unknown_budget_plain": "Nenhum or\u00e7amento",
-        "stored_journal_js": "Transa\u00e7\u00e3o \"%{description}\" criada com sucesso",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Por favor, aguarde o formul\u00e1rio carregar",
         "nothing_found": "(nada encontrado)",
         "wait_loading_data": "Por favor, aguarde suas informa\u00e7\u00f5es serem carregadas...",
@@ -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"
     }
 }

public/v2/i18n/pt_PT.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Pago",
-        "errors_submission_v2": "Algo correu mal com o envio dos dados. Por favor verifique e corrija os erros abaixo: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Por pagar",
         "default_group_title_name_plain": "sem grupo",
         "subscriptions_in_group": "Subscri\u00e7\u00e3o no grupo \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Conta de destino desconhecida",
         "unknown_any_plain": "Conta desconhecida",
         "unknown_budget_plain": "Sem or\u00e7amento",
-        "stored_journal_js": "A transa\u00e7\u00e3o \"%{description}\" foi criada com sucesso",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Por favor, aguarde o formul\u00e1rio carregar",
         "nothing_found": "(sem resultados)",
         "wait_loading_data": "Por favor, aguarde enquanto carregamos a sua informa\u00e7\u00e3o...",
@@ -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"
     }
 }

public/v2/i18n/ro.json

@@ -1,14 +1,19 @@
 {
     "config": {
         "html_language": "ro",
-        "date_time_fns": "MMMM do, yyyy @ HH:mm:ss",
+        "date_time_fns": "MMMM do yyy @ HH:mm:ss",
-        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
+        "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",
         "paid": "Pl\u0103tit",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Nepl\u0103tit",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
@@ -17,27 +22,32 @@
         "money_flowing_in": "\u00cen",
         "money_flowing_out": "Afar\u0103",
         "category": "Categorie",
-        "unknown_category_plain": "No category",
+        "unknown_category_plain": "Nici o categorie",
-        "all_money": "All your money",
+        "all_money": "To\u021bi banii t\u0103i",
-        "unknown_source_plain": "Unknown source account",
+        "unknown_source_plain": "Cont surs\u0103 necunoscut",
-        "unknown_dest_plain": "Unknown destination account",
+        "unknown_dest_plain": "Cont de destina\u021bie necunoscut",
-        "unknown_any_plain": "Unknown account",
+        "unknown_any_plain": "Cont necunoscut",
-        "unknown_budget_plain": "No budget",
+        "unknown_budget_plain": "F\u0103r\u0103 buget",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
-        "wait_loading_transaction": "Please wait for the form to load",
+        "wait_loading_transaction": "V\u0103 rug\u0103m s\u0103 a\u015ftepta\u0163i ca formularul s\u0103 se \u00eencarce",
-        "nothing_found": "(nothing found)",
+        "nothing_found": "nu a fost g\u0103sit nimic",
-        "wait_loading_data": "Please wait for your information to load...",
+        "wait_loading_data": "V\u0103 rug\u0103m s\u0103 a\u0219tepta\u021bi ca informa\u021biile dvs. s\u0103 se \u00eencarce...",
         "Transfer": "Transfer",
         "Withdrawal": "Retragere",
         "Deposit": "Depozit",
         "expense_account": "Expense account",
-        "revenue_account": "Revenue account",
+        "revenue_account": "Cont de venituri",
         "budget": "Buget",
-        "account_type_Asset account": "Asset account",
+        "account_type_Asset account": "Cont de activ",
-        "account_type_Expense account": "Expense account",
+        "account_type_Expense account": "Cont de cheltuieli",
-        "account_type_Revenue account": "Revenue account",
+        "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"
     }
 }

public/v2/i18n/ro_RO.json

@@ -1,14 +1,19 @@
 {
     "config": {
         "html_language": "ro",
-        "date_time_fns": "MMMM do, yyyy @ HH:mm:ss",
+        "date_time_fns": "MMMM do yyy @ HH:mm:ss",
-        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
+        "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",
         "paid": "Pl\u0103tit",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Nepl\u0103tit",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
@@ -17,27 +22,32 @@
         "money_flowing_in": "\u00cen",
         "money_flowing_out": "Afar\u0103",
         "category": "Categorie",
-        "unknown_category_plain": "No category",
+        "unknown_category_plain": "Nici o categorie",
-        "all_money": "All your money",
+        "all_money": "To\u021bi banii t\u0103i",
-        "unknown_source_plain": "Unknown source account",
+        "unknown_source_plain": "Cont surs\u0103 necunoscut",
-        "unknown_dest_plain": "Unknown destination account",
+        "unknown_dest_plain": "Cont de destina\u021bie necunoscut",
-        "unknown_any_plain": "Unknown account",
+        "unknown_any_plain": "Cont necunoscut",
-        "unknown_budget_plain": "No budget",
+        "unknown_budget_plain": "F\u0103r\u0103 buget",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
-        "wait_loading_transaction": "Please wait for the form to load",
+        "wait_loading_transaction": "V\u0103 rug\u0103m s\u0103 a\u015ftepta\u0163i ca formularul s\u0103 se \u00eencarce",
-        "nothing_found": "(nothing found)",
+        "nothing_found": "nu a fost g\u0103sit nimic",
-        "wait_loading_data": "Please wait for your information to load...",
+        "wait_loading_data": "V\u0103 rug\u0103m s\u0103 a\u0219tepta\u021bi ca informa\u021biile dvs. s\u0103 se \u00eencarce...",
         "Transfer": "Transfer",
         "Withdrawal": "Retragere",
         "Deposit": "Depozit",
         "expense_account": "Expense account",
-        "revenue_account": "Revenue account",
+        "revenue_account": "Cont de venituri",
         "budget": "Buget",
-        "account_type_Asset account": "Asset account",
+        "account_type_Asset account": "Cont de activ",
-        "account_type_Expense account": "Expense account",
+        "account_type_Expense account": "Cont de cheltuieli",
-        "account_type_Revenue account": "Revenue account",
+        "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"
     }
 }

public/v2/i18n/ru.json

@@ -2,13 +2,18 @@
     "config": {
         "html_language": "ru",
         "date_time_fns": "Do MMMM yyyy, @ HH:mm:ss",
-        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
+        "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",
         "paid": "\u041e\u043f\u043b\u0430\u0447\u0435\u043d\u043e",
-        "errors_submission_v2": "\u0421 \u0432\u0430\u0448\u0435\u0439 \u043f\u0443\u0431\u043b\u0438\u043a\u0430\u0446\u0438\u0435\u0439 \u043f\u0440\u043e\u0438\u0437\u043e\u0448\u043b\u0430 \u043e\u0448\u0438\u0431\u043a\u0430. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0435 \u043e\u0448\u0438\u0431\u043a\u0438: %{errorMessage}",
+        "errors_submission_v2": "\u0421 \u0432\u0430\u0448\u0435\u0439 \u043f\u0443\u0431\u043b\u0438\u043a\u0430\u0446\u0438\u0435\u0439 \u043f\u0440\u043e\u0438\u0437\u043e\u0448\u043b\u0430 \u043e\u0448\u0438\u0431\u043a\u0430. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0435 \u043e\u0448\u0438\u0431\u043a\u0438: {{errorMessage}}",
         "unpaid": "\u041d\u0435 \u043e\u043f\u043b\u0430\u0447\u0435\u043d\u043e",
         "default_group_title_name_plain": "\u0431\u0435\u0437 \u0433\u0440\u0443\u043f\u043f\u0438\u0440\u043e\u0432\u043a\u0438",
         "subscriptions_in_group": "\u041f\u043e\u0434\u043f\u0438\u0441\u043a\u0438 \u0432 \u0433\u0440\u0443\u043f\u043f\u0435 \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u044b\u0439 \u0441\u0447\u0435\u0442 \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f",
         "unknown_any_plain": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u044b\u0439 \u0441\u0447\u0435\u0442",
         "unknown_budget_plain": "\u0411\u0435\u0437 \u0431\u044e\u0434\u0436\u0435\u0442\u0430",
-        "stored_journal_js": "\u041d\u043e\u0432\u0430\u044f \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f \"%{description}\" \u0443\u0441\u043f\u0435\u0448\u043d\u043e \u0441\u043e\u0437\u0434\u0430\u043d\u0430",
+        "stored_journal_js": "\u0423\u0441\u043f\u0435\u0448\u043d\u043e \u0441\u043e\u0437\u0434\u0430\u043d\u0430 \u043d\u043e\u0432\u0430\u044f \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f \"{{description}}\"",
         "wait_loading_transaction": "\u0414\u043e\u0436\u0434\u0438\u0442\u0435\u0441\u044c \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0438 \u0444\u043e\u0440\u043c\u044b",
         "nothing_found": "(\u043d\u0438\u0447\u0435\u0433\u043e \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u043e)",
         "wait_loading_data": "\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0434\u043e\u0436\u0434\u0438\u0442\u0435\u0441\u044c \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0438 \u0432\u0430\u0448\u0435\u0439 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438...",
@@ -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"
     }
 }

public/v2/i18n/ru_RU.json

@@ -2,13 +2,18 @@
     "config": {
         "html_language": "ru",
         "date_time_fns": "Do MMMM yyyy, @ HH:mm:ss",
-        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
+        "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",
         "paid": "\u041e\u043f\u043b\u0430\u0447\u0435\u043d\u043e",
-        "errors_submission_v2": "\u0421 \u0432\u0430\u0448\u0435\u0439 \u043f\u0443\u0431\u043b\u0438\u043a\u0430\u0446\u0438\u0435\u0439 \u043f\u0440\u043e\u0438\u0437\u043e\u0448\u043b\u0430 \u043e\u0448\u0438\u0431\u043a\u0430. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0435 \u043e\u0448\u0438\u0431\u043a\u0438: %{errorMessage}",
+        "errors_submission_v2": "\u0421 \u0432\u0430\u0448\u0435\u0439 \u043f\u0443\u0431\u043b\u0438\u043a\u0430\u0446\u0438\u0435\u0439 \u043f\u0440\u043e\u0438\u0437\u043e\u0448\u043b\u0430 \u043e\u0448\u0438\u0431\u043a\u0430. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0435 \u043e\u0448\u0438\u0431\u043a\u0438: {{errorMessage}}",
         "unpaid": "\u041d\u0435 \u043e\u043f\u043b\u0430\u0447\u0435\u043d\u043e",
         "default_group_title_name_plain": "\u0431\u0435\u0437 \u0433\u0440\u0443\u043f\u043f\u0438\u0440\u043e\u0432\u043a\u0438",
         "subscriptions_in_group": "\u041f\u043e\u0434\u043f\u0438\u0441\u043a\u0438 \u0432 \u0433\u0440\u0443\u043f\u043f\u0435 \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u044b\u0439 \u0441\u0447\u0435\u0442 \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f",
         "unknown_any_plain": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u044b\u0439 \u0441\u0447\u0435\u0442",
         "unknown_budget_plain": "\u0411\u0435\u0437 \u0431\u044e\u0434\u0436\u0435\u0442\u0430",
-        "stored_journal_js": "\u041d\u043e\u0432\u0430\u044f \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f \"%{description}\" \u0443\u0441\u043f\u0435\u0448\u043d\u043e \u0441\u043e\u0437\u0434\u0430\u043d\u0430",
+        "stored_journal_js": "\u0423\u0441\u043f\u0435\u0448\u043d\u043e \u0441\u043e\u0437\u0434\u0430\u043d\u0430 \u043d\u043e\u0432\u0430\u044f \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f \"{{description}}\"",
         "wait_loading_transaction": "\u0414\u043e\u0436\u0434\u0438\u0442\u0435\u0441\u044c \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0438 \u0444\u043e\u0440\u043c\u044b",
         "nothing_found": "(\u043d\u0438\u0447\u0435\u0433\u043e \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u043e)",
         "wait_loading_data": "\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0434\u043e\u0436\u0434\u0438\u0442\u0435\u0441\u044c \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0438 \u0432\u0430\u0448\u0435\u0439 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438...",
@@ -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"
     }
 }

public/v2/i18n/sk.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Uhraden\u00e9",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Neuhraden\u00e9",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unknown destination account",
         "unknown_any_plain": "Unknown account",
         "unknown_budget_plain": "No budget",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/sk_SK.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Uhraden\u00e9",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Neuhraden\u00e9",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unknown destination account",
         "unknown_any_plain": "Unknown account",
         "unknown_budget_plain": "No budget",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/sl.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Pla\u010dano",
-        "errors_submission_v2": "Nekaj je bilo narobe z va\u0161o oddajo. Preverite spodnje napake: %{errorMessage}",
+        "errors_submission_v2": "Nekaj je bilo narobe z va\u0161o oddajo. Preverite spodnje napake: {{errorMessage}}",
         "unpaid": "Nepla\u010dano",
         "default_group_title_name_plain": "nezdru\u017eeno",
         "subscriptions_in_group": "Naro\u010dnine v skupini \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Neznan ciljni ra\u010dun",
         "unknown_any_plain": "Neznan ra\u010dun",
         "unknown_budget_plain": "Ni prora\u010duna",
-        "stored_journal_js": "Nova transakcija \"%{description}\" je uspe\u0161no ustvarjena",
+        "stored_journal_js": "Nova transakcija \"{{description}}\" je uspe\u0161no ustvarjena",
         "wait_loading_transaction": "Po\u010dakajte, da se obrazec nalo\u017ei",
         "nothing_found": "(ni\u010d najdenega)",
         "wait_loading_data": "Po\u010dakajte, da se va\u0161i podatki nalo\u017eijo...",
@@ -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"
     }
 }

public/v2/i18n/sl_SI.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Pla\u010dano",
-        "errors_submission_v2": "Nekaj je bilo narobe z va\u0161o oddajo. Preverite spodnje napake: %{errorMessage}",
+        "errors_submission_v2": "Nekaj je bilo narobe z va\u0161o oddajo. Preverite spodnje napake: {{errorMessage}}",
         "unpaid": "Nepla\u010dano",
         "default_group_title_name_plain": "nezdru\u017eeno",
         "subscriptions_in_group": "Naro\u010dnine v skupini \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Neznan ciljni ra\u010dun",
         "unknown_any_plain": "Neznan ra\u010dun",
         "unknown_budget_plain": "Ni prora\u010duna",
-        "stored_journal_js": "Nova transakcija \"%{description}\" je uspe\u0161no ustvarjena",
+        "stored_journal_js": "Nova transakcija \"{{description}}\" je uspe\u0161no ustvarjena",
         "wait_loading_transaction": "Po\u010dakajte, da se obrazec nalo\u017ei",
         "nothing_found": "(ni\u010d najdenega)",
         "wait_loading_data": "Po\u010dakajte, da se va\u0161i podatki nalo\u017eijo...",
@@ -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"
     }
 }

public/v2/i18n/sv.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Betald",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Obetald",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unknown destination account",
         "unknown_any_plain": "Unknown account",
         "unknown_budget_plain": "No budget",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/sv_SE.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Betald",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Obetald",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unknown destination account",
         "unknown_any_plain": "Unknown account",
         "unknown_budget_plain": "No budget",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/tr.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "\u00d6dendi",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "\u00d6denmedi",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unknown destination account",
         "unknown_any_plain": "Unknown account",
         "unknown_budget_plain": "No budget",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/tr_TR.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "\u00d6dendi",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "\u00d6denmedi",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unknown destination account",
         "unknown_any_plain": "Unknown account",
         "unknown_budget_plain": "No budget",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/uk.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Paid",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Unpaid",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unknown destination account",
         "unknown_any_plain": "Unknown account",
         "unknown_budget_plain": "No budget",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/uk_UA.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "Paid",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Unpaid",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unknown destination account",
         "unknown_any_plain": "Unknown account",
         "unknown_budget_plain": "No budget",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/vi.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "\u0110\u00e3 thanh to\u00e1n",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Ch\u01b0a thanh to\u00e1n",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unknown destination account",
         "unknown_any_plain": "Unknown account",
         "unknown_budget_plain": "No budget",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

public/v2/i18n/vi_VN.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "\u0110\u00e3 thanh to\u00e1n",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "Ch\u01b0a thanh to\u00e1n",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unknown destination account",
         "unknown_any_plain": "Unknown account",
         "unknown_budget_plain": "No budget",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

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": "\u60a8\u7684\u63d0\u4ea4\u6709\u8bef\uff0c\u8bf7\u67e5\u770b\u4e0b\u9762\u8f93\u51fa\u7684\u9519\u8bef\u4fe1\u606f: %{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": "\u6210\u529f\u521b\u5efa\u65b0\u4ea4\u6613 \"%{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"
     }
 }

public/v2/i18n/zh-tw.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "\u5df2\u4ed8\u6b3e",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "\u672a\u4ed8\u6b3e",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unknown destination account",
         "unknown_any_plain": "Unknown account",
         "unknown_budget_plain": "No budget",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

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": "\u60a8\u7684\u63d0\u4ea4\u6709\u8bef\uff0c\u8bf7\u67e5\u770b\u4e0b\u9762\u8f93\u51fa\u7684\u9519\u8bef\u4fe1\u606f: %{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": "\u6210\u529f\u521b\u5efa\u65b0\u4ea4\u6613 \"%{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"
     }
 }

public/v2/i18n/zh_TW.json

@@ -2,13 +2,18 @@
     "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",
         "paid": "\u5df2\u4ed8\u6b3e",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
         "unpaid": "\u672a\u4ed8\u6b3e",
         "default_group_title_name_plain": "ungrouped",
         "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
@@ -23,7 +28,7 @@
         "unknown_dest_plain": "Unknown destination account",
         "unknown_any_plain": "Unknown account",
         "unknown_budget_plain": "No budget",
-        "stored_journal_js": "Successfully created new transaction \"%{description}\"",
+        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
         "wait_loading_transaction": "Please wait for the form to load",
         "nothing_found": "(nothing found)",
         "wait_loading_data": "Please wait for your information to load...",
@@ -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"
     }
 }

resources/assets/js/locales/ca.json

@@ -5,8 +5,8 @@
         "flash_warning": "Atenci\u00f3!",
         "flash_success": "\u00c8xit!",
         "close": "Tancar",
-        "select_dest_account": "Please select or type a valid destination account name",
+        "select_dest_account": "Per favor, selecciona o escriu un nom de compte de dest\u00ed v\u00e0lid",
-        "select_source_account": "Please select or type a valid source account name",
+        "select_source_account": "Per favor, selecciona o escriu un nom de compte d'origen v\u00e0lid",
         "split_transaction_title": "Descripci\u00f3 de la transacci\u00f3 dividida",
         "errors_submission": "Hi ha hagut un error amb el teu enviament. Per favor, revisa els errors de sota.",
         "split": "Dividir",

resources/assets/js/locales/fr.json

@@ -5,8 +5,8 @@
         "flash_warning": "Attention !",
         "flash_success": "Super !",
         "close": "Fermer",
-        "select_dest_account": "Please select or type a valid destination account name",
+        "select_dest_account": "Veuillez s\u00e9lectionner ou saisir un nom de compte de destination valide",
-        "select_source_account": "Please select or type a valid source account name",
+        "select_source_account": "Veuillez s\u00e9lectionner ou saisir un nom de compte source valide",
         "split_transaction_title": "Description de l'op\u00e9ration s\u00e9par\u00e9e",
         "errors_submission": "Certaines informations ne sont pas correctes dans votre formulaire. Veuillez v\u00e9rifier les erreurs ci-dessous.",
         "split": "S\u00e9paration",

resources/assets/js/locales/ro.json

@@ -12,14 +12,14 @@
         "split": "\u00cemparte",
         "single_split": "\u00cemparte",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Tranzac\u021bia #{ID} (\"{title}\")<\/a> a fost stocat\u0103.",
-        "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> has been stored.",
+        "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> a fost stocat.",
-        "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") has been updated.",
+        "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") a fost actualizat.",
         "transaction_updated_link": "<a href=\"transactions\/show\/{ID}\">Tranzac\u021bia #{ID}<\/a> (\"{title}\") a fost actualizat\u0103.",
         "transaction_new_stored_link": "<a href=\"transactions\/show\/{ID}\">Tranzac\u021bia #{ID}<\/a> a fost stocat\u0103.",
         "transaction_journal_information": "Informa\u021bii despre tranzac\u021bii",
-        "submission_options": "Submission options",
+        "submission_options": "Op\u0163iuni de depunere",
-        "apply_rules_checkbox": "Apply rules",
+        "apply_rules_checkbox": "Aplic\u0103 regulile",
-        "fire_webhooks_checkbox": "Fire webhooks",
+        "fire_webhooks_checkbox": "Webhook-uri de incendiu",
         "no_budget_pointer": "Se pare c\u0103 nu ave\u021bi \u00eenc\u0103 bugete. Ar trebui s\u0103 crea\u021bi c\u00e2teva pe pagina <a href=\"\/budgets\">bugete<\/a>. Bugetele v\u0103 pot ajuta s\u0103 \u021bine\u021bi eviden\u021ba cheltuielilor.",
         "no_bill_pointer": "Se pare c\u0103 nu ave\u021bi \u00eenc\u0103 facturi. Ar trebui s\u0103 crea\u021bi unele pe pagina <a href=\"bills\">facturi<\/a>. Facturile v\u0103 pot ajuta s\u0103 \u021bine\u021bi eviden\u021ba cheltuielilor.",
         "source_account": "Contul surs\u0103",
@@ -97,39 +97,39 @@
         "multi_account_warning_withdrawal": "Re\u0163ine\u0163i faptul c\u0103 sursa scind\u0103rilor ulterioare va fi anulat\u0103 de orice altceva definit \u00een prima \u00eemp\u0103r\u0163ire a retragerii.",
         "multi_account_warning_deposit": "\u021aine\u021bi cont de faptul c\u0103 destina\u021bia scind\u0103rilor ulterioare va fi dep\u0103\u0219it\u0103 cu orice se define\u0219te la prima \u00eemp\u0103r\u021bire a depozitului.",
         "multi_account_warning_transfer": "Re\u0163ine\u0163i faptul c\u0103 contul sursei + destina\u0163ia frac\u0163ion\u0103rilor ulterioare va fi anulat de orice se define\u015fte \u00een prima \u00eemp\u0103r\u0163ire a transferului.",
-        "webhook_trigger_STORE_TRANSACTION": "After transaction creation",
+        "webhook_trigger_STORE_TRANSACTION": "Dup\u0103 crearea tranzac\u021biei",
-        "webhook_trigger_UPDATE_TRANSACTION": "After transaction update",
+        "webhook_trigger_UPDATE_TRANSACTION": "Dup\u0103 actualizarea tranzac\u021biei",
-        "webhook_trigger_DESTROY_TRANSACTION": "After transaction delete",
+        "webhook_trigger_DESTROY_TRANSACTION": "Dup\u0103 \u0219tergerea tranzac\u021biei",
-        "webhook_response_TRANSACTIONS": "Transaction details",
+        "webhook_response_TRANSACTIONS": "Detaliile tranzac\u021biei",
-        "webhook_response_ACCOUNTS": "Account details",
+        "webhook_response_ACCOUNTS": "Detalii cont",
-        "webhook_response_none_NONE": "No details",
+        "webhook_response_none_NONE": "Fara detalii",
         "webhook_delivery_JSON": "JSON",
         "actions": "Ac\u021biuni",
         "meta_data": "Date meta",
-        "webhook_messages": "Webhook message",
+        "webhook_messages": "Mesaj Webhook",
         "inactive": "Inactiv",
-        "no_webhook_messages": "There are no webhook messages",
+        "no_webhook_messages": "Nu exist\u0103 mesaje webhook",
         "inspect": "Inspecta\u021bi",
-        "create_new_webhook": "Create new webhook",
+        "create_new_webhook": "Creare webhook nou",
         "webhooks": "Webhook-uri",
-        "webhook_trigger_form_help": "Indicate on what event the webhook will trigger",
+        "webhook_trigger_form_help": "Indica\u021bi despre ce eveniment va declan\u0219a webhook",
-        "webhook_response_form_help": "Indicate what the webhook must submit to the URL.",
+        "webhook_response_form_help": "Indica\u021bi ce trebuie s\u0103 trimit\u0103 webhook la URL.",
-        "webhook_delivery_form_help": "Which format the webhook must deliver data in.",
+        "webhook_delivery_form_help": "Care format trebuie s\u0103 furnizeze datele webhook.",
-        "webhook_active_form_help": "The webhook must be active or it won't be called.",
+        "webhook_active_form_help": "Webhook-ul trebuie s\u0103 fie activ sau nu va fi apelat.",
-        "edit_webhook_js": "Edit webhook \"{title}\"",
+        "edit_webhook_js": "Editare webhook\"{title}\"",
-        "webhook_was_triggered": "The webhook was triggered on the indicated transaction. Please wait for results to appear.",
+        "webhook_was_triggered": "Webhook-ul a fost declan\u0219at pe tranzac\u021bia indicat\u0103. A\u0219tepta\u021bi ca rezultatele s\u0103 apar\u0103.",
-        "view_message": "View message",
+        "view_message": "Vizualiza\u021bi mesajul",
-        "view_attempts": "View failed attempts",
+        "view_attempts": "Vizualizare \u00eencerc\u0103ri e\u0219uate",
-        "message_content_title": "Webhook message content",
+        "message_content_title": "Con\u021binutul mesajului Webhook",
-        "message_content_help": "This is the content of the message that was sent (or tried) using this webhook.",
+        "message_content_help": "Acesta este con\u021binutul mesajului care a fost trimis (sau a \u00eencercat) folosind acest webhook.",
-        "attempt_content_title": "Webhook attempts",
+        "attempt_content_title": "\u00cencerc\u0103ri Webhook",
-        "attempt_content_help": "These are all the unsuccessful attempts of this webhook message to submit to the configured URL. After some time, Firefly III will stop trying.",
+        "attempt_content_help": "Acestea sunt toate \u00eencerc\u0103rile nereu\u0219ite ale acestui mesaj webhook de a remite la adresa URL configurat\u0103. Dup\u0103 un anumit timp, Firefly III va \u00eenceta s\u0103 mai \u00eencerce.",
-        "no_attempts": "There are no unsuccessful attempts. That's a good thing!",
+        "no_attempts": "Nu exist\u0103 \u00eencerc\u0103ri nereu\u0219ite. E un lucru bun!",
-        "webhook_attempt_at": "Attempt at {moment}",
+        "webhook_attempt_at": "\u00cencercare la {moment}",
         "logs": "Jurnale",
         "response": "R\u0103spuns",
-        "visit_webhook_url": "Visit webhook URL",
+        "visit_webhook_url": "Vizita\u0163i URL-ul webhook",
-        "reset_webhook_secret": "Reset webhook secret"
+        "reset_webhook_secret": "Resetare secret webhook"
     },
     "form": {
         "url": "URL",
@@ -157,6 +157,6 @@
     },
     "config": {
         "html_language": "ro",
-        "date_time_fns": "MMMM do, yyyy @ HH:mm:ss"
+        "date_time_fns": "MMMM do yyy @ HH:mm:ss"
     }
 }

resources/assets/js/locales/sl.json

@@ -5,8 +5,8 @@
         "flash_warning": "Opozorilo!",
         "flash_success": "Uspelo je!",
         "close": "Zapri",
-        "select_dest_account": "Please select or type a valid destination account name",
+        "select_dest_account": "Izberite ali vnesite veljavno ime ciljnega ra\u010duna",
-        "select_source_account": "Please select or type a valid source account name",
+        "select_source_account": "Izberite ali vnesite veljavno ime izvornega ra\u010duna",
         "split_transaction_title": "Opis razdeljene transakcije",
         "errors_submission": "Nekaj je bilo narobe z va\u0161o oddajo. Preverite spodnje napake.",
         "split": "Razdeli",

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_dest_account": "\u8bf7\u9009\u62e9\u6216\u8f93\u5165\u4e00\u4e2a\u6709\u6548\u7684\u76ee\u6807\u5e10\u6237\u540d\u79f0",
-        "select_source_account": "Please select or type a valid source account name",
+        "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",

resources/assets/v2/api/v1/configuration/get.js

@@ -0,0 +1,27 @@
+/*
+ * basic.js
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import {api} from "../../../boot/axios";
+
+export default class Get {
+    getByName(name) {
+        return api.get('/api/v1/configuration/' + name);
+    }
+}

resources/assets/v2/pages/accounts/index.js

@@ -28,13 +28,25 @@ import '@ag-grid-community/styles/ag-grid.css';
 import '@ag-grid-community/styles/ag-theme-alpine.css';
 import '../../css/grid-ff3-theme.css';
 import Get from "../../api/v2/model/account/get.js";
-import GenericEditor from "../../support/editable/GenericEditor.js";
 import Put from "../../api/v2/model/account/put.js";
+import AccountRenderer from "../../support/renderers/AccountRenderer.js";
 
 // set type from URL
-const urlParts = window.location.href.split('/');
+const beforeQuery = window.location.href.split('?');
+const urlParts = beforeQuery[0].split('/');
 const type = urlParts[urlParts.length - 1];
 
+let sortingColumn = '';
+let sortDirection = '';
+
+// get sort parameters
+const params = new Proxy(new URLSearchParams(window.location.search), {
+    get: (searchParams, prop) => searchParams.get(prop),
+});
+sortingColumn = params.column ?? '';
+sortDirection = params.direction ?? '';
+
+
 let index = function () {
     return {
         // notifications
@@ -54,13 +66,21 @@ let index = function () {
             },
         },
         editors: {},
-        sortingColumn: '',
+        sortingColumn: sortingColumn,
-        sortDirection: '',
+        sortDirection: sortDirection,
         accounts: [],
 
+        accountRole(roleName) {
+            return i18next.t('firefly.account_role_' + roleName);
+        },
+
         sort(column) {
             this.sortingColumn = column;
             this.sortDirection = this.sortDirection === 'asc' ? 'desc' : 'asc';
+            const url = './accounts/'+type+'?column='+column+'&direction='+this.sortDirection;
+
+            window.history.pushState({}, "", url);
+
             this.loadAccounts();
             return false;
         },
@@ -78,35 +98,46 @@ let index = function () {
             this.notifications.wait.text = i18next.t('firefly.wait_loading_data')
             this.loadAccounts();
         },
+        renderObjectValue(field, account) {
+            let renderer = new AccountRenderer();
+            if ('name' === field) {
+                return renderer.renderName(account);
+            }
+        },
         submitInlineEdit(e) {
             e.preventDefault();
             const newTarget = e.currentTarget;
             const index = newTarget.dataset.index;
-            const newValue = document.querySelectorAll('[data-index="'+index+'input"]')[0].value ?? '';
+            const fieldName = newTarget.dataset.field;
-            if('' === newValue) {
+            const accountId = newTarget.dataset.id;
+            // need to find the input thing
+            console.log('Clicked edit button for account on index #' + index + ' and field ' + fieldName);
+            const querySelector = 'input[data-field="' + fieldName + '"][data-index="' + index + '"]';
+            console.log(querySelector);
+            const newValue = document.querySelectorAll(querySelector)[0].value ?? '';
+            if ('' === newValue) {
                 return;
             }
-            // submit the field in an update thing?
+            console.log('new field name is ' + fieldName + '=' + newValue + ' for account #' + newTarget.dataset.id);
-            const fieldName = this.editors[index].options.field;
             const params = {};
             params[fieldName] = newValue;
-            console.log(params);
+            (new Put()).put(accountId, params);
-            console.log('New value is ' + newValue + ' for account #' + this.editors[index].options.id);
+
-            (new Put()).put(this.editors[index].options.id, params);
+            // update value, should auto render correctly!
+            this.accounts[index][fieldName] = newValue;
+            this.accounts[index].nameEditorVisible = false;
         },
         cancelInlineEdit(e) {
             const newTarget = e.currentTarget;
             const index = newTarget.dataset.index;
-            this.editors[index].cancel();
+            this.accounts[index].nameEditorVisible = false;
         },
         triggerEdit(e) {
             const target = e.currentTarget;
             const index = target.dataset.index;
-            // get parent:
+            const id = target.dataset.id;
-            this.editors[index] = new GenericEditor();
+            console.log('Index of this row is ' + index + ' and ID is ' + id);
-            this.editors[index].setElement(target);
+            this.accounts[index].nameEditorVisible = true;
-            this.editors[index].init();
-            this.editors[index].replace();
         },
         loadAccounts() {
             this.notifications.wait.show = true;
@@ -115,7 +146,7 @@ let index = function () {
             // sort instructions
             // &sorting[0][column]=description&sorting[0][direction]=asc
             const sorting = [{column: this.sortingColumn, direction: this.sortDirection}];
-            // one page only.
+            // one page only.o
             (new Get()).index({sorting: sorting, type: type, page: this.page}).then(response => {
                 for (let i = 0; i < response.data.data.length; i++) {
                     if (response.data.data.hasOwnProperty(i)) {
@@ -124,6 +155,7 @@ let index = function () {
                             id: parseInt(current.id),
                             active: current.attributes.active,
                             name: current.attributes.name,
+                            nameEditorVisible: false,
                             type: current.attributes.type,
                             role: current.attributes.account_role,
                             iban: null === current.attributes.iban ? '' : current.attributes.iban.match(/.{1,4}/g).join(' '),
@@ -132,7 +164,7 @@ let index = function () {
                             currency_code: current.attributes.currency_code,
                             native_current_balance: current.attributes.native_current_balance,
                             native_currency_code: current.attributes.native_currency_code,
-                            last_activity: null === current.attributes.last_activity ? '' : format(new Date(current.attributes.last_activity), 'P'),
+                            last_activity: null === current.attributes.last_activity ? '' : format(new Date(current.attributes.last_activity), i18next.t('config.month_and_day_fns')),
                         };
                         this.accounts.push(account);
                     }

resources/assets/v2/pages/dashboard/accounts.js

@@ -27,6 +27,7 @@ import {Chart} from 'chart.js';
 import {getDefaultChartSettings} from "../../support/default-chart-settings.js";
 import {getColors} from "../../support/get-colors.js";
 import {getCacheKey} from "../../support/get-cache-key.js";
+import {getConfiguration} from "../../store/get-configuration.js";
 
 // this is very ugly, but I have no better ideas at the moment to save the currency info
 // for each series.
@@ -40,6 +41,7 @@ export default () => ({
     loadingAccounts: false,
     accountList: [],
     autoConversion: false,
+    autoConversionAvailable: false,
     chartOptions: null,
     switchAutoConversion() {
         this.autoConversion = !this.autoConversion;
@@ -215,8 +217,16 @@ export default () => ({
                                 for (let iii = 0; iii < current.attributes.transactions.length; iii++) {
                                     let currentTransaction = current.attributes.transactions[iii];
                                     //console.log(currentTransaction);
-                                    const nativeAmountRaw = 'withdrawal' === currentTransaction.type ? parseFloat(currentTransaction.native_amount) * -1 : parseFloat(currentTransaction.native_amount);
+                                    let nativeAmountRaw = 'withdrawal' === currentTransaction.type ? parseFloat(currentTransaction.native_amount) * -1 : parseFloat(currentTransaction.native_amount);
-                                    const amountRaw = 'withdrawal' === currentTransaction.type ? parseFloat(currentTransaction.amount) * -1 : parseFloat(currentTransaction.amount);
+                                    let amountRaw = 'withdrawal' === currentTransaction.type ? parseFloat(currentTransaction.amount) * -1 : parseFloat(currentTransaction.amount);
+
+                                    // if transfer and source is this account, multiply again
+                                    if('transfer' === currentTransaction.type && parseInt(currentTransaction.source_id) === accountId) { //
+                                        console.log('transfer', parseInt(currentTransaction.source_id), accountId);
+                                        nativeAmountRaw = nativeAmountRaw * -1;
+                                        amountRaw = amountRaw * -1;
+                                    }
+
                                     group.transactions.push({
                                         description: currentTransaction.description,
                                         id: current.id,
@@ -259,9 +269,12 @@ export default () => ({
 
     init() {
         // console.log('accounts init');
-        Promise.all([getVariable('viewRange', '1M'), getVariable('autoConversion', false), getVariable('language', 'en_US')]).then((values) => {
+        Promise.all([getVariable('viewRange', '1M'), getVariable('autoConversion', false), getVariable('language', 'en_US'),
+            getConfiguration('cer.enabled', false)
+        ]).then((values) => {
             //console.log('accounts after promises');
-            this.autoConversion = values[1];
+            this.autoConversion = values[1] && values[3];
+            this.autoConversionAvailable = values[3];
             afterPromises = true;
 
             // main dashboard chart:

resources/assets/v2/pages/transactions/create.js

@@ -66,7 +66,7 @@ let transactions = function () {
             isSubmitting: false,
             returnHereButton: false,
             saveAsNewButton: false, // edit form only
-            resetButton: true,
+            resetButton: false,
             rulesButton: true,
             webhooksButton: true,
         },
@@ -89,7 +89,10 @@ let transactions = function () {
 
         // properties for the entire transaction group
         groupProperties: {
-            transactionType: 'unknown', title: null, id: null, totalAmount: 0,
+            transactionType: 'unknown',
+            title: null,
+            id: null,
+            totalAmount: 0,
         },
 
         // notifications
@@ -369,7 +372,8 @@ let transactions = function () {
             };
 
             // catch for group title:
-            if (null === this.groupProperties.title && transactions.length > 1) {
+            // TODO later this must be handled with more care (ie use the group title input)
+            if (transactions.length > 1) {
                 submission.group_title = transactions[0].description;
             }
 
@@ -381,6 +385,7 @@ let transactions = function () {
                 // submission was a success!
                 this.groupProperties.id = parseInt(group.id);
                 this.groupProperties.title = group.attributes.group_title ?? group.attributes.transactions[0].description
+                console.log('group title is now: ', this.groupProperties.title);
 
                 // process attachments, if any:
                 const attachmentCount = processAttachments(this.groupProperties.id, group.attributes.transactions);
@@ -414,10 +419,12 @@ let transactions = function () {
             this.notifications.wait.show = false;
 
             if (this.formStates.returnHereButton) {
-
                 this.notifications.success.show = true;
                 this.notifications.success.url = 'transactions/show/' + this.groupProperties.id;
-                this.notifications.success.text = i18next.t('firefly.stored_journal_js', {description: this.groupProperties.title});
+                this.notifications.success.text = i18next.t('firefly.stored_journal_js', {description: this.groupProperties.title, interpolation: { escapeValue: false }});
+                this.formStates.isSubmitting = false;
+                // reset group title again
+                this.groupProperties.title = null;
 
                 if (this.formStates.resetButton) {
                     this.entries = [];