Update meta data for new release.

2025-01-09 23:53:12 -06:00 · 2024-01-20 16:29:00 +01:00 · 2024-01-20 16:29:00 +01:00 · da7a2cf0c0
commit da7a2cf0c0
parent 2368788405
74 changed files with 821 additions and 760 deletions
--- a/.github/label-actions.yml
+++ b/.github/label-actions.yml
@ -47,7 +47,7 @@ needs-moar-debug:

      1. Firefly III version
      2. Docker, self-hosted, or hosted by a third party?
-      3. Operating system and browser 
+      3. Operating system and browser

      Thank you for your contributions.
    unlabel: needs-moar-debug
@ -81,5 +81,5 @@ v2-layout-issue:
      Thank you for your contributions.
    close: true
    close-reason: completed
-    lock: true
+    lock: false
    unlabel: v2-layout-issue
--- a/.github/workflows/debug-info-actions.yml
+++ b/.github/workflows/debug-info-actions.yml
@ -23,7 +23,6 @@ jobs:
          if [[ $ISSUE_BODY == *".eOxNZAmyGz6CXMyf"* ]]; then
            gh issue comment "$NUMBER" --body "$V2_ISSUE_REPLY_BODY"
            gh issue close "$NUMBER" --reason completed
-            gh issue lock "$NUMBER"
          fi
        env:
          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/lock.yml
+++ b/.github/workflows/lock.yml
@ -15,5 +15,5 @@ jobs:
      - uses: JC5/lock-threads@main
        with:
          github-token: ${{ github.token }}
-          issue-inactive-days: 90
-          pr-inactive-days: 90
+          issue-inactive-days: 7
+          pr-inactive-days: 7
--- a/app/Services/Internal/Update/JournalUpdateService.php
+++ b/app/Services/Internal/Update/JournalUpdateService.php
@ -131,7 +131,7 @@ class JournalUpdateService
        app('log')->debug(sprintf('Now in %s', __METHOD__));
        app('log')->debug(sprintf('Now in JournalUpdateService for journal #%d.', $this->transactionJournal->id));

-        $this->data['reconciled'] = array_key_exists('reconciled', $this->data) ? $this->data['reconciled'] : false;
+        $this->data['reconciled'] = array_key_exists('reconciled', $this->data) ? $this->data['reconciled'] : null;

        // can we update account data using the new type?
        if ($this->hasValidAccounts()) {
--- a/changelog.md
+++ b/changelog.md
@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).

+## 6.1.7 - 2024-01-21
+
+### Added
+
+- Layout `v2` has some new features
+- [Issue 8369](https://github.com/firefly-iii/firefly-iii/issues/8369) (Additional reconcile link) reported by @chevdor
+
+### Fixed
+
+- [Issue 8352](https://github.com/firefly-iii/firefly-iii/issues/8352) (Modifying the direction of a transfer between liabilities yields no effect) reported by @Ezwen
+- [Issue 8370](https://github.com/firefly-iii/firefly-iii/pull/8370) (Fix various typos) reported by @luzpaz
+- [Issue 8377](https://github.com/firefly-iii/firefly-iii/issues/8377) (Query on multiple tags returns duplicates) reported by @chevdor
+- [Issue 8374](https://github.com/firefly-iii/firefly-iii/issues/8374) (Error Graph Income vs. expenses Reports page) reported by @nicolopozzato
+- [Issue 8390](https://github.com/firefly-iii/firefly-iii/issues/8390) (Rule with destination_account_is 'not' is never returning a result.) reported by @EricVanCaenenberghe
+- [Issue 8349](https://github.com/firefly-iii/firefly-iii/issues/8349) (Currencies not saving correctly) reported by @r1bas4
+- [Issue 8418](https://github.com/firefly-iii/firefly-iii/issues/8418) (Unable to create rule with trigger having type has_no_budget via the API ) reported by @tailg8nj
+- [Issue 8425](https://github.com/firefly-iii/firefly-iii/issues/8425) (Error from the net-worth endpoint with  `Trailing data`.) reported by @chevdor
+- [Issue 8427](https://github.com/firefly-iii/firefly-iii/issues/8427) (Broken batch application of non-strict rules with triggers with stop processing) reported by @alexschlueter
+- Various Carbon `createFromFormat` issues fixed.
+
 ## 6.1.6 - 2024-01-07

 ### Fixed
@ -54,7 +74,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - [Issue 8320](https://github.com/firefly-iii/firefly-iii/issues/8320) nullpointer in new layout
 - [Issue 8321](https://github.com/firefly-iii/firefly-iii/issues/8321) Networth checkbox for expense and revenue accounts removed
 - Long date ranges will throw an error
- 
+-
 - Max sizes and reasonable limits for most numbers and strings
 - Links in readme to documentation.

@ -145,7 +165,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Added

 - [Issue 8076](https://github.com/firefly-iii/firefly-iii/issues/8076) Added a "Clone and edit"-button
- [Issue 7204](https://github.com/firefly-iii/firefly-iii/issues/7204) Added the ability to customize the URL protocol types Firefly III accepts 
+- [Issue 7204](https://github.com/firefly-iii/firefly-iii/issues/7204) Added the ability to customize the URL protocol types Firefly III accepts
 - [Issue 8098](https://github.com/firefly-iii/firefly-iii/issues/8098) More tests in the navigation class, thanks @tonicospinelli!

 ### Changed
--- a/composer.lock
+++ b/composer.lock
@ -793,16 +793,16 @@
        },
        {
            "name": "doctrine/inflector",
-            "version": "2.0.8",
+            "version": "2.0.9",
            "source": {
                "type": "git",
                "url": "https://github.com/doctrine/inflector.git",
-                "reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff"
+                "reference": "2930cd5ef353871c821d5c43ed030d39ac8cfe65"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/inflector/zipball/f9301a5b2fb1216b2b08f02ba04dc45423db6bff",
-                "reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff",
+                "url": "https://api.github.com/repos/doctrine/inflector/zipball/2930cd5ef353871c821d5c43ed030d39ac8cfe65",
+                "reference": "2930cd5ef353871c821d5c43ed030d39ac8cfe65",
                "shasum": ""
            },
            "require": {
@ -864,7 +864,7 @@
            ],
            "support": {
                "issues": "https://github.com/doctrine/inflector/issues",
-                "source": "https://github.com/doctrine/inflector/tree/2.0.8"
+                "source": "https://github.com/doctrine/inflector/tree/2.0.9"
            },
            "funding": [
                {
@ -880,7 +880,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-06-16T13:40:37+00:00"
+            "time": "2024-01-15T18:05:13+00:00"
        },
        {
            "name": "doctrine/lexer",
@ -2014,16 +2014,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v10.40.0",
+            "version": "v10.41.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "7a9470071dac9579ebf29ad1b9d73e4b8eb586fc"
+                "reference": "da31969bd35e6ee0bbcd9e876f88952dc754b012"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/7a9470071dac9579ebf29ad1b9d73e4b8eb586fc",
-                "reference": "7a9470071dac9579ebf29ad1b9d73e4b8eb586fc",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/da31969bd35e6ee0bbcd9e876f88952dc754b012",
+                "reference": "da31969bd35e6ee0bbcd9e876f88952dc754b012",
                "shasum": ""
            },
            "require": {
@ -2215,20 +2215,20 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2024-01-09T11:46:47+00:00"
+            "time": "2024-01-16T15:23:58+00:00"
        },
        {
            "name": "laravel/passport",
-            "version": "v11.10.0",
+            "version": "v11.10.1",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/passport.git",
-                "reference": "966bc8e477d08c86a11dc4c5a86f85fa0abdb89b"
+                "reference": "e1a651481cabff0ba174aaefbdc04a59e6a096ec"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/passport/zipball/966bc8e477d08c86a11dc4c5a86f85fa0abdb89b",
-                "reference": "966bc8e477d08c86a11dc4c5a86f85fa0abdb89b",
+                "url": "https://api.github.com/repos/laravel/passport/zipball/e1a651481cabff0ba174aaefbdc04a59e6a096ec",
+                "reference": "e1a651481cabff0ba174aaefbdc04a59e6a096ec",
                "shasum": ""
            },
            "require": {
@ -2293,7 +2293,7 @@
                "issues": "https://github.com/laravel/passport/issues",
                "source": "https://github.com/laravel/passport"
            },
-            "time": "2023-11-02T17:16:12+00:00"
+            "time": "2024-01-10T14:44:24+00:00"
        },
        {
            "name": "laravel/prompts",
@ -2480,30 +2480,30 @@
        },
        {
            "name": "laravel/slack-notification-channel",
-            "version": "v3.1.1",
+            "version": "v3.2.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/slack-notification-channel.git",
-                "reference": "bac7511508039a98e1a8120695adac5d82fdf452"
+                "reference": "fc8d1873e3db63a480bc57aebb4bf5ec05332d91"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/slack-notification-channel/zipball/bac7511508039a98e1a8120695adac5d82fdf452",
-                "reference": "bac7511508039a98e1a8120695adac5d82fdf452",
+                "url": "https://api.github.com/repos/laravel/slack-notification-channel/zipball/fc8d1873e3db63a480bc57aebb4bf5ec05332d91",
+                "reference": "fc8d1873e3db63a480bc57aebb4bf5ec05332d91",
                "shasum": ""
            },
            "require": {
                "guzzlehttp/guzzle": "^7.0",
-                "illuminate/http": "^9.0|^10.0",
-                "illuminate/notifications": "^9.0|^10.0",
-                "illuminate/support": "^9.0|^10.0",
+                "illuminate/http": "^9.0|^10.0|^11.0",
+                "illuminate/notifications": "^9.0|^10.0|^11.0",
+                "illuminate/support": "^9.0|^10.0|^11.0",
                "php": "^8.0"
            },
            "require-dev": {
                "mockery/mockery": "^1.0",
-                "orchestra/testbench": "^7.0|^8.0",
+                "orchestra/testbench": "^7.0|^8.0|^9.0",
                "phpstan/phpstan": "^1.10",
-                "phpunit/phpunit": "^9.0"
+                "phpunit/phpunit": "^9.0|^10.4"
            },
            "type": "library",
            "extra": {
@ -2539,34 +2539,34 @@
            ],
            "support": {
                "issues": "https://github.com/laravel/slack-notification-channel/issues",
-                "source": "https://github.com/laravel/slack-notification-channel/tree/v3.1.1"
+                "source": "https://github.com/laravel/slack-notification-channel/tree/v3.2.0"
            },
-            "time": "2024-01-06T17:03:22+00:00"
+            "time": "2024-01-15T20:07:45+00:00"
        },
        {
            "name": "laravel/ui",
-            "version": "v4.3.0",
+            "version": "v4.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/ui.git",
-                "reference": "d166e09cdcb2e23836f694774cba77a32edb6007"
+                "reference": "7335d7049b2cde345c029e9d2de839b80af62bc0"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/ui/zipball/d166e09cdcb2e23836f694774cba77a32edb6007",
-                "reference": "d166e09cdcb2e23836f694774cba77a32edb6007",
+                "url": "https://api.github.com/repos/laravel/ui/zipball/7335d7049b2cde345c029e9d2de839b80af62bc0",
+                "reference": "7335d7049b2cde345c029e9d2de839b80af62bc0",
                "shasum": ""
            },
            "require": {
-                "illuminate/console": "^9.21|^10.0",
-                "illuminate/filesystem": "^9.21|^10.0",
-                "illuminate/support": "^9.21|^10.0",
-                "illuminate/validation": "^9.21|^10.0",
+                "illuminate/console": "^9.21|^10.0|^11.0",
+                "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"
            },
            "require-dev": {
-                "orchestra/testbench": "^7.0|^8.0",
-                "phpunit/phpunit": "^9.3"
+                "orchestra/testbench": "^7.0|^8.0|^9.0",
+                "phpunit/phpunit": "^9.3|^10.4"
            },
            "type": "library",
            "extra": {
@ -2601,9 +2601,9 @@
                "ui"
            ],
            "support": {
-                "source": "https://github.com/laravel/ui/tree/v4.3.0"
+                "source": "https://github.com/laravel/ui/tree/v4.4.0"
            },
-            "time": "2023-12-19T14:46:09+00:00"
+            "time": "2024-01-12T15:56:45+00:00"
        },
        {
            "name": "lcobucci/clock",
@ -3937,16 +3937,16 @@
        },
        {
            "name": "nette/utils",
-            "version": "v4.0.3",
+            "version": "v4.0.4",
            "source": {
                "type": "git",
                "url": "https://github.com/nette/utils.git",
-                "reference": "a9d127dd6a203ce6d255b2e2db49759f7506e015"
+                "reference": "d3ad0aa3b9f934602cb3e3902ebccf10be34d218"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nette/utils/zipball/a9d127dd6a203ce6d255b2e2db49759f7506e015",
-                "reference": "a9d127dd6a203ce6d255b2e2db49759f7506e015",
+                "url": "https://api.github.com/repos/nette/utils/zipball/d3ad0aa3b9f934602cb3e3902ebccf10be34d218",
+                "reference": "d3ad0aa3b9f934602cb3e3902ebccf10be34d218",
                "shasum": ""
            },
            "require": {
@ -4017,9 +4017,9 @@
            ],
            "support": {
                "issues": "https://github.com/nette/utils/issues",
-                "source": "https://github.com/nette/utils/tree/v4.0.3"
+                "source": "https://github.com/nette/utils/tree/v4.0.4"
            },
-            "time": "2023-10-29T21:02:13+00:00"
+            "time": "2024-01-17T16:50:36+00:00"
        },
        {
            "name": "nunomaduro/collision",
@ -10343,16 +10343,16 @@
        },
        {
            "name": "phpstan/phpstan",
-            "version": "1.10.55",
+            "version": "1.10.56",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "9a88f9d18ddf4cf54c922fbeac16c4cb164c5949"
+                "reference": "27816a01aea996191ee14d010f325434c0ee76fa"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/9a88f9d18ddf4cf54c922fbeac16c4cb164c5949",
-                "reference": "9a88f9d18ddf4cf54c922fbeac16c4cb164c5949",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/27816a01aea996191ee14d010f325434c0ee76fa",
+                "reference": "27816a01aea996191ee14d010f325434c0ee76fa",
                "shasum": ""
            },
            "require": {
@ -10401,7 +10401,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-01-08T12:32:40+00:00"
+            "time": "2024-01-15T10:43:00+00:00"
        },
        {
            "name": "phpstan/phpstan-deprecation-rules",
@ -10823,16 +10823,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "10.5.6",
+            "version": "10.5.8",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "ab9a20b623b235165d24faa9d1da925cb54939c0"
+                "reference": "08f4fa74d5fbfff1ef22abffee47aaedcaea227e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ab9a20b623b235165d24faa9d1da925cb54939c0",
-                "reference": "ab9a20b623b235165d24faa9d1da925cb54939c0",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/08f4fa74d5fbfff1ef22abffee47aaedcaea227e",
+                "reference": "08f4fa74d5fbfff1ef22abffee47aaedcaea227e",
                "shasum": ""
            },
            "require": {
@ -10904,7 +10904,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.6"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.8"
            },
            "funding": [
                {
@ -10920,7 +10920,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-01-13T12:49:56+00:00"
+            "time": "2024-01-19T07:07:27+00:00"
        },
        {
            "name": "sebastian/cli-parser",
--- a/config/firefly.php
+++ b/config/firefly.php
@ -115,7 +115,7 @@ return [
        'handle_debts' => true,
        // see cer.php for exchange rates feature flag.
    ],
-    'version'                      => '6.1.6',
+    'version'                      => '6.1.7',
    'api_version'                  => '2.0.12',
    'db_version'                   => 22,

--- a/package-lock.json
+++ b/package-lock.json
@ -592,9 +592,9 @@
            }
        },
        "node_modules/date-fns": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.2.0.tgz",
-            "integrity": "sha512-E4KWKavANzeuusPi0jUjpuI22SURAznGkx7eZV+4i6x2A+IZxAMcajgkvuDAU1bg40+xuhW1zRdVIIM/4khuIg==",
+            "version": "3.3.0",
+            "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.3.0.tgz",
+            "integrity": "sha512-xuouT0GuI2W8yXhCMn/AXbSl1Av3wu2hJXxMnnILTY3bYY0UgNK0qOwVXqdFBrobW5qbX1TuOTgMw7c2H2OuhA==",
            "funding": {
                "type": "github",
                "url": "https://github.com/sponsors/kossnocorp"
@ -719,9 +719,9 @@
            }
        },
        "node_modules/i18next": {
-            "version": "23.7.16",
-            "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.7.16.tgz",
-            "integrity": "sha512-SrqFkMn9W6Wb43ZJ9qrO6U2U4S80RsFMA7VYFSqp7oc7RllQOYDCdRfsse6A7Cq/V8MnpxKvJCYgM8++27n4Fw==",
+            "version": "23.7.17",
+            "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.7.17.tgz",
+            "integrity": "sha512-Wh3mNWeVlwx5HrDSPeJNUYZUrEwFbqykjy80ktIbgRKz41P51wRNyMfXSf5fICyHNJX4O/4XWbecFkprfS8G6w==",
            "funding": [
                {
                    "type": "individual",
@ -986,9 +986,9 @@
            }
        },
        "node_modules/sass": {
-            "version": "1.69.7",
-            "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.7.tgz",
-            "integrity": "sha512-rzj2soDeZ8wtE2egyLXgOOHQvaC2iosZrkF6v3EUG+tBwEvhqUCzm0VP3k9gHF9LXbSrRhT5SksoI56Iw8NPnQ==",
+            "version": "1.70.0",
+            "resolved": "https://registry.npmjs.org/sass/-/sass-1.70.0.tgz",
+            "integrity": "sha512-uUxNQ3zAHeAx5nRFskBnrWzDUJrrvpCPD5FNAoRvTi0WwremlheES3tg+56PaVtCs5QDRX5CBLxxKMDJMEa1WQ==",
            "dev": true,
            "dependencies": {
                "chokidar": ">=3.0.0 <4.0.0",
--- a/public/build/assets/create-2569100d.js
+++ b/public/build/assets/create-2569100d.js
--- a/public/build/assets/create-empty-split-c3730b85.js
+++ b/public/build/assets/create-empty-split-c3730b85.js
@ -1 +1 @@
-import{f as n}from"./vendor-0ba1deae.js";function e(){return{id:"",name:"",alpine_name:""}}function o(){return{description:[],amount:[],currency_code:[],foreign_amount:[],foreign_currency_code:[],source_account:[],destination_account:[],budget_id:[],category_name:[],piggy_bank_id:[],bill_id:[],tags:[],notes:[],internal_reference:[],external_url:[],latitude:[],longitude:[],zoom_level:[],date:[],interest_date:[],book_date:[],process_date:[],due_date:[],payment_date:[],invoice_date:[]}}function d(){let t=n(new Date,"yyyy-MM-dd HH:mm");return{description:"",amount:"",currency_code:"EUR",foreign_amount:"",foreign_currency_code:"",source_account:e(),destination_account:e(),budget_id:null,category_name:"",piggy_bank_id:null,bill_id:null,tags:[],notes:"",internal_reference:"",external_url:"",hasLocation:!1,latitude:null,longitude:null,zoomLevel:null,date:t,interest_date:"",book_date:"",process_date:"",due_date:"",payment_date:"",invoice_date:"",errors:o()}}export{d as c,o as d};
+import{f as n}from"./vendor-5cffaf70.js";function e(){return{id:"",name:"",alpine_name:""}}function o(){return{description:[],amount:[],currency_code:[],foreign_amount:[],foreign_currency_code:[],source_account:[],destination_account:[],budget_id:[],category_name:[],piggy_bank_id:[],bill_id:[],tags:[],notes:[],internal_reference:[],external_url:[],latitude:[],longitude:[],zoom_level:[],date:[],interest_date:[],book_date:[],process_date:[],due_date:[],payment_date:[],invoice_date:[]}}function d(){let t=n(new Date,"yyyy-MM-dd HH:mm");return{description:"",amount:"",currency_code:"EUR",foreign_amount:"",foreign_currency_code:"",source_account:e(),destination_account:e(),budget_id:null,category_name:"",piggy_bank_id:null,bill_id:null,tags:[],notes:"",internal_reference:"",external_url:"",hasLocation:!1,latitude:null,longitude:null,zoomLevel:null,date:t,interest_date:"",book_date:"",process_date:"",due_date:"",payment_date:"",invoice_date:"",errors:o()}}export{d as c,o as d};
--- a/public/build/assets/dashboard-82f52d2a.js
+++ b/public/build/assets/dashboard-82f52d2a.js
--- a/public/build/assets/edit-070e8524.js
+++ b/public/build/assets/edit-070e8524.js
--- a/public/build/assets/format-money-bcfc2969.js
+++ b/public/build/assets/format-money-bcfc2969.js
--- a/public/build/assets/get-32a7112a.js
+++ b/public/build/assets/get-32a7112a.js
@ -1 +1 @@
-import{a as s}from"./format-money-a71f277a.js";class p{list(a){return s.get("/api/v2/transactions",{params:a})}show(a,t){return s.get("/api/v2/transactions/"+a,{params:t})}}export{p as G};
+import{a as s}from"./format-money-bcfc2969.js";class p{list(a){return s.get("/api/v2/transactions",{params:a})}show(a,t){return s.get("/api/v2/transactions/"+a,{params:t})}}export{p as G};
--- a/public/build/assets/get-fa539542.js
+++ b/public/build/assets/get-fa539542.js
@ -1 +1 @@
-import{a as s}from"./format-money-a71f277a.js";let t=class{list(a){return s.get("/api/v2/subscriptions",{params:a})}paid(a){return s.get("/api/v2/subscriptions/sum/paid",{params:a})}unpaid(a){return s.get("/api/v2/subscriptions/sum/unpaid",{params:a})}};class e{list(a){return s.get("/api/v2/piggy-banks",{params:a})}}export{t as G,e as a};
+import{a as s}from"./format-money-bcfc2969.js";let t=class{list(a){return s.get("/api/v2/subscriptions",{params:a})}paid(a){return s.get("/api/v2/subscriptions/sum/paid",{params:a})}unpaid(a){return s.get("/api/v2/subscriptions/sum/unpaid",{params:a})}};class e{list(a){return s.get("/api/v2/piggy-banks",{params:a})}}export{t as G,e as a};
--- a/public/build/assets/index-e87148c5.js
+++ b/public/build/assets/index-e87148c5.js
@ -1 +1 @@
-import{d as c,f as d}from"./format-money-a71f277a.js";import{f as p,i as n}from"./vendor-0ba1deae.js";import{G as f}from"./get-971543fd.js";let g=function(){return{notifications:{error:{show:!1,text:"",url:""},success:{show:!1,text:"",url:""},wait:{show:!1,text:""}},transactions:[],totalPages:1,perPage:50,page:1,tableColumns:{description:{enabled:!0},source:{enabled:!0},destination:{enabled:!0},amount:{enabled:!0}},formatMoney(t,i){return d(t,i)},format(t){return p(t,n.t("config.date_time_fns"))},init(){this.notifications.wait.show=!0,this.notifications.wait.text=n.t("firefly.wait_loading_data"),this.getTransactions(this.page)},getTransactions(t){const i=window.location.href.split("/"),a=i[i.length-1];new f().list({page:t,type:a}).then(s=>{this.parseTransactions(s.data.data),this.totalPages=s.data.meta.pagination.total_pages,this.perPage=s.data.meta.pagination.per_page,this.page=s.data.meta.pagination.current_page}).catch(s=>{this.notifications.wait.show=!1,this.notifications.error.show=!0,this.notifications.error.text=s.response.data.message})},parseTransactions(t){for(let i in t)if(t.hasOwnProperty(i)){let a=t[i],o=a.attributes.transactions.length>1,s=!0;for(let r in a.attributes.transactions)if(a.attributes.transactions.hasOwnProperty(r)){let e=a.attributes.transactions[r];e.split=o,e.firstSplit=s,e.group_title=a.attributes.group_title,e.id=a.id,e.created_at=a.attributes.created_at,e.updated_at=a.attributes.updated_at,e.user=a.attributes.user,e.user_group=a.attributes.user_group,s=!1,console.log(e),this.transactions.push(e)}}this.notifications.wait.show=!1}}},l={index:g,dates:c};function u(){Object.keys(l).forEach(t=>{console.log(`Loading page component "${t}"`);let i=l[t]();Alpine.data(t,()=>i)}),Alpine.start()}document.addEventListener("firefly-iii-bootstrapped",()=>{console.log("Loaded through event listener."),u()});window.bootstrapped&&(console.log("Loaded through window variable."),u());
+import{d as c,f as d}from"./format-money-bcfc2969.js";import{f as p,i as n}from"./vendor-5cffaf70.js";import{G as f}from"./get-32a7112a.js";let g=function(){return{notifications:{error:{show:!1,text:"",url:""},success:{show:!1,text:"",url:""},wait:{show:!1,text:""}},transactions:[],totalPages:1,perPage:50,page:1,tableColumns:{description:{enabled:!0},source:{enabled:!0},destination:{enabled:!0},amount:{enabled:!0}},formatMoney(t,i){return d(t,i)},format(t){return p(t,n.t("config.date_time_fns"))},init(){this.notifications.wait.show=!0,this.notifications.wait.text=n.t("firefly.wait_loading_data"),this.getTransactions(this.page)},getTransactions(t){const i=window.location.href.split("/"),a=i[i.length-1];new f().list({page:t,type:a}).then(s=>{this.parseTransactions(s.data.data),this.totalPages=s.data.meta.pagination.total_pages,this.perPage=s.data.meta.pagination.per_page,this.page=s.data.meta.pagination.current_page}).catch(s=>{this.notifications.wait.show=!1,this.notifications.error.show=!0,this.notifications.error.text=s.response.data.message})},parseTransactions(t){for(let i in t)if(t.hasOwnProperty(i)){let a=t[i],o=a.attributes.transactions.length>1,s=!0;for(let r in a.attributes.transactions)if(a.attributes.transactions.hasOwnProperty(r)){let e=a.attributes.transactions[r];e.split=o,e.firstSplit=s,e.group_title=a.attributes.group_title,e.id=a.id,e.created_at=a.attributes.created_at,e.updated_at=a.attributes.updated_at,e.user=a.attributes.user,e.user_group=a.attributes.user_group,s=!1,console.log(e),this.transactions.push(e)}}this.notifications.wait.show=!1}}},l={index:g,dates:c};function u(){Object.keys(l).forEach(t=>{console.log(`Loading page component "${t}"`);let i=l[t]();Alpine.data(t,()=>i)}),Alpine.start()}document.addEventListener("firefly-iii-bootstrapped",()=>{console.log("Loaded through event listener."),u()});window.bootstrapped&&(console.log("Loaded through window variable."),u());
--- a/public/build/assets/parse-downloaded-splits-d8bf7632.js
+++ b/public/build/assets/parse-downloaded-splits-d8bf7632.js
@ -1 +1 @@
-import{c as r}from"./create-empty-split-b2c15454.js";import{f as o}from"./vendor-0ba1deae.js";function c(a){let n=[];for(let i in a)if(a.hasOwnProperty(i)){let e=a[i],t=r();t.bill_id=e.bill_id,t.bill_name=e.bill_name,t.budget_id=e.budget_id,t.budget_name=e.budget_name,t.category_name=e.category_name,t.category_id=e.category_id,t.piggy_bank_id=e.piggy_bank_id,t.piggy_bank_name=e.piggy_bank_name,t.book_date=e.book_date,t.due_date=e.due_date,t.interest_date=e.interest_date,t.invoice_date=e.invoice_date,t.payment_date=e.payment_date,t.process_date=e.process_date,t.external_url=e.external_url,t.internal_reference=e.internal_reference,t.notes=e.notes,t.tags=e.tags,t.amount=parseFloat(e.amount).toFixed(e.currency_decimal_places),t.currency_code=e.currency_code,e.foreign_amount!==null&&(t.forein_currency_code=e.foreign_currency_code,t.foreign_amount=parseFloat(e.foreign_amount).toFixed(e.foreign_currency_decimal_places)),t.date=o(new Date(e.date),"yyyy-MM-dd HH:mm"),t.description=e.description,t.destination_account={id:e.destination_id,name:e.destination_name,type:e.destination_type,alpine_name:e.destination_name},t.source_account={id:e.source_id,name:e.source_name,type:e.source_type,alpine_name:e.source_name},e.latitude!==null&&(t.hasLocation=!0,t.latitude=e.latitude,t.longitude=e.longitude,t.zoomLevel=e.zoom_level),n.push(t)}return n}export{c as p};
+import{c as r}from"./create-empty-split-c3730b85.js";import{f as o}from"./vendor-5cffaf70.js";function c(a){let n=[];for(let i in a)if(a.hasOwnProperty(i)){let e=a[i],t=r();t.bill_id=e.bill_id,t.bill_name=e.bill_name,t.budget_id=e.budget_id,t.budget_name=e.budget_name,t.category_name=e.category_name,t.category_id=e.category_id,t.piggy_bank_id=e.piggy_bank_id,t.piggy_bank_name=e.piggy_bank_name,t.book_date=e.book_date,t.due_date=e.due_date,t.interest_date=e.interest_date,t.invoice_date=e.invoice_date,t.payment_date=e.payment_date,t.process_date=e.process_date,t.external_url=e.external_url,t.internal_reference=e.internal_reference,t.notes=e.notes,t.tags=e.tags,t.amount=parseFloat(e.amount).toFixed(e.currency_decimal_places),t.currency_code=e.currency_code,e.foreign_amount!==null&&(t.forein_currency_code=e.foreign_currency_code,t.foreign_amount=parseFloat(e.foreign_amount).toFixed(e.foreign_currency_decimal_places)),t.date=o(new Date(e.date),"yyyy-MM-dd HH:mm"),t.description=e.description,t.destination_account={id:e.destination_id,name:e.destination_name,type:e.destination_type,alpine_name:e.destination_name},t.source_account={id:e.source_id,name:e.source_name,type:e.source_type,alpine_name:e.source_name},e.latitude!==null&&(t.hasLocation=!0,t.latitude=e.latitude,t.longitude=e.longitude,t.zoomLevel=e.zoom_level),n.push(t)}return n}export{c as p};
--- a/public/build/assets/show-ddb72bf9.js
+++ b/public/build/assets/show-ddb72bf9.js
--- a/public/build/assets/splice-errors-into-transactions-66181f21.js
+++ b/public/build/assets/splice-errors-into-transactions-66181f21.js
--- a/public/build/assets/vendor-5cffaf70.js
+++ b/public/build/assets/vendor-5cffaf70.js
--- a/public/build/manifest.json
+++ b/public/build/manifest.json
@ -1,50 +1,50 @@
 {
-  "_create-empty-split-b2c15454.js": {
-    "file": "assets/create-empty-split-b2c15454.js",
+  "_create-empty-split-c3730b85.js": {
+    "file": "assets/create-empty-split-c3730b85.js",
    "imports": [
-      "_vendor-0ba1deae.js"
+      "_vendor-5cffaf70.js"
    ],
-    "integrity": "sha384-LPTZ0hEPbyGHGP76xXmeyTW22lbs5CNJU8wwXx3SOeUf6jDNYVoSSEe05QdKYKQ0"
+    "integrity": "sha384-tM3C+VDvcg8Ma9ABf2p4A42lrtYJbZJ/iQMionR5fXnq6Dlsv99cN6jzdYfSXRpL"
  },
-  "_format-money-a71f277a.js": {
-    "file": "assets/format-money-a71f277a.js",
+  "_format-money-bcfc2969.js": {
+    "file": "assets/format-money-bcfc2969.js",
    "imports": [
-      "_vendor-0ba1deae.js"
+      "_vendor-5cffaf70.js"
    ],
-    "integrity": "sha384-NX1AQwixTtbRYpnSgnTwE6OzMgA0zTe/BOQp4tA+sMFZ7A/Z/8AM85Ia0343u020"
+    "integrity": "sha384-H9iUW3m5wt1FWJOeHjQViKOS7VemiDYAxy4IgBdonhBxSWlGqWKpK9efO9VYAyUK"
  },
-  "_get-971543fd.js": {
-    "file": "assets/get-971543fd.js",
+  "_get-32a7112a.js": {
+    "file": "assets/get-32a7112a.js",
    "imports": [
-      "_format-money-a71f277a.js"
+      "_format-money-bcfc2969.js"
    ],
-    "integrity": "sha384-kRyC3Ngpm92ejZXmYiYd9NWyzp47VMYlXB1QCIMNJf/5g0CM3/id1tMx1wM7sWop"
+    "integrity": "sha384-j9tBD/bZIRAZzguS3w9Cpr1P0zj47iXc+QwFGwYBsEoKzMhIeABg+j7tOby3YaRd"
  },
-  "_get-c4c00bed.js": {
-    "file": "assets/get-c4c00bed.js",
+  "_get-fa539542.js": {
+    "file": "assets/get-fa539542.js",
    "imports": [
-      "_format-money-a71f277a.js"
+      "_format-money-bcfc2969.js"
    ],
-    "integrity": "sha384-KLoBbucwHe+WIBcGunE9+tql5dx39uDkibZZDSq9X9m25oHNXRtVbjfI8ljmGSYe"
+    "integrity": "sha384-RcC4qxcJgrERr1ZEEadEOSkDok1d0+Fje5/VzoT0LH0pAW2UZtvFCFOghjBzYEes"
  },
-  "_parse-downloaded-splits-19845c1d.js": {
-    "file": "assets/parse-downloaded-splits-19845c1d.js",
+  "_parse-downloaded-splits-d8bf7632.js": {
+    "file": "assets/parse-downloaded-splits-d8bf7632.js",
    "imports": [
-      "_create-empty-split-b2c15454.js",
-      "_vendor-0ba1deae.js"
+      "_create-empty-split-c3730b85.js",
+      "_vendor-5cffaf70.js"
    ],
-    "integrity": "sha384-fvvNIwjZ9BkUU+LRImRK606sDo4vJs8/Z58Vm7T46vAl66xckgxX+GVjsltwkhus"
+    "integrity": "sha384-wNGsGr9RAQ9aZNE6OVBMivKqjZ9FqKSIo5RCR5TQMoitKAlswFJXqpy4w8INcKdD"
  },
-  "_splice-errors-into-transactions-995deb6d.js": {
-    "file": "assets/splice-errors-into-transactions-995deb6d.js",
+  "_splice-errors-into-transactions-66181f21.js": {
+    "file": "assets/splice-errors-into-transactions-66181f21.js",
    "imports": [
-      "_format-money-a71f277a.js",
-      "_get-c4c00bed.js",
-      "_vendor-0ba1deae.js"
+      "_format-money-bcfc2969.js",
+      "_get-fa539542.js",
+      "_vendor-5cffaf70.js"
    ],
-    "integrity": "sha384-xy9kpKxM6h0137K3N9ZyXSqNwsD3sk+KrMm3tWivk/WtgXy+fxjgk08YSX7Zgc+d"
+    "integrity": "sha384-kK0ycNn7A7lWnheEsYyjyCA0brb5x2kZpXuqFPMOzhjrYiTLdGkT/jNHnmjsqqGc"
  },
-  "_vendor-0ba1deae.js": {
+  "_vendor-5cffaf70.js": {
    "assets": [
      "assets/layers-1dbbe9d0.png",
      "assets/layers-2x-066daca8.png",
@ -53,8 +53,8 @@
    "css": [
      "assets/vendor-49001d3f.css"
    ],
-    "file": "assets/vendor-0ba1deae.js",
-    "integrity": "sha384-9W7xmHUksAccX1L6MeAPa77/siJb7Gka71e+TA2dfgu4VV7xUgeqeyTCIShNLB4b"
+    "file": "assets/vendor-5cffaf70.js",
+    "integrity": "sha384-fDhVh4Zy7b5WLcQMlIdStDS71sBfQ+0OOCsEvrBaG1oApdU+xun/0OjuLNSgZoh4"
  },
  "node_modules/@fortawesome/fontawesome-free/webfonts/fa-brands-400.ttf": {
    "file": "assets/fa-brands-400-5656d596.ttf",
@ -102,55 +102,55 @@
    "integrity": "sha384-wg83fCOXjBtqzFAWhTL9Sd9vmLUNhfEEzfmNUX9zwv2igKlz/YQbdapF4ObdxF+R"
  },
  "resources/assets/v2/pages/dashboard/dashboard.js": {
-    "file": "assets/dashboard-60d58953.js",
+    "file": "assets/dashboard-82f52d2a.js",
    "imports": [
-      "_format-money-a71f277a.js",
-      "_vendor-0ba1deae.js",
-      "_get-971543fd.js",
-      "_get-c4c00bed.js"
+      "_format-money-bcfc2969.js",
+      "_vendor-5cffaf70.js",
+      "_get-32a7112a.js",
+      "_get-fa539542.js"
    ],
    "isEntry": true,
    "src": "resources/assets/v2/pages/dashboard/dashboard.js",
-    "integrity": "sha384-KGiwIVYJZwLUgiraYW27lW+R5wW0LW30/Z0z6UA1SkfjjoeDXm1DTcSoUtMhltaG"
+    "integrity": "sha384-ivWUK8XFn+jjqMvInPScesehtS+Rr/d8YgAG8Xoiw9Gv9kLPgIXVQSo6fciIzkYU"
  },
  "resources/assets/v2/pages/transactions/create.js": {
-    "file": "assets/create-dd6750e8.js",
+    "file": "assets/create-2569100d.js",
    "imports": [
-      "_format-money-a71f277a.js",
-      "_create-empty-split-b2c15454.js",
-      "_splice-errors-into-transactions-995deb6d.js",
-      "_vendor-0ba1deae.js",
-      "_get-c4c00bed.js"
+      "_format-money-bcfc2969.js",
+      "_create-empty-split-c3730b85.js",
+      "_splice-errors-into-transactions-66181f21.js",
+      "_vendor-5cffaf70.js",
+      "_get-fa539542.js"
    ],
    "isEntry": true,
    "src": "resources/assets/v2/pages/transactions/create.js",
-    "integrity": "sha384-rrUkO07lnTiSQ+5SPMwOLmnu2J+5oQmZFKfsf3ApkQG9ct3qrwBocQ9f0H5cftv2"
+    "integrity": "sha384-ClkQpKJ81+fT7zrt6rCxOCR0hBr/aDJCIMS4tmuBEl/xruP9IJSokuNX4I7mSy0Z"
  },
  "resources/assets/v2/pages/transactions/edit.js": {
-    "file": "assets/edit-955087f5.js",
+    "file": "assets/edit-070e8524.js",
    "imports": [
-      "_format-money-a71f277a.js",
-      "_get-971543fd.js",
-      "_parse-downloaded-splits-19845c1d.js",
-      "_splice-errors-into-transactions-995deb6d.js",
-      "_vendor-0ba1deae.js",
-      "_create-empty-split-b2c15454.js",
-      "_get-c4c00bed.js"
+      "_format-money-bcfc2969.js",
+      "_get-32a7112a.js",
+      "_parse-downloaded-splits-d8bf7632.js",
+      "_splice-errors-into-transactions-66181f21.js",
+      "_vendor-5cffaf70.js",
+      "_create-empty-split-c3730b85.js",
+      "_get-fa539542.js"
    ],
    "isEntry": true,
    "src": "resources/assets/v2/pages/transactions/edit.js",
-    "integrity": "sha384-X1LvGXQKDOfvCyLgWW7zmgFB3R4cIBFfQyHnB/tQZppov8BmZzrv7diR5Bymy8pw"
+    "integrity": "sha384-1p26d3/cG4QvjOFq8h4wbhG5NIk9DR5lftz/vGW08h6Wn5P5BCBDiOpMQ5YKGrkG"
  },
  "resources/assets/v2/pages/transactions/index.js": {
-    "file": "assets/index-cf70f728.js",
+    "file": "assets/index-e87148c5.js",
    "imports": [
-      "_format-money-a71f277a.js",
-      "_vendor-0ba1deae.js",
-      "_get-971543fd.js"
+      "_format-money-bcfc2969.js",
+      "_vendor-5cffaf70.js",
+      "_get-32a7112a.js"
    ],
    "isEntry": true,
    "src": "resources/assets/v2/pages/transactions/index.js",
-    "integrity": "sha384-aCoGtjOpn/zM6UGPc4bOZEGISPRJd8Vd2l/7VbFnJzjrSzMRIv5hhU1vpvw0JoTh"
+    "integrity": "sha384-eeBnTRXYgmfZr405R1VtnaS+SUshL2BQb0tdzhTKpubsl57Uajo2dGj21NVs7VZG"
  },
  "resources/assets/v2/pages/transactions/show.css": {
    "file": "assets/show-8b1429e5.css",
@ -161,17 +161,17 @@
    "css": [
      "assets/show-8b1429e5.css"
    ],
-    "file": "assets/show-19f421da.js",
+    "file": "assets/show-ddb72bf9.js",
    "imports": [
-      "_format-money-a71f277a.js",
-      "_vendor-0ba1deae.js",
-      "_get-971543fd.js",
-      "_parse-downloaded-splits-19845c1d.js",
-      "_create-empty-split-b2c15454.js"
+      "_format-money-bcfc2969.js",
+      "_vendor-5cffaf70.js",
+      "_get-32a7112a.js",
+      "_parse-downloaded-splits-d8bf7632.js",
+      "_create-empty-split-c3730b85.js"
    ],
    "isEntry": true,
    "src": "resources/assets/v2/pages/transactions/show.js",
-    "integrity": "sha384-Ml/m6l4ZRqzuhW7/z2hKnrLYZKKkrswMA60W6eWSMeQkNXgzcgO4lO9YS8iYHO2O"
+    "integrity": "sha384-xtfPbtKPTnEqws536WTYd9sSwhclkigL6ERXaWGn/rLQo2kzD2cXBg2McCQjueMZ"
  },
  "resources/assets/v2/sass/app.scss": {
    "file": "assets/app-fb7b26ec.css",
--- a/public/v1/js/create_transaction.js
+++ b/public/v1/js/create_transaction.js
--- a/public/v1/js/edit_transaction.js
+++ b/public/v1/js/edit_transaction.js
--- a/public/v1/js/profile.js
+++ b/public/v1/js/profile.js
--- a/public/v1/js/webhooks/create.js
+++ b/public/v1/js/webhooks/create.js
--- a/public/v1/js/webhooks/edit.js
+++ b/public/v1/js/webhooks/edit.js
--- a/public/v1/js/webhooks/index.js
+++ b/public/v1/js/webhooks/index.js
--- a/public/v1/js/webhooks/show.js
+++ b/public/v1/js/webhooks/show.js
--- a/public/v2/i18n/ca_ES.json
+++ b/public/v2/i18n/ca_ES.json
@ -7,7 +7,7 @@
        "spent": "Gastat",
        "left": "Queda",
        "paid": "Pagat",
-        "errors_submission": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission": "Hi ha hagut un error amb el teu enviament. Per favor, revisa els errors de sota: %{errorMessage}",
        "unpaid": "Pendent de pagament",
        "default_group_title_name_plain": "no agrupades",
        "subscriptions_in_group": "Subscripcions al grup \"%{title}\"",
@ -25,7 +25,7 @@
        "stored_journal_js": "S'ha creat la transacci\u00f3 \"%{description}\" correctament",
        "wait_loading_transaction": "Please wait for the form to load",
        "nothing_found": "(nothing found)",
-        "wait_loading_data": "Please wait for your information to load...",
+        "wait_loading_data": "Per favor, espera que carregui la teva informaci\u00f3...",
        "Transfer": "Transfer\u00e8ncia",
        "Withdrawal": "Retirada",
        "Deposit": "Ingr\u00e9s",
--- a/public/v2/i18n/de_DE.json
+++ b/public/v2/i18n/de_DE.json
@ -23,9 +23,9 @@
        "unknown_any_plain": "Unbekanntes Konto",
        "unknown_budget_plain": "Kein Budget",
        "stored_journal_js": "Neue Buchung \u201e%{description}\u201d erfolgreich erstellt",
-        "wait_loading_transaction": "Please wait for the form to load",
-        "nothing_found": "(nothing found)",
-        "wait_loading_data": "Please wait for your information to load...",
+        "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",
        "Transfer": "Umbuchung",
        "Withdrawal": "Ausgabe",
        "Deposit": "Einnahme",
--- a/public/v2/i18n/en_US.json
+++ b/public/v2/i18n/en_US.json
@ -0,0 +1,42 @@
+{
+    "config": {
+        "html_language": "en",
+        "date_time_fns": "MMMM do, yyyy @ HH:mm:ss"
+    },
+    "firefly": {
+        "spent": "Spent",
+        "left": "Left",
+        "paid": "Paid",
+        "errors_submission": "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}\"",
+        "subscr_expected_x_times": "Expect to pay %{amount} %{times} times this period",
+        "overspent": "Overspent",
+        "money_flowing_in": "In",
+        "money_flowing_out": "Out",
+        "category": "Category",
+        "unknown_category_plain": "No category",
+        "all_money": "All your money",
+        "unknown_source_plain": "Unknown source account",
+        "unknown_dest_plain": "Unknown destination account",
+        "unknown_any_plain": "Unknown account",
+        "unknown_budget_plain": "No budget",
+        "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...",
+        "Transfer": "Transfer",
+        "Withdrawal": "Withdrawal",
+        "Deposit": "Deposit",
+        "expense_account": "Expense account",
+        "revenue_account": "Revenue account",
+        "budget": "Budget",
+        "account_type_Asset account": "Asset account",
+        "account_type_Expense account": "Expense account",
+        "account_type_Revenue account": "Revenue account",
+        "account_type_Debt": "Debt",
+        "account_type_Loan": "Loan",
+        "account_type_Mortgage": "Mortgage"
+    }
+}
--- a/public/v2/i18n/es_ES.json
+++ b/public/v2/i18n/es_ES.json
@ -23,9 +23,9 @@
        "unknown_any_plain": "Cuenta desconocida",
        "unknown_budget_plain": "Sin presupuesto",
        "stored_journal_js": "Nueva transacci\u00f3n creada con \u00e9xito \"%{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...",
+        "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...",
        "Transfer": "Transferencia",
        "Withdrawal": "Gasto",
        "Deposit": "Ingreso",
--- a/public/v2/i18n/fr_FR.json
+++ b/public/v2/i18n/fr_FR.json
@ -7,7 +7,7 @@
        "spent": "D\u00e9pens\u00e9",
        "left": "Reste",
        "paid": "Pay\u00e9",
-        "errors_submission": "Certaines informations ne sont pas correctes dans votre formulaire. Veuillez v\u00e9rifier les erreurs ci-dessous : %{errorMessage}",
+        "errors_submission": "Il y a eu un probl\u00e8me avec votre envoi. 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,9 +23,9 @@
        "unknown_any_plain": "Compte inconnu",
        "unknown_budget_plain": "Pas de budget",
        "stored_journal_js": "Op\u00e9ration \"%{description}\" cr\u00e9\u00e9e avec succ\u00e8s",
-        "wait_loading_transaction": "Please wait for the form to load",
-        "nothing_found": "(nothing found)",
-        "wait_loading_data": "Please wait for your information to load...",
+        "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...",
        "Transfer": "Transfert",
        "Withdrawal": "D\u00e9pense",
        "Deposit": "D\u00e9p\u00f4t",
--- a/public/v2/i18n/hu_HU.json
+++ b/public/v2/i18n/hu_HU.json
@ -23,9 +23,9 @@
        "unknown_any_plain": "Unknown account",
        "unknown_budget_plain": "No budget",
        "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...",
+        "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...",
        "Transfer": "\u00c1tvezet\u00e9s",
        "Withdrawal": "K\u00f6lts\u00e9g",
        "Deposit": "Bev\u00e9tel",
--- a/public/v2/i18n/it_IT.json
+++ b/public/v2/i18n/it_IT.json
@ -9,32 +9,32 @@
        "paid": "Pagati",
        "errors_submission": "Errore durante l'invio. Controlla gli errori segnalati qui sotto: %{errorMessage}",
        "unpaid": "Da pagare",
-        "default_group_title_name_plain": "ungrouped",
+        "default_group_title_name_plain": "non raggruppato",
        "subscriptions_in_group": "Abbonamenti nel gruppo \"%{title}\"",
-        "subscr_expected_x_times": "Expect to pay %{amount} %{times} times this period",
+        "subscr_expected_x_times": "Prevedi di pagare %{amount} %{times} volte in questo periodo",
        "overspent": "Speso troppo",
        "money_flowing_in": "Entrate",
        "money_flowing_out": "Uscite",
        "category": "Categoria",
-        "unknown_category_plain": "No category",
-        "all_money": "All your money",
-        "unknown_source_plain": "Unknown source account",
-        "unknown_dest_plain": "Unknown destination account",
-        "unknown_any_plain": "Unknown account",
-        "unknown_budget_plain": "No budget",
-        "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...",
+        "unknown_category_plain": "Nessuna categoria",
+        "all_money": "Tutto il tuo denaro",
+        "unknown_source_plain": "Conto d'origine sconosciuto",
+        "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",
+        "wait_loading_transaction": "Attendi il caricamento del modello",
+        "nothing_found": "(nessun risultato)",
+        "wait_loading_data": "Ti preghiamo di attendere il caricamento delle tue informazioni...",
        "Transfer": "Trasferimento",
        "Withdrawal": "Prelievo",
        "Deposit": "Entrata",
-        "expense_account": "Expense account",
-        "revenue_account": "Revenue account",
+        "expense_account": "Conto di spese",
+        "revenue_account": "Conto di entrate",
        "budget": "Budget",
-        "account_type_Asset account": "Asset account",
-        "account_type_Expense account": "Expense account",
-        "account_type_Revenue account": "Revenue account",
+        "account_type_Asset account": "Conto di risorse",
+        "account_type_Expense account": "Conto di spesa",
+        "account_type_Revenue account": "Conto di entrate",
        "account_type_Debt": "Debito",
        "account_type_Loan": "Prestito",
        "account_type_Mortgage": "Mutuo"
--- a/public/v2/i18n/pl_PL.json
+++ b/public/v2/i18n/pl_PL.json
@ -23,8 +23,8 @@
        "unknown_any_plain": "Nieznane konto",
        "unknown_budget_plain": "Brak bud\u017cetu",
        "stored_journal_js": "Pomy\u015blnie utworzono now\u0105 transakcj\u0119 \"%{description}\"",
-        "wait_loading_transaction": "Please wait for the form to load",
-        "nothing_found": "(nothing found)",
+        "wait_loading_transaction": "Poczekaj na za\u0142adowanie formularza",
+        "nothing_found": "(nic nie znaleziono)",
        "wait_loading_data": "Please wait for your information to load...",
        "Transfer": "Transfer",
        "Withdrawal": "Wyp\u0142ata",
--- a/public/v2/i18n/pt_BR.json
+++ b/public/v2/i18n/pt_BR.json
@ -23,9 +23,9 @@
        "unknown_any_plain": "Conta desconhecida",
        "unknown_budget_plain": "Nenhum or\u00e7amento",
        "stored_journal_js": "Transa\u00e7\u00e3o \"%{description}\" criada com sucesso",
-        "wait_loading_transaction": "Please wait for the form to load",
-        "nothing_found": "(nothing found)",
-        "wait_loading_data": "Please wait for your information to load...",
+        "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...",
        "Transfer": "Transfer\u00eancia",
        "Withdrawal": "Retirada",
        "Deposit": "Dep\u00f3sito",
--- a/public/v2/i18n/ru_RU.json
+++ b/public/v2/i18n/ru_RU.json
@ -7,7 +7,7 @@
        "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": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission": "\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,9 +23,9 @@
        "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",
-        "wait_loading_transaction": "Please wait for the form to load",
-        "nothing_found": "(nothing found)",
-        "wait_loading_data": "Please wait for your information to load...",
+        "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...",
        "Transfer": "\u041f\u0435\u0440\u0435\u0432\u043e\u0434",
        "Withdrawal": "\u0420\u0430\u0441\u0445\u043e\u0434",
        "Deposit": "\u0414\u043e\u0445\u043e\u0434",
--- a/public/v2/i18n/sl_SI.json
+++ b/public/v2/i18n/sl_SI.json
@ -7,7 +7,7 @@
        "spent": "Porabljeno",
        "left": "Preostalo",
        "paid": "Pla\u010dano",
-        "errors_submission": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission": "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,12 +23,12 @@
        "unknown_any_plain": "Neznan ra\u010dun",
        "unknown_budget_plain": "Ni prora\u010duna",
        "stored_journal_js": "Nova transakcija \"%{description}\" je uspe\u0161no ustvarjena",
-        "wait_loading_transaction": "Please wait for the form to load",
-        "nothing_found": "(nothing found)",
-        "wait_loading_data": "Please wait for your information to load...",
+        "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...",
        "Transfer": "Prenos",
-        "Withdrawal": "Dvig",
-        "Deposit": "Polog",
+        "Withdrawal": "Odliv",
+        "Deposit": "Priliv",
        "expense_account": "Ra\u010dun stro\u0161kov",
        "revenue_account": "Ra\u010dun prihodkov",
        "budget": "Prora\u010dun",
--- a/public/v2/i18n/zh_TW.json
+++ b/public/v2/i18n/zh_TW.json
@ -13,8 +13,8 @@
        "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
        "subscr_expected_x_times": "Expect to pay %{amount} %{times} times this period",
        "overspent": "\u8d85\u652f",
-        "money_flowing_in": "\u5728",
-        "money_flowing_out": "\u5916",
+        "money_flowing_in": "\u6d41\u5165",
+        "money_flowing_out": "\u6d41\u51fa",
        "category": "\u5206\u985e",
        "unknown_category_plain": "No category",
        "all_money": "All your money",
--- a/resources/assets/js/locales/ca.json
+++ b/resources/assets/js/locales/ca.json
@ -6,7 +6,7 @@
        "flash_success": "\u00c8xit!",
        "close": "Tancar",
        "split_transaction_title": "Descripci\u00f3 de la transacci\u00f3 dividida",
-        "errors_submission": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission": "Hi ha hagut un error amb el teu enviament. Per favor, revisa els errors de sota: %{errorMessage}",
        "split": "Dividir",
        "single_split": "Divisi\u00f3",
        "transaction_stored_link": "La <a href=\"transactions\/show\/{ID}\">Transacci\u00f3 #{ID} (\"{title}\")<\/a> s'ha desat.",
--- a/resources/assets/js/locales/fr.json
+++ b/resources/assets/js/locales/fr.json
@ -5,10 +5,10 @@
        "flash_warning": "Attention !",
        "flash_success": "Super !",
        "close": "Fermer",
-        "split_transaction_title": "Description de l'op\u00e9ration ventil\u00e9e",
-        "errors_submission": "Certaines informations ne sont pas correctes dans votre formulaire. Veuillez v\u00e9rifier les erreurs ci-dessous : %{errorMessage}",
-        "split": "Ventiler",
-        "single_split": "Ventilation",
+        "split_transaction_title": "Description de l'op\u00e9ration s\u00e9par\u00e9e",
+        "errors_submission": "Il y a eu un probl\u00e8me avec votre envoi. Veuillez v\u00e9rifier les erreurs ci-dessous : %{errorMessage}",
+        "split": "S\u00e9paration",
+        "single_split": "S\u00e9paration unique",
        "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">L'op\u00e9ration n\u00b0{ID} (\"{title}\")<\/a> a \u00e9t\u00e9 enregistr\u00e9e.",
        "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Le Webhook #{ID} (\"{title}\")<\/a> a \u00e9t\u00e9 enregistr\u00e9.",
        "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Le webhook #{ID}<\/a> (\"{title}\") a \u00e9t\u00e9 mis \u00e0 jour.",
@ -42,11 +42,11 @@
        "update_transaction": "Mettre \u00e0 jour l'op\u00e9ration",
        "after_update_create_another": "Apr\u00e8s la mise \u00e0 jour, revenir ici pour continuer l'\u00e9dition.",
        "store_as_new": "Enregistrer comme une nouvelle op\u00e9ration au lieu de mettre \u00e0 jour.",
-        "split_title_help": "Si vous cr\u00e9ez une op\u00e9ration ventil\u00e9e, il doit y avoir une description globale pour chaque fractions de l'op\u00e9ration.",
+        "split_title_help": "Si vous cr\u00e9ez une op\u00e9ration s\u00e9par\u00e9e, il doit y avoir une description globale pour chaque fraction de l'op\u00e9ration.",
        "none_in_select_list": "(aucun)",
        "no_piggy_bank": "(aucune tirelire)",
        "description": "Description",
-        "split_transaction_title_help": "Si vous cr\u00e9ez une op\u00e9ration ventil\u00e9e, il doit y avoir une description globale pour chaque fraction de l'op\u00e9ration.",
+        "split_transaction_title_help": "Si vous cr\u00e9ez une op\u00e9ration s\u00e9par\u00e9e, il doit y avoir une description globale pour chaque fraction de l'op\u00e9ration.",
        "destination_account_reconciliation": "Vous ne pouvez pas modifier le compte de destination d'une op\u00e9ration de rapprochement.",
        "source_account_reconciliation": "Vous ne pouvez pas modifier le compte source d'une op\u00e9ration de rapprochement.",
        "budget": "Budget",
@ -91,10 +91,10 @@
        "profile_oauth_client_secret_expl": "Voici votre nouveau secret de client. C'est la seule fois qu'il sera affich\u00e9, donc ne le perdez pas ! Vous pouvez maintenant utiliser ce secret pour faire des requ\u00eates d'API.",
        "profile_oauth_confidential": "Confidentiel",
        "profile_oauth_confidential_help": "Exiger que le client s'authentifie avec un secret. Les clients confidentiels peuvent d\u00e9tenir des informations d'identification de mani\u00e8re s\u00e9curis\u00e9e sans les exposer \u00e0 des tiers non autoris\u00e9s. Les applications publiques, telles que les applications de bureau natif ou les SPA JavaScript, ne peuvent pas tenir des secrets en toute s\u00e9curit\u00e9.",
-        "multi_account_warning_unknown": "Selon le type d'op\u00e9ration que vous cr\u00e9ez, le(s) compte(s) source et\/ou de destination des ventilations suivantes peuvent \u00eatre remplac\u00e9s par celui de la premi\u00e8re ventilation de l'op\u00e9ration.",
-        "multi_account_warning_withdrawal": "Gardez en t\u00eate que le compte source des ventilations suivantes peut \u00eatre remplac\u00e9 par celui de la premi\u00e8re ventilation de la d\u00e9pense.",
-        "multi_account_warning_deposit": "Gardez en t\u00eate que le compte de destination des ventilations suivantes peut \u00eatre remplac\u00e9 par celui de la premi\u00e8re ventilation du d\u00e9p\u00f4t.",
-        "multi_account_warning_transfer": "Gardez en t\u00eate que les comptes source et de destination des ventilations suivantes peuvent \u00eatre remplac\u00e9s par ceux de la premi\u00e8re ventilation du transfert.",
+        "multi_account_warning_unknown": "Selon le type d'op\u00e9ration que vous cr\u00e9ez, le(s) compte(s) source et\/ou de destination des s\u00e9parations suivantes peuvent \u00eatre remplac\u00e9s par celui de la premi\u00e8re s\u00e9paration de l'op\u00e9ration.",
+        "multi_account_warning_withdrawal": "Gardez en t\u00eate que le compte source des s\u00e9parations suivantes peut \u00eatre remplac\u00e9 par celui de la premi\u00e8re s\u00e9paration de la d\u00e9pense.",
+        "multi_account_warning_deposit": "Gardez en t\u00eate que le compte de destination des s\u00e9parations suivantes peut \u00eatre remplac\u00e9 par celui de la premi\u00e8re s\u00e9paration du d\u00e9p\u00f4t.",
+        "multi_account_warning_transfer": "Gardez en t\u00eate que les comptes source et de destination des s\u00e9parations suivantes peuvent \u00eatre remplac\u00e9s par ceux de la premi\u00e8re s\u00e9paration du transfert.",
        "webhook_trigger_STORE_TRANSACTION": "Apr\u00e8s la cr\u00e9ation de l'op\u00e9ration",
        "webhook_trigger_UPDATE_TRANSACTION": "Apr\u00e8s la mise \u00e0 jour de l'op\u00e9ration",
        "webhook_trigger_DESTROY_TRANSACTION": "Apr\u00e8s la suppression de l'op\u00e9ration",
--- a/resources/assets/js/locales/it.json
+++ b/resources/assets/js/locales/it.json
@ -15,9 +15,9 @@
        "transaction_updated_link": "La <a href=\"transactions\/show\/{ID}\">transazione #{ID}<\/a> (\"{title}\") \u00e8 stata aggiornata.",
        "transaction_new_stored_link": "La <a href=\"transactions\/show\/{ID}\">transazione #{ID}<\/a> \u00e8 stata salvata.",
        "transaction_journal_information": "Informazioni transazione",
-        "submission_options": "Submission options",
-        "apply_rules_checkbox": "Apply rules",
-        "fire_webhooks_checkbox": "Fire webhooks",
+        "submission_options": "Opzioni di invio",
+        "apply_rules_checkbox": "Applica le regole",
+        "fire_webhooks_checkbox": "Esegui webhook",
        "no_budget_pointer": "Sembra che tu non abbia ancora dei budget. Dovresti crearne alcuni nella pagina dei <a href=\"budgets\">budget<\/a>. I budget possono aiutarti a tenere traccia delle spese.",
        "no_bill_pointer": "Sembra che tu non abbia ancora delle bollette. Dovresti crearne alcune nella pagina delle <a href=\"bills\">bollette<\/a>. Le bollette possono aiutarti a tenere traccia delle spese.",
        "source_account": "Conto di origine",
@ -31,7 +31,7 @@
        "submit": "Invia",
        "amount": "Importo",
        "date": "Data",
-        "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s).",
+        "is_reconciled_fields_dropped": "Poich\u00e9 questa transazione \u00e8 riconciliata, non potrai aggiornare i conti, n\u00e9 gli importi.",
        "tags": "Etichette",
        "no_budget": "(nessun budget)",
        "no_bill": "(nessuna bolletta)",
@ -71,7 +71,7 @@
        "profile_oauth_edit_client": "Modifica client",
        "profile_oauth_name_help": "Qualcosa di cui i tuoi utenti potranno riconoscere e fidarsi.",
        "profile_oauth_redirect_url": "URL di reindirizzamento",
-        "profile_oauth_clients_external_auth": "If you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
+        "profile_oauth_clients_external_auth": "Se stai utilizzando un fornitore di autenticazione esterno come Authelia, i client di OAuth non funzioneranno. Puoi utilizzare soltanto i Token d'Accesso Personale.",
        "profile_oauth_redirect_url_help": "L'URL di callback dell'autorizzazione della tua applicazione.",
        "profile_authorized_apps": "Applicazioni autorizzate",
        "profile_authorized_clients": "Client autorizzati",
--- a/resources/assets/js/locales/pt-br.json
+++ b/resources/assets/js/locales/pt-br.json
@ -134,7 +134,7 @@
        "active": "Ativo",
        "interest_date": "Data do juros",
        "title": "T\u00edtulo",
-        "book_date": "Data reserva",
+        "book_date": "Data de lan\u00e7amento",
        "process_date": "Data de processamento",
        "due_date": "Data de vencimento",
        "foreign_amount": "Montante em moeda estrangeira",
--- a/resources/assets/js/locales/ru.json
+++ b/resources/assets/js/locales/ru.json
@ -6,7 +6,7 @@
        "flash_success": "\u0423\u0441\u043f\u0435\u0448\u043d\u043e!",
        "close": "\u0417\u0430\u043a\u0440\u044b\u0442\u044c",
        "split_transaction_title": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u0440\u0430\u0437\u0434\u0435\u043b\u0451\u043d\u043d\u043e\u0439 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438",
-        "errors_submission": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission": "\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}",
        "split": "\u0420\u0430\u0437\u0434\u0435\u043b\u0438\u0442\u044c",
        "single_split": "\u0420\u0430\u0437\u0434\u0435\u043b\u0451\u043d\u043d\u0430\u044f \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f",
        "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">\u0422\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f #{ID} (\"{title}\")<\/a> \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0430.",
--- a/resources/assets/js/locales/sl.json
+++ b/resources/assets/js/locales/sl.json
@ -6,7 +6,7 @@
        "flash_success": "Uspelo je!",
        "close": "Zapri",
        "split_transaction_title": "Opis razdeljene transakcije",
-        "errors_submission": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
+        "errors_submission": "Nekaj je bilo narobe z va\u0161o oddajo. Preverite spodnje napake: %{errorMessage}",
        "split": "Razdeli",
        "single_split": "Razdeli",
        "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transakcija \u0161t. #{ID} (\"{title}\")<\/a> je bila shranjena.",
@ -51,9 +51,9 @@
        "source_account_reconciliation": "Pri usklajevalni transakciji ni mo\u017eno urejati izvornega ra\u010duna.",
        "budget": "Prora\u010dun",
        "bill": "Ra\u010dun",
-        "you_create_withdrawal": "Ustvarjate dvig.",
+        "you_create_withdrawal": "Ustvarjate odliv.",
        "you_create_transfer": "Ustvarjate prenos.",
-        "you_create_deposit": "Ustvari depozit.",
+        "you_create_deposit": "Ustvarja\u0161 priliv.",
        "edit": "Uredi",
        "delete": "Izbri\u0161i",
        "name": "Ime",
@ -92,8 +92,8 @@
        "profile_oauth_confidential": "Zaupno",
        "profile_oauth_confidential_help": "Od odjemalca zahtevajte avtentikacijo s skrivno kodo. Zaupni odjemalci imajo lahko poverilnice na varen na\u010din, ne da bi jih izpostavili nepoobla\u0161\u010denim osebam. Javne aplikacije, kot so izvorne namizne aplikacije ali aplikacije JavaScript SPA, ne morejo varno hraniti skrivnih kod.",
        "multi_account_warning_unknown": "Odvisno od vrste transakcije, ki jo ustvarite, lahko izvorni in\/ali ciljni ra\u010dun poznej\u0161ih razdelitev preglasi tisto, kar je definirano v prvi razdelitvi transakcije.",
-        "multi_account_warning_withdrawal": "Upo\u0161tevajte, da bo izvorni ra\u010dun poznej\u0161ih razdelitev preglasilo tisto, kar je definirano v prvi razdelitvi dviga.",
-        "multi_account_warning_deposit": "Upo\u0161tevajte, da bo ciljni ra\u010dun poznej\u0161ih delitev preglasilo tisto, kar je opredeljeno v prvi delitvi depozita.",
+        "multi_account_warning_withdrawal": "Upo\u0161tevajte, da bo izvorni ra\u010dun poznej\u0161ih razdelitev preglasilo tisto, kar je definirano v prvi razdelitvi odliva.",
+        "multi_account_warning_deposit": "Upo\u0161tevajte, da bo ciljni ra\u010dun poznej\u0161ih delitev preglasilo tisto, kar je opredeljeno v prvi delitvi priliva.",
        "multi_account_warning_transfer": "Upo\u0161tevajte, da bo izvorni + ciljni ra\u010dun poznej\u0161ih razdelitev preglasilo tisto, kar je definirano v prvi razdelitvi prenosa.",
        "webhook_trigger_STORE_TRANSACTION": "Po ustvarjanju transakcije",
        "webhook_trigger_UPDATE_TRANSACTION": "Po posodabljanju transakcije",
--- a/resources/assets/js/locales/zh-tw.json
+++ b/resources/assets/js/locales/zh-tw.json
@ -8,7 +8,7 @@
        "split_transaction_title": "\u62c6\u5206\u4ea4\u6613\u7684\u63cf\u8ff0",
        "errors_submission": "There was something wrong with your submission. Please check out the errors below: %{errorMessage}",
        "split": "\u5206\u5272",
-        "single_split": "Split",
+        "single_split": "\u62c6\u5206",
        "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
        "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> has been stored.",
        "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") has been updated.",
@ -44,7 +44,7 @@
        "store_as_new": "Store as a new transaction instead of updating.",
        "split_title_help": "\u82e5\u60a8\u5efa\u7acb\u4e00\u7b46\u62c6\u5206\u4ea4\u6613\uff0c\u9808\u6709\u4e00\u500b\u6709\u95dc\u4ea4\u6613\u6240\u6709\u62c6\u5206\u7684\u6574\u9ad4\u63cf\u8ff0\u3002",
        "none_in_select_list": "(\u7a7a)",
-        "no_piggy_bank": "(no piggy bank)",
+        "no_piggy_bank": "(\u7121\u5c0f\u8c6c\u64b2\u6eff)",
        "description": "\u63cf\u8ff0",
        "split_transaction_title_help": "If you create a split transaction, there must be a global description for all splits of the transaction.",
        "destination_account_reconciliation": "You can't edit the destination account of a reconciliation transaction.",
@ -95,11 +95,11 @@
        "multi_account_warning_withdrawal": "Keep in mind that the source account of subsequent splits will be overruled by whatever is defined in the first split of the withdrawal.",
        "multi_account_warning_deposit": "Keep in mind that the destination account of subsequent splits will be overruled by whatever is defined in the first split of the deposit.",
        "multi_account_warning_transfer": "Keep in mind that the source + destination account of subsequent splits will be overruled by whatever is defined in the first split of the transfer.",
-        "webhook_trigger_STORE_TRANSACTION": "After transaction creation",
-        "webhook_trigger_UPDATE_TRANSACTION": "After transaction update",
-        "webhook_trigger_DESTROY_TRANSACTION": "After transaction delete",
-        "webhook_response_TRANSACTIONS": "Transaction details",
-        "webhook_response_ACCOUNTS": "Account details",
+        "webhook_trigger_STORE_TRANSACTION": "\u5728\u4ea4\u6613\u5efa\u7acb\u5f8c",
+        "webhook_trigger_UPDATE_TRANSACTION": "\u5728\u4ea4\u6613\u66f4\u65b0\u5f8c",
+        "webhook_trigger_DESTROY_TRANSACTION": "\u5728\u4ea4\u6613\u522a\u9664\u5f8c",
+        "webhook_response_TRANSACTIONS": "\u4ea4\u6613\u8a73\u60c5",
+        "webhook_response_ACCOUNTS": "\u5e33\u865f\u8a73\u60c5",
        "webhook_response_none_NONE": "No details",
        "webhook_delivery_JSON": "JSON",
        "actions": "\u64cd\u4f5c",
@ -107,7 +107,7 @@
        "webhook_messages": "Webhook message",
        "inactive": "\u672a\u555f\u7528",
        "no_webhook_messages": "There are no webhook messages",
-        "inspect": "Inspect",
+        "inspect": "\u6aa2\u67e5",
        "create_new_webhook": "Create new webhook",
        "webhooks": "Webhooks",
        "webhook_trigger_form_help": "Indicate on what event the webhook will trigger",
@ -116,7 +116,7 @@
        "webhook_active_form_help": "The webhook must be active or it won't be called.",
        "edit_webhook_js": "Edit webhook \"{title}\"",
        "webhook_was_triggered": "The webhook was triggered on the indicated transaction. Please wait for results to appear.",
-        "view_message": "View message",
+        "view_message": "\u67e5\u770b\u8a0a\u606f",
        "view_attempts": "View failed attempts",
        "message_content_title": "Webhook message content",
        "message_content_help": "This is the content of the message that was sent (or tried) using this webhook.",
@ -124,8 +124,8 @@
        "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.",
        "no_attempts": "There are no unsuccessful attempts. That's a good thing!",
        "webhook_attempt_at": "Attempt at {moment}",
-        "logs": "Logs",
-        "response": "Response",
+        "logs": "\u7d00\u9304\u65e5\u8a8c",
+        "response": "\u56de\u8986",
        "visit_webhook_url": "Visit webhook URL",
        "reset_webhook_secret": "Reset webhook secret"
    },
--- a/resources/assets/v2/libraries/dark-editable/Modes/BaseMode.js
+++ b/resources/assets/v2/libraries/dark-editable/Modes/BaseMode.js
--- a/resources/assets/v2/libraries/dark-editable/Modes/InlineMode.js
+++ b/resources/assets/v2/libraries/dark-editable/Modes/InlineMode.js
--- a/resources/assets/v2/libraries/dark-editable/Modes/PopupMode.js
+++ b/resources/assets/v2/libraries/dark-editable/Modes/PopupMode.js
--- a/resources/assets/v2/libraries/dark-editable/Types/BaseType.js
+++ b/resources/assets/v2/libraries/dark-editable/Types/BaseType.js
--- a/resources/assets/v2/libraries/dark-editable/Types/DateTimeType.js
+++ b/resources/assets/v2/libraries/dark-editable/Types/DateTimeType.js
--- a/resources/assets/v2/libraries/dark-editable/Types/DateType.js
+++ b/resources/assets/v2/libraries/dark-editable/Types/DateType.js
--- a/resources/assets/v2/libraries/dark-editable/Types/InputType.js
+++ b/resources/assets/v2/libraries/dark-editable/Types/InputType.js
--- a/resources/assets/v2/libraries/dark-editable/Types/SelectType.js
+++ b/resources/assets/v2/libraries/dark-editable/Types/SelectType.js
--- a/resources/assets/v2/libraries/dark-editable/Types/TextAreaType.js
+++ b/resources/assets/v2/libraries/dark-editable/Types/TextAreaType.js
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@ -468,10 +468,10 @@ return [
    'search_modifier_transaction_type'                    => 'Buchungstyp ist „:value”',
    'search_modifier_not_transaction_type'                => 'Buchungstyp ist nicht „:value”',
    'search_modifier_tag_is'                              => 'Schlagwort ist „:value”',
-    'search_modifier_tag_contains'                        => 'Tag contains ":value"',
-    'search_modifier_not_tag_contains'                    => 'Tag does not contain ":value"',
-    'search_modifier_tag_ends'                            => 'Tag ends with ":value"',
-    'search_modifier_tag_starts'                          => 'Tag starts with ":value"',
+    'search_modifier_tag_contains'                        => 'Schlagwort enthält ":value"',
+    'search_modifier_not_tag_contains'                    => 'Schlagwort enthält nicht ":value"',
+    'search_modifier_tag_ends'                            => 'Schlagwort endet mit ":value"',
+    'search_modifier_tag_starts'                          => 'Schlagwort beginnt mit ":value"',
    'search_modifier_not_tag_is'                          => 'Kein Schlagwort lautet ":value"',
    'search_modifier_date_on_year'                        => 'Buchung im Jahr „:value”',
    'search_modifier_not_date_on_year'                    => 'Buchung ist nicht im Jahr ":value"',
@ -1279,8 +1279,8 @@ return [
    'rule_action_append_notes_to_descr'                   => 'Notizen an die Beschreibung anhängen',
    'rule_action_move_descr_to_notes'                     => 'Notizen durch die Beschreibung ersetzen',
    'rule_action_move_notes_to_descr'                     => 'Beschreibung durch die Notizen ersetzen',
-    'rule_action_set_destination_to_cash_choice'          => 'Set destination account to (cash)',
-    'rule_action_set_source_to_cash_choice'               => 'Set source account to (cash)',
+    'rule_action_set_destination_to_cash_choice'          => 'Zielkonto auf (Bargeld) setzen',
+    'rule_action_set_source_to_cash_choice'               => 'Quellkonto auf (Bargeld) setzen',
    'rulegroup_for_bills_title'                           => 'Regelgruppe für Rechnungen',
    'rulegroup_for_bills_description'                     => 'Eine spezielle Regelgruppe für alle Regeln, die Rechnungen betreffen.',
    'rule_for_bill_title'                                 => 'Automatisch generierte Regel für die Rechnung ":name"',
--- a/resources/lang/de_DE/rules.php
+++ b/resources/lang/de_DE/rules.php
@ -55,8 +55,8 @@ return [
    'cannot_find_subscription'                    => 'Firefly III kann das Abonnement ":name" nicht finden',
    'no_notes_to_move'                            => 'Diese Transaktion hat keine Notizen für das Beschreibungsfeld',
    'no_tags_to_remove'                           => 'Die Buchung hat keine Schlagworte zum Entfernen',
-    'not_withdrawal'                              => 'The transaction is not a withdrawal',
-    'not_deposit'                                 => 'The transaction is not a deposit',
+    'not_withdrawal'                              => 'Diese Buchung ist keine Ausgabe',
+    'not_deposit'                                 => 'Diese Buchung ist keine Einnahme',
    'cannot_find_tag'                             => 'Firefly III kann Schlagwort ":tag" nicht finden',
    'cannot_find_asset'                           => 'Firefly III kann kein Girokonto ":name" finden',
    'cannot_find_accounts'                        => 'Firefly III kann das Quell- oder Zielkonto nicht finden',
--- a/resources/lang/it_IT/firefly.php
+++ b/resources/lang/it_IT/firefly.php
@ -641,63 +641,63 @@ return [
    'search_modifier_updated_at_on_month'                 => 'La transazione è stata aggiornata l\'ultima volta nel mese ":value"',
    'search_modifier_updated_at_on_day'                   => 'La transazione è stata aggiornata l\'ultima volta nel giorno ":value" del mese',
    'search_modifier_not_updated_at_on_year'              => 'La transazione non è stata aggiornata l\'ultima volta nell\'anno ":value"',
-    'search_modifier_not_updated_at_on_month'             => 'Transaction was not last updated in month ":value"',
-    'search_modifier_not_updated_at_on_day'               => 'Transaction was not last updated on day of month ":value"',
-    'search_modifier_updated_at_before_year'              => 'Transaction was last updated in or before year ":value"',
-    'search_modifier_updated_at_before_month'             => 'Transaction was last updated in or before month ":value"',
-    'search_modifier_updated_at_before_day'               => 'Transaction was last updated on or before day of month ":value"',
-    'search_modifier_updated_at_after_year'               => 'Transaction was last updated in or after year ":value"',
-    'search_modifier_updated_at_after_month'              => 'Transaction was last updated in or after month ":value"',
-    'search_modifier_updated_at_after_day'                => 'Transaction was last updated on or after day of month ":value"',
+    'search_modifier_not_updated_at_on_month'             => 'La transazione non è stata aggiornata l\'ultima volta nel mese ":value"',
+    'search_modifier_not_updated_at_on_day'               => 'La transazione non è stata aggiornata il giorno del mese ":value"',
+    'search_modifier_updated_at_before_year'              => 'La transazione è stata aggiornata l\'ultima volta durante o prima dell\'anno ":value"',
+    'search_modifier_updated_at_before_month'             => 'La transazione è stata aggiornata l\'ultima volta durante o prima del mese ":value"',
+    'search_modifier_updated_at_before_day'               => 'La transazione è stata aggiornata l\'ultima volta durante o prima del giorno del mese ":value"',
+    'search_modifier_updated_at_after_year'               => 'La transazione è stata aggiornata l\'ultima volta durante o dopo l\'anno ":value"',
+    'search_modifier_updated_at_after_month'              => 'La transazione è stata aggiornata l\'ultima volta durante o dopo il mese ":value"',
+    'search_modifier_updated_at_after_day'                => 'La transazione è stata aggiornata l\'ultima volta durante o dopo il giorno del mese ":value"',
    'search_modifier_created_at_on_year'                  => 'La transazione è stata creata nell\'anno ":value"',
    'search_modifier_created_at_on_month'                 => 'La transazione è stata creata nel mese ":value"',
    'search_modifier_created_at_on_day'                   => 'La transazione è stata create nel giorno del mese ":value"',
    'search_modifier_not_created_at_on_year'              => 'La transazione non è stata creata nell\'anno ":value"',
    'search_modifier_not_created_at_on_month'             => 'La transazione non è stata creata nel mese ":value"',
-    'search_modifier_not_created_at_on_day'               => 'Transaction was not created on day of month ":value"',
-    'search_modifier_created_at_before_year'              => 'Transaction was created in or before year ":value"',
-    'search_modifier_created_at_before_month'             => 'Transaction was created in or before month ":value"',
-    'search_modifier_created_at_before_day'               => 'Transaction was created on or before day of month ":value"',
-    'search_modifier_created_at_after_year'               => 'Transaction was created in or after year ":value"',
-    'search_modifier_created_at_after_month'              => 'Transaction was created in or after month ":value"',
-    'search_modifier_created_at_after_day'                => 'Transaction was created on or after day of month ":value"',
-    'search_modifier_interest_date_before'                => 'Transaction interest date is on or before ":value"',
-    'search_modifier_interest_date_after'                 => 'Transaction interest date is on or after ":value"',
-    'search_modifier_book_date_on'                        => 'Transaction book date is on ":value"',
-    'search_modifier_not_book_date_on'                    => 'Transaction book date is not on ":value"',
-    'search_modifier_book_date_before'                    => 'Transaction book date is on or before ":value"',
-    'search_modifier_book_date_after'                     => 'Transaction book date is on or after ":value"',
-    'search_modifier_process_date_on'                     => 'Transaction process date is on ":value"',
-    'search_modifier_not_process_date_on'                 => 'Transaction process date is not on ":value"',
-    'search_modifier_process_date_before'                 => 'Transaction process date is on or before ":value"',
-    'search_modifier_process_date_after'                  => 'Transaction process date is on or after ":value"',
-    'search_modifier_due_date_on'                         => 'Transaction due date is on ":value"',
-    'search_modifier_not_due_date_on'                     => 'Transaction due date is not on ":value"',
-    'search_modifier_due_date_before'                     => 'Transaction due date is on or before ":value"',
-    'search_modifier_due_date_after'                      => 'Transaction due date is on or after ":value"',
-    'search_modifier_payment_date_on'                     => 'Transaction payment date is on ":value"',
-    'search_modifier_not_payment_date_on'                 => 'Transaction payment date is not on ":value"',
-    'search_modifier_payment_date_before'                 => 'Transaction payment date is on or before ":value"',
-    'search_modifier_payment_date_after'                  => 'Transaction payment date is on or after ":value"',
-    'search_modifier_invoice_date_on'                     => 'Transaction invoice date is on ":value"',
-    'search_modifier_not_invoice_date_on'                 => 'Transaction invoice date is not on ":value"',
-    'search_modifier_invoice_date_before'                 => 'Transaction invoice date is on or before ":value"',
-    'search_modifier_invoice_date_after'                  => 'Transaction invoice date is on or after ":value"',
+    'search_modifier_not_created_at_on_day'               => 'La transazione non è stata creata il giorno del mese ":value"',
+    'search_modifier_created_at_before_year'              => 'La transazione è stata creata durante o prima dell\'anno ":value"',
+    'search_modifier_created_at_before_month'             => 'La transazione è stata creata durante o prima del mese ":value"',
+    'search_modifier_created_at_before_day'               => 'La transazione è stata creata durante o prima del giorno del mese ":value"',
+    'search_modifier_created_at_after_year'               => 'La transazione è stata creata durante o dopo l\'anno ":value"',
+    'search_modifier_created_at_after_month'              => 'La transazione è stata creata durante o dopo il mese ":value"',
+    'search_modifier_created_at_after_day'                => 'La transazione è stata creata durante o dopo il giorno del mese ":value"',
+    'search_modifier_interest_date_before'                => 'La data d\'interesse della transazione è il o prima del ":value"',
+    'search_modifier_interest_date_after'                 => 'La data d\'interesse della transazione è il o dopo il ":value"',
+    'search_modifier_book_date_on'                        => 'La data di prenotazione della transazione è il ":value"',
+    'search_modifier_not_book_date_on'                    => 'La data di prenotazione della transazione non è il ":value"',
+    'search_modifier_book_date_before'                    => 'La data di prenotazione della transazione è il o prima del ":value"',
+    'search_modifier_book_date_after'                     => 'La data di prenotazione della transazione è il o dopo il ":value"',
+    'search_modifier_process_date_on'                     => 'La data di elaborazione della transazione è il ":value"',
+    'search_modifier_not_process_date_on'                 => 'La data di elaborazione della transazione non è il ":value"',
+    'search_modifier_process_date_before'                 => 'La data di elaborazione della transazione è il o prima del ":value"',
+    'search_modifier_process_date_after'                  => 'La data di elaborazione della transazione è il o dopo il ":value"',
+    'search_modifier_due_date_on'                         => 'La data di scadenza della transazione è il ":value"',
+    'search_modifier_not_due_date_on'                     => 'La data di scadenza della transazione non è il ":value"',
+    'search_modifier_due_date_before'                     => 'La data di scadenza della transazione è il o prima del ":value"',
+    'search_modifier_due_date_after'                      => 'La data di scadenza della transazione è il o dopo il ":value"',
+    'search_modifier_payment_date_on'                     => 'La data di pagamento della transazione è il ":value"',
+    'search_modifier_not_payment_date_on'                 => 'La data di pagamento della transazione non è il ":value"',
+    'search_modifier_payment_date_before'                 => 'La data di pagamento della transazione è il o prima del ":value"',
+    'search_modifier_payment_date_after'                  => 'La data di pagamento della transazione è il o dopo il ":value"',
+    'search_modifier_invoice_date_on'                     => 'La data di fatturazione della transazione è il ":value"',
+    'search_modifier_not_invoice_date_on'                 => 'La data di fatturazione della transazione non è il ":value"',
+    'search_modifier_invoice_date_before'                 => 'La data di fatturazione della transazione è il o prima del ":value"',
+    'search_modifier_invoice_date_after'                  => 'La data di fatturazione della transazione è il o dopo il ":value"',
    'search_modifier_created_at_on'                       => 'La transazione è stata creata il giorno ":value"',
    'search_modifier_not_created_at_on'                   => 'La transazione non è stata creata il giorno ":value"',
-    'search_modifier_created_at_before'                   => 'Transaction was created on or before ":value"',
-    'search_modifier_created_at_after'                    => 'Transaction was created on or after ":value"',
+    'search_modifier_created_at_before'                   => 'La transazione è stata creata il o prima del ":value"',
+    'search_modifier_created_at_after'                    => 'La transazione è stata creata il o dopo il ":value"',
    'search_modifier_updated_at_on'                       => 'La transazione è stata aggiornata il ":value"',
-    'search_modifier_not_updated_at_on'                   => 'Transaction was not updated on ":value"',
-    'search_modifier_updated_at_before'                   => 'Transaction was updated on or before ":value"',
-    'search_modifier_updated_at_after'                    => 'Transaction was updated on or after ":value"',
+    'search_modifier_not_updated_at_on'                   => 'La transazione non è stata aggiornata il ":value"',
+    'search_modifier_updated_at_before'                   => 'La transazione è stata aggiornata il o prima del ":value"',
+    'search_modifier_updated_at_after'                    => 'La transazione è stata aggiornata il o dopo il ":value"',

    'search_modifier_attachment_name_is'                  => 'Il nome di qualsiasi allegato è ":value"',
    'search_modifier_attachment_name_contains'            => 'Il nome di qualsiasi allegato contiene ":value"',
    'search_modifier_attachment_name_starts'              => 'Il nome di qualsiasi allegato inizia con ":value"',
    'search_modifier_attachment_name_ends'                => 'Il nome di qualsiasi allegato finisce con ":value"',
-    'search_modifier_attachment_notes_are'                => 'Any attachment\'s notes are ":value"',
-    'search_modifier_attachment_notes_contains'           => 'Any attachment\'s notes contain ":value"',
+    'search_modifier_attachment_notes_are'                => 'Qualsiasi nota dell\'allegato è ":value"',
+    'search_modifier_attachment_notes_contains'           => 'Qualsiasi nota dell\'allegato contiene ":value"',
    'search_modifier_attachment_notes_starts'             => 'Le note di qualsiasi allegato iniziano con ":value"',
    'search_modifier_attachment_notes_ends'               => 'Le note di qualsiasi allegato terminano con ":value"',
    'search_modifier_not_attachment_name_is'              => 'Nessun nome degli allegati ":value"',
@ -749,8 +749,8 @@ return [
    // rules
    'is_not_rule_trigger'                                 => 'Non',
    'cannot_fire_inactive_rules'                          => 'Non puoi eseguire regole inattive.',
-    'show_triggers'                                       => 'Show triggers',
-    'show_actions'                                        => 'Show actions',
+    'show_triggers'                                       => 'Mostra inneschi',
+    'show_actions'                                        => 'Mostra azioni',
    'rules'                                               => 'Regole',
    'rule_name'                                           => 'Nome regola',
    'rule_triggers'                                       => 'La regola si innesca quando',
@ -890,11 +890,11 @@ return [
    'rule_trigger_created_at_on_choice'                   => 'La transazione è avvenuta il..',
    'rule_trigger_created_at_on'                          => 'La transazione è avvenuta il ":trigger_value"',
    'rule_trigger_updated_at_on_choice'                   => 'La transazione è stata modificata l\'ultima volta il..',
-    'rule_trigger_updated_at_on'                          => 'Transaction was last edited on ":trigger_value"',
+    'rule_trigger_updated_at_on'                          => 'Transazione modificata l\'ultima volta il ":trigger_value"',
    'rule_trigger_budget_is_choice'                       => 'Il budget è...',
    'rule_trigger_budget_is'                              => 'Il budget è ":trigger_value"',
-    'rule_trigger_tag_is_choice'                          => 'Any tag is..',
-    'rule_trigger_tag_is'                                 => 'Any tag is ":trigger_value"',
+    'rule_trigger_tag_is_choice'                          => 'Qualsiasi tag è..',
+    'rule_trigger_tag_is'                                 => 'Qualsiasi tag è ":trigger_value"',
    'rule_trigger_currency_is_choice'                     => 'La valuta della transazione è...',
    'rule_trigger_currency_is'                            => 'La valuta della transazione è ":trigger_value"',
    'rule_trigger_foreign_currency_is_choice'             => 'La valuta estera della transazione è...',
@ -921,283 +921,283 @@ return [
    'rule_trigger_any_notes'                              => 'La transazione ha una (qualsiasi) nota',
    'rule_trigger_no_notes_choice'                        => 'Non ha note',
    'rule_trigger_no_notes'                               => 'La transazione non ha note',
-    'rule_trigger_notes_is_choice'                        => 'Notes are..',
-    'rule_trigger_notes_is'                               => 'Notes are ":trigger_value"',
-    'rule_trigger_notes_contains_choice'                  => 'Notes contain..',
-    'rule_trigger_notes_contains'                         => 'Notes contain ":trigger_value"',
-    'rule_trigger_notes_starts_choice'                    => 'Notes start with..',
-    'rule_trigger_notes_starts'                           => 'Notes start with ":trigger_value"',
-    'rule_trigger_notes_ends_choice'                      => 'Notes end with..',
-    'rule_trigger_notes_ends'                             => 'Notes end with ":trigger_value"',
+    'rule_trigger_notes_is_choice'                        => 'Le note sono..',
+    'rule_trigger_notes_is'                               => 'Le note sono ":trigger_value"',
+    'rule_trigger_notes_contains_choice'                  => 'Le note contengono..',
+    'rule_trigger_notes_contains'                         => 'Le note contengono ":trigger_value"',
+    'rule_trigger_notes_starts_choice'                    => 'Le note iniziano per..',
+    'rule_trigger_notes_starts'                           => 'Le note iniziano per ":trigger_value"',
+    'rule_trigger_notes_ends_choice'                      => 'Le note terminano per..',
+    'rule_trigger_notes_ends'                             => 'Le note terminano per ":trigger_value"',
    'rule_trigger_bill_is_choice'                         => 'La bollettà è...',
    'rule_trigger_bill_is'                                => 'La bolletta è ":trigger_value"',
    'rule_trigger_external_id_is_choice'                  => 'L\'ID esterno è..',
    'rule_trigger_external_id_is'                         => 'L\'ID esterno è ":trigger_value"',
-    'rule_trigger_internal_reference_is_choice'           => 'Internal reference is..',
-    'rule_trigger_internal_reference_is'                  => 'Internal reference is ":trigger_value"',
+    'rule_trigger_internal_reference_is_choice'           => 'Il riferimento interno è..',
+    'rule_trigger_internal_reference_is'                  => 'Il riferimento interno è ":trigger_value"',
    'rule_trigger_journal_id_choice'                      => 'L\'ID journal della transazione è...',
    'rule_trigger_journal_id'                             => 'L\'ID journal della transazione è ":trigger_value"',
-    'rule_trigger_any_external_url'                       => 'Transaction has an (any) external URL',
-    'rule_trigger_any_external_url_choice'                => 'Transaction has an (any) external URL',
-    'rule_trigger_any_external_id'                        => 'Transaction has an (any) external ID',
-    'rule_trigger_any_external_id_choice'                 => 'Transaction has an (any) external ID',
+    'rule_trigger_any_external_url'                       => 'La transazione contiene un URL esterno (qualsiasi)',
+    'rule_trigger_any_external_url_choice'                => 'La transazione contiene un URL esterno (qualsiasi)',
+    'rule_trigger_any_external_id'                        => 'La transazione contiene un ID esterno (qualsiasi)',
+    'rule_trigger_any_external_id_choice'                 => 'La transazione contiene un ID esterno (qualsiasi)',
    'rule_trigger_no_external_url_choice'                 => 'La transazione non ha URL esterno',
    'rule_trigger_no_external_url'                        => 'La transazione non ha URL esterno',
    'rule_trigger_no_external_id_choice'                  => 'La transazione non ha ID esterno',
    'rule_trigger_no_external_id'                         => 'La transazione non ha ID esterno',
    'rule_trigger_id_choice'                              => 'L\'ID della transazione è...',
    'rule_trigger_id'                                     => 'L\'ID della transazione è ":trigger_value"',
-    'rule_trigger_sepa_ct_is_choice'                      => 'SEPA CT is..',
-    'rule_trigger_sepa_ct_is'                             => 'SEPA CT is ":trigger_value"',
+    'rule_trigger_sepa_ct_is_choice'                      => 'SEPA CT è..',
+    'rule_trigger_sepa_ct_is'                             => 'SEPA CT è ":trigger_value"',

    // new values:
-    'rule_trigger_user_action_choice'                     => 'User action is ":trigger_value"',
-    'rule_trigger_tag_is_not_choice'                      => 'No tag is..',
-    'rule_trigger_tag_is_not'                             => 'No tag is ":trigger_value"',
-    'rule_trigger_account_is_choice'                      => 'Either account is exactly..',
-    'rule_trigger_account_is'                             => 'Either account is exactly ":trigger_value"',
-    'rule_trigger_account_contains_choice'                => 'Either account contains..',
-    'rule_trigger_account_contains'                       => 'Either account contains ":trigger_value"',
-    'rule_trigger_account_ends_choice'                    => 'Either account ends with..',
-    'rule_trigger_account_ends'                           => 'Either account ends with ":trigger_value"',
-    'rule_trigger_account_starts_choice'                  => 'Either account starts with..',
-    'rule_trigger_account_starts'                         => 'Either account starts with ":trigger_value"',
-    'rule_trigger_account_nr_is_choice'                   => 'Either account number / IBAN is..',
-    'rule_trigger_account_nr_is'                          => 'Either account number / IBAN is ":trigger_value"',
-    'rule_trigger_account_nr_contains_choice'             => 'Either account number / IBAN contains..',
-    'rule_trigger_account_nr_contains'                    => 'Either account number / IBAN contains ":trigger_value"',
-    'rule_trigger_account_nr_ends_choice'                 => 'Either account number / IBAN ends with..',
-    'rule_trigger_account_nr_ends'                        => 'Either account number / IBAN ends with ":trigger_value"',
-    'rule_trigger_account_nr_starts_choice'               => 'Either account number / IBAN starts with..',
-    'rule_trigger_account_nr_starts'                      => 'Either account number / IBAN starts with ":trigger_value"',
-    'rule_trigger_category_contains_choice'               => 'Category contains..',
-    'rule_trigger_category_contains'                      => 'Category contains ":trigger_value"',
-    'rule_trigger_category_ends_choice'                   => 'Category ends with..',
-    'rule_trigger_category_ends'                          => 'Category ends with ":trigger_value"',
-    'rule_trigger_category_starts_choice'                 => 'Category starts with..',
-    'rule_trigger_category_starts'                        => 'Category starts with ":trigger_value"',
-    'rule_trigger_budget_contains_choice'                 => 'Budget contains..',
-    'rule_trigger_budget_contains'                        => 'Budget contains ":trigger_value"',
-    'rule_trigger_budget_ends_choice'                     => 'Budget ends with..',
-    'rule_trigger_budget_ends'                            => 'Budget ends with ":trigger_value"',
-    'rule_trigger_budget_starts_choice'                   => 'Budget starts with..',
-    'rule_trigger_budget_starts'                          => 'Budget starts with ":trigger_value"',
+    'rule_trigger_user_action_choice'                     => 'L\'azione dell\'utente è ":trigger_value"',
+    'rule_trigger_tag_is_not_choice'                      => 'Nessun tag è..',
+    'rule_trigger_tag_is_not'                             => 'Nessun tag è ":trigger_value"',
+    'rule_trigger_account_is_choice'                      => 'Entrambi i conti sono esattamente..',
+    'rule_trigger_account_is'                             => 'Entrambi i conti sono esattamente ":trigger_value"',
+    'rule_trigger_account_contains_choice'                => 'Entrambi i conti contengono..',
+    'rule_trigger_account_contains'                       => 'Entrambi i conti contengono ":trigger_value"',
+    'rule_trigger_account_ends_choice'                    => 'Entrambi i conti terminano per..',
+    'rule_trigger_account_ends'                           => 'Entrambi i conti terminano per ":trigger_value"',
+    'rule_trigger_account_starts_choice'                  => 'Entrambi i conti iniziano per..',
+    'rule_trigger_account_starts'                         => 'Entrambi i conti terminano per ":trigger_value"',
+    'rule_trigger_account_nr_is_choice'                   => 'Entrambi i numeri di conto / IBAN sono..',
+    'rule_trigger_account_nr_is'                          => 'Entrambi i numeri di conto / IBAN sono ":trigger_value"',
+    'rule_trigger_account_nr_contains_choice'             => 'Entrambi i numeri di conto / IBAN contengono..',
+    'rule_trigger_account_nr_contains'                    => 'Entrambi i numeri di conto / IBAN contengono ":trigger_value"',
+    'rule_trigger_account_nr_ends_choice'                 => 'Entrambi i numeri di conto / IBAN terminano per..',
+    'rule_trigger_account_nr_ends'                        => 'Entrambi i numeri di conto / IBAN terminano per ":trigger_value"',
+    'rule_trigger_account_nr_starts_choice'               => 'Entrambi i numeri di conto / IBAN iniziano per..',
+    'rule_trigger_account_nr_starts'                      => 'Entrambi i numeri di conto / IBAN iniziano per ":trigger_value"',
+    'rule_trigger_category_contains_choice'               => 'La categoria contiene..',
+    'rule_trigger_category_contains'                      => 'La categoria contiene ":trigger_value"',
+    'rule_trigger_category_ends_choice'                   => 'La categoria termina per..',
+    'rule_trigger_category_ends'                          => 'La categoria termina per ":trigger_value"',
+    'rule_trigger_category_starts_choice'                 => 'La categoria inizia per..',
+    'rule_trigger_category_starts'                        => 'La categoria inizia per ":trigger_value"',
+    'rule_trigger_budget_contains_choice'                 => 'Il budget contiene..',
+    'rule_trigger_budget_contains'                        => 'Il budget contiene ":trigger_value"',
+    'rule_trigger_budget_ends_choice'                     => 'Il budget termina per..',
+    'rule_trigger_budget_ends'                            => 'Il budget termina per ":trigger_value"',
+    'rule_trigger_budget_starts_choice'                   => 'Il budget inizia per..',
+    'rule_trigger_budget_starts'                          => 'Il budget inizia per ":trigger_value"',
    'rule_trigger_bill_contains_choice'                   => 'La bolletta contiene..',
    'rule_trigger_bill_contains'                          => 'La bolletta contiene ":trigger_value"',
    'rule_trigger_bill_ends_choice'                       => 'La bolletta termina con..',
    'rule_trigger_bill_ends'                              => 'La bolletta termina con ":trigger_value"',
    'rule_trigger_bill_starts_choice'                     => 'La bolletta inizia con..',
    'rule_trigger_bill_starts'                            => 'La bolletta inizia con ":trigger_value"',
-    'rule_trigger_external_id_contains_choice'            => 'External ID contains..',
-    'rule_trigger_external_id_contains'                   => 'External ID contains ":trigger_value"',
-    'rule_trigger_external_id_ends_choice'                => 'External ID ends with..',
-    'rule_trigger_external_id_ends'                       => 'External ID ends with ":trigger_value"',
-    'rule_trigger_external_id_starts_choice'              => 'External ID starts with..',
-    'rule_trigger_external_id_starts'                     => 'External ID starts with ":trigger_value"',
-    'rule_trigger_internal_reference_contains_choice'     => 'Internal reference contains..',
-    'rule_trigger_internal_reference_contains'            => 'Internal reference contains ":trigger_value"',
-    'rule_trigger_internal_reference_ends_choice'         => 'Internal reference ends with..',
-    'rule_trigger_internal_reference_ends'                => 'Internal reference ends with ":trigger_value"',
-    'rule_trigger_internal_reference_starts_choice'       => 'Internal reference starts with..',
-    'rule_trigger_internal_reference_starts'              => 'Internal reference starts with ":trigger_value"',
-    'rule_trigger_external_url_is_choice'                 => 'External URL is..',
-    'rule_trigger_external_url_is'                        => 'External URL is ":trigger_value"',
-    'rule_trigger_external_url_contains_choice'           => 'External URL contains..',
-    'rule_trigger_external_url_contains'                  => 'External URL contains ":trigger_value"',
-    'rule_trigger_external_url_ends_choice'               => 'External URL ends with..',
-    'rule_trigger_external_url_ends'                      => 'External URL ends with ":trigger_value"',
-    'rule_trigger_external_url_starts_choice'             => 'External URL starts with..',
-    'rule_trigger_external_url_starts'                    => 'External URL starts with ":trigger_value"',
+    'rule_trigger_external_id_contains_choice'            => 'L\'ID esterno contiene..',
+    'rule_trigger_external_id_contains'                   => 'L\'ID esterno contiene ":trigger_value"',
+    'rule_trigger_external_id_ends_choice'                => 'L\'ID esterno termina per..',
+    'rule_trigger_external_id_ends'                       => 'L\'ID esterno termina per ":trigger_value"',
+    'rule_trigger_external_id_starts_choice'              => 'L\'ID esterno inizia per..',
+    'rule_trigger_external_id_starts'                     => 'L\'ID esterno inizia per ":trigger_value"',
+    'rule_trigger_internal_reference_contains_choice'     => 'Il riferimento interno contiene..',
+    'rule_trigger_internal_reference_contains'            => 'Il riferimento interno contiene ":trigger_value"',
+    'rule_trigger_internal_reference_ends_choice'         => 'Il riferimento interno termina per..',
+    'rule_trigger_internal_reference_ends'                => 'Il riferimento interno termina per ":trigger_value"',
+    'rule_trigger_internal_reference_starts_choice'       => 'Il riferimento interno inizia per..',
+    'rule_trigger_internal_reference_starts'              => 'Il riferimento interno inizia per ":trigger_value"',
+    'rule_trigger_external_url_is_choice'                 => 'L\'URL esterno è..',
+    'rule_trigger_external_url_is'                        => 'L\'URL esterno è ":trigger_value"',
+    'rule_trigger_external_url_contains_choice'           => 'L\'URL esterno contiene..',
+    'rule_trigger_external_url_contains'                  => 'L\'URL esterno contiene ":trigger_value"',
+    'rule_trigger_external_url_ends_choice'               => 'L\'URL esterno termina per..',
+    'rule_trigger_external_url_ends'                      => 'L\'URL esterno termina per ":trigger_value"',
+    'rule_trigger_external_url_starts_choice'             => 'L\'URL esterno inizia per..',
+    'rule_trigger_external_url_starts'                    => 'L\'URL esterno inizia per ":trigger_value"',
    'rule_trigger_has_no_attachments_choice'              => 'Non contiene allegati',
    'rule_trigger_has_no_attachments'                     => 'La transazione non contiene alcun allegato',
    'rule_trigger_recurrence_id_choice'                   => 'L\'ID della transazione ricorrente è..',
    'rule_trigger_recurrence_id'                          => 'L\'ID della transazione ricorrente è ":trigger_value"',
-    'rule_trigger_interest_date_on_choice'                => 'Interest date is on..',
-    'rule_trigger_interest_date_on'                       => 'Interest date is on ":trigger_value"',
-    'rule_trigger_interest_date_before_choice'            => 'Interest date is before..',
-    'rule_trigger_interest_date_before'                   => 'Interest date is before ":trigger_value"',
-    'rule_trigger_interest_date_after_choice'             => 'Interest date is after..',
-    'rule_trigger_interest_date_after'                    => 'Interest date is after ":trigger_value"',
-    'rule_trigger_book_date_on_choice'                    => 'Book date is on..',
-    'rule_trigger_book_date_on'                           => 'Book date is on ":trigger_value"',
-    'rule_trigger_book_date_before_choice'                => 'Book date is before..',
-    'rule_trigger_book_date_before'                       => 'Book date is before ":trigger_value"',
-    'rule_trigger_book_date_after_choice'                 => 'Book date is after..',
-    'rule_trigger_book_date_after'                        => 'Book date is after ":trigger_value"',
-    'rule_trigger_process_date_on_choice'                 => 'Process date is on..',
-    'rule_trigger_process_date_on'                        => 'Process date is ":trigger_value"',
-    'rule_trigger_process_date_before_choice'             => 'Process date is before..',
-    'rule_trigger_process_date_before'                    => 'Process date is before ":trigger_value"',
-    'rule_trigger_process_date_after_choice'              => 'Process date is after..',
-    'rule_trigger_process_date_after'                     => 'Process date is after ":trigger_value"',
-    'rule_trigger_due_date_on_choice'                     => 'Due date is on..',
-    'rule_trigger_due_date_on'                            => 'Due date is on ":trigger_value"',
-    'rule_trigger_due_date_before_choice'                 => 'Due date is before..',
-    'rule_trigger_due_date_before'                        => 'Due date is before ":trigger_value"',
-    'rule_trigger_due_date_after_choice'                  => 'Due date is after..',
-    'rule_trigger_due_date_after'                         => 'Due date is after ":trigger_value"',
-    'rule_trigger_payment_date_on_choice'                 => 'Payment date is on..',
-    'rule_trigger_payment_date_on'                        => 'Payment date is on ":trigger_value"',
-    'rule_trigger_payment_date_before_choice'             => 'Payment date is before..',
-    'rule_trigger_payment_date_before'                    => 'Payment date is before ":trigger_value"',
-    'rule_trigger_payment_date_after_choice'              => 'Payment date is after..',
-    'rule_trigger_payment_date_after'                     => 'Payment date is after ":trigger_value"',
-    'rule_trigger_invoice_date_on_choice'                 => 'Invoice date is on..',
-    'rule_trigger_invoice_date_on'                        => 'Invoice date is on ":trigger_value"',
-    'rule_trigger_invoice_date_before_choice'             => 'Invoice date is before..',
-    'rule_trigger_invoice_date_before'                    => 'Invoice date is before ":trigger_value"',
-    'rule_trigger_invoice_date_after_choice'              => 'Invoice date is after..',
-    'rule_trigger_invoice_date_after'                     => 'Invoice date is after ":trigger_value"',
-    'rule_trigger_created_at_before_choice'               => 'Transaction was created before..',
-    'rule_trigger_created_at_before'                      => 'Transaction was created before ":trigger_value"',
-    'rule_trigger_created_at_after_choice'                => 'Transaction was created after..',
-    'rule_trigger_created_at_after'                       => 'Transaction was created after ":trigger_value"',
-    'rule_trigger_updated_at_before_choice'               => 'Transaction was last updated before..',
-    'rule_trigger_updated_at_before'                      => 'Transaction was last updated before ":trigger_value"',
-    'rule_trigger_updated_at_after_choice'                => 'Transaction was last updated after..',
-    'rule_trigger_updated_at_after'                       => 'Transaction was last updated after ":trigger_value"',
-    'rule_trigger_foreign_amount_is_choice'               => 'Foreign amount is exactly..',
-    'rule_trigger_foreign_amount_is'                      => 'Foreign amount is exactly ":trigger_value"',
-    'rule_trigger_foreign_amount_less_choice'             => 'Foreign amount is less than..',
-    'rule_trigger_foreign_amount_less'                    => 'Foreign amount is less than ":trigger_value"',
-    'rule_trigger_foreign_amount_more_choice'             => 'Foreign amount is more than..',
-    'rule_trigger_foreign_amount_more'                    => 'Foreign amount is more than ":trigger_value"',
-    'rule_trigger_attachment_name_is_choice'              => 'Any attachment\'s name is..',
-    'rule_trigger_attachment_name_is'                     => 'Any attachment\'s name is ":trigger_value"',
-    'rule_trigger_attachment_name_contains_choice'        => 'Any attachment\'s name contains..',
-    'rule_trigger_attachment_name_contains'               => 'Any attachment\'s name contains ":trigger_value"',
-    'rule_trigger_attachment_name_starts_choice'          => 'Any attachment\'s name starts with..',
-    'rule_trigger_attachment_name_starts'                 => 'Any attachment\'s name starts with ":trigger_value"',
-    'rule_trigger_attachment_name_ends_choice'            => 'Any attachment\'s name ends with..',
-    'rule_trigger_attachment_name_ends'                   => 'Any attachment\'s name ends with ":trigger_value"',
-    'rule_trigger_attachment_notes_are_choice'            => 'Any attachment\'s notes are..',
-    'rule_trigger_attachment_notes_are'                   => 'Any attachment\'s notes are ":trigger_value"',
-    'rule_trigger_attachment_notes_contains_choice'       => 'Any attachment\'s notes contain..',
-    'rule_trigger_attachment_notes_contains'              => 'Any attachment\'s notes contain ":trigger_value"',
-    'rule_trigger_attachment_notes_starts_choice'         => 'Any attachment\'s notes start with..',
-    'rule_trigger_attachment_notes_starts'                => 'Any attachment\'s notes start with ":trigger_value"',
-    'rule_trigger_attachment_notes_ends_choice'           => 'Any attachment\'s notes end with..',
-    'rule_trigger_attachment_notes_ends'                  => 'Any attachment\'s notes end with ":trigger_value"',
-    'rule_trigger_reconciled_choice'                      => 'Transaction is reconciled',
-    'rule_trigger_reconciled'                             => 'Transaction is reconciled',
-    'rule_trigger_exists_choice'                          => 'Any transaction matches(!)',
-    'rule_trigger_exists'                                 => 'Any transaction matches',
+    'rule_trigger_interest_date_on_choice'                => 'La data di interesse è il..',
+    'rule_trigger_interest_date_on'                       => 'La data di interesse è il ":trigger_value"',
+    'rule_trigger_interest_date_before_choice'            => 'La data di interesse è prima del..',
+    'rule_trigger_interest_date_before'                   => 'La data di interesse è prima del ":trigger_value"',
+    'rule_trigger_interest_date_after_choice'             => 'La data di interesse è dopo il..',
+    'rule_trigger_interest_date_after'                    => 'La data di interesse è dopo il ":trigger_value"',
+    'rule_trigger_book_date_on_choice'                    => 'La data di prenotazione è il..',
+    'rule_trigger_book_date_on'                           => 'La data di prenotazione è il ":trigger_value"',
+    'rule_trigger_book_date_before_choice'                => 'La data di prenotazione è prima del..',
+    'rule_trigger_book_date_before'                       => 'La data di prenotazione è prima del ":trigger_value"',
+    'rule_trigger_book_date_after_choice'                 => 'La data di prenotazione è dopo il..',
+    'rule_trigger_book_date_after'                        => 'La data di prenotazione è dopo il ":trigger_value"',
+    'rule_trigger_process_date_on_choice'                 => 'La data di elaborazione è il..',
+    'rule_trigger_process_date_on'                        => 'La data di elaborazione è il ":trigger_value"',
+    'rule_trigger_process_date_before_choice'             => 'La data di elaborazione è prima del..',
+    'rule_trigger_process_date_before'                    => 'La data di elaborazione è prima del ":trigger_value"',
+    'rule_trigger_process_date_after_choice'              => 'La data di elaborazione è dopo il..',
+    'rule_trigger_process_date_after'                     => 'La data di elaborazione è dopo il ":trigger_value"',
+    'rule_trigger_due_date_on_choice'                     => 'La data di scadenza è il..',
+    'rule_trigger_due_date_on'                            => 'La data di scadenza è il ":trigger_value"',
+    'rule_trigger_due_date_before_choice'                 => 'La data di scadenza è prima del..',
+    'rule_trigger_due_date_before'                        => 'La data di scadenza è prima del ":trigger_value"',
+    'rule_trigger_due_date_after_choice'                  => 'La data di scadenza è dopo il..',
+    'rule_trigger_due_date_after'                         => 'La data di scadenza è dopo il ":trigger_value"',
+    'rule_trigger_payment_date_on_choice'                 => 'La data di pagamento è il..',
+    'rule_trigger_payment_date_on'                        => 'La data di pagamento è il ":trigger_value"',
+    'rule_trigger_payment_date_before_choice'             => 'La data di pagamento è prima del..',
+    'rule_trigger_payment_date_before'                    => 'La data di pagamento è prima del ":trigger_value"',
+    'rule_trigger_payment_date_after_choice'              => 'La data di pagamento è dopo il..',
+    'rule_trigger_payment_date_after'                     => 'La data di pagamento è dopo il ":trigger_value"',
+    'rule_trigger_invoice_date_on_choice'                 => 'La data di fatturazione è il..',
+    'rule_trigger_invoice_date_on'                        => 'La data di fatturazione è il ":trigger_value"',
+    'rule_trigger_invoice_date_before_choice'             => 'La data di fatturazione è prima del..',
+    'rule_trigger_invoice_date_before'                    => 'La data di fatturazione è prima del ":trigger_value"',
+    'rule_trigger_invoice_date_after_choice'              => 'La data di fatturazione è dopo il..',
+    'rule_trigger_invoice_date_after'                     => 'La data di fatturazione è dopo il ":trigger_value"',
+    'rule_trigger_created_at_before_choice'               => 'La transazione è stata creata prima del..',
+    'rule_trigger_created_at_before'                      => 'La transazione è stata creata prima del ":trigger_value"',
+    'rule_trigger_created_at_after_choice'                => 'La transazione è stata creata dopo il..',
+    'rule_trigger_created_at_after'                       => 'La transazione è stata creata dopo il ":trigger_value"',
+    'rule_trigger_updated_at_before_choice'               => 'La transazione è stata aggiornata prima del..',
+    'rule_trigger_updated_at_before'                      => 'La transazione è stata aggiornata prima del ":trigger_value"',
+    'rule_trigger_updated_at_after_choice'                => 'La transazione è stata aggiornata dopo il..',
+    'rule_trigger_updated_at_after'                       => 'La transazione è stata aggiornata dopo ":trigger_value"',
+    'rule_trigger_foreign_amount_is_choice'               => 'L\'importo straniero è esattamente di..',
+    'rule_trigger_foreign_amount_is'                      => 'L\'importo straniero è esattamente di ":trigger_value"',
+    'rule_trigger_foreign_amount_less_choice'             => 'L\'importo straniero è inferiore a..',
+    'rule_trigger_foreign_amount_less'                    => 'L\'importo straniero è inferiore a ":trigger_value"',
+    'rule_trigger_foreign_amount_more_choice'             => 'L\'importo straniero è maggiore di..',
+    'rule_trigger_foreign_amount_more'                    => 'L\'importo straniero è maggiore di ":trigger_value"',
+    'rule_trigger_attachment_name_is_choice'              => 'Il nome di qualsiasi allegato è..',
+    'rule_trigger_attachment_name_is'                     => 'Il nome di qualsiasi allegato è ":trigger_value"',
+    'rule_trigger_attachment_name_contains_choice'        => 'Il nome di qualsiasi allegato contiene..',
+    'rule_trigger_attachment_name_contains'               => 'Il nome di qualsiasi allegato contiene ":trigger_value"',
+    'rule_trigger_attachment_name_starts_choice'          => 'Il nome di qualsiasi allegato inizia per..',
+    'rule_trigger_attachment_name_starts'                 => 'Il nome di qualsiasi allegato inizia per ":trigger_value"',
+    'rule_trigger_attachment_name_ends_choice'            => 'Il nome di qualsiasi allegato termina per..',
+    'rule_trigger_attachment_name_ends'                   => 'Il nome di qualsiasi allegato termina per ":trigger_value"',
+    'rule_trigger_attachment_notes_are_choice'            => 'Le note di qualsiasi allegato sono..',
+    'rule_trigger_attachment_notes_are'                   => 'Le note di qualsiasi allegato sono ":trigger_value"',
+    'rule_trigger_attachment_notes_contains_choice'       => 'Le note di qualsiasi allegato contengono..',
+    'rule_trigger_attachment_notes_contains'              => 'Le note di qualsiasi allegato contengono ":trigger_value"',
+    'rule_trigger_attachment_notes_starts_choice'         => 'Le note di qualsiasi allegato iniziano per..',
+    'rule_trigger_attachment_notes_starts'                => 'Le note di qualsiasi allegato iniziano per ":trigger_value"',
+    'rule_trigger_attachment_notes_ends_choice'           => 'Le note di qualsiasi allegato terminano per..',
+    'rule_trigger_attachment_notes_ends'                  => 'Le note di qualsiasi allegato terminano per ":trigger_value"',
+    'rule_trigger_reconciled_choice'                      => 'La transazione è riconciliata',
+    'rule_trigger_reconciled'                             => 'La transazione è riconciliata',
+    'rule_trigger_exists_choice'                          => 'Qualsiasi transazione corrisponde(!)',
+    'rule_trigger_exists'                                 => 'Qualsiasi transazione corrisponde',

    // more values for new types:
-    'rule_trigger_not_account_id'                         => 'Account ID is not ":trigger_value"',
-    'rule_trigger_not_source_account_id'                  => 'Source account ID is not ":trigger_value"',
-    'rule_trigger_not_destination_account_id'             => 'Destination account ID is not ":trigger_value"',
-    'rule_trigger_not_transaction_type'                   => 'Transaction type is not ":trigger_value"',
-    'rule_trigger_not_tag_is'                             => 'Tag is not ":trigger_value"',
-    'rule_trigger_not_tag_is_not'                         => 'Tag is ":trigger_value"',
-    'rule_trigger_not_description_is'                     => 'Description is not ":trigger_value"',
-    'rule_trigger_not_description_contains'               => 'Description does not contain',
-    'rule_trigger_not_description_ends'                   => 'Description does not end with ":trigger_value"',
-    'rule_trigger_not_description_starts'                 => 'Description does not start with ":trigger_value"',
-    'rule_trigger_not_notes_is'                           => 'Notes are not ":trigger_value"',
-    'rule_trigger_not_notes_contains'                     => 'Notes do not contain ":trigger_value"',
-    'rule_trigger_not_notes_ends'                         => 'Notes do not end on ":trigger_value"',
-    'rule_trigger_not_notes_starts'                       => 'Notes do not start with ":trigger_value"',
-    'rule_trigger_not_source_account_is'                  => 'Source account is not ":trigger_value"',
-    'rule_trigger_not_source_account_contains'            => 'Source account does not contain ":trigger_value"',
-    'rule_trigger_not_source_account_ends'                => 'Source account does not end on ":trigger_value"',
-    'rule_trigger_not_source_account_starts'              => 'Source account does not start with ":trigger_value"',
-    'rule_trigger_not_source_account_nr_is'               => 'Source account number / IBAN is not ":trigger_value"',
-    'rule_trigger_not_source_account_nr_contains'         => 'Source account number / IBAN does not contain ":trigger_value"',
-    'rule_trigger_not_source_account_nr_ends'             => 'Source account number / IBAN does not end on ":trigger_value"',
-    'rule_trigger_not_source_account_nr_starts'           => 'Source account number / IBAN does not start with ":trigger_value"',
-    'rule_trigger_not_destination_account_is'             => 'Destination account is not ":trigger_value"',
-    'rule_trigger_not_destination_account_contains'       => 'Destination account does not contain ":trigger_value"',
-    'rule_trigger_not_destination_account_ends'           => 'Destination account does not end on ":trigger_value"',
-    'rule_trigger_not_destination_account_starts'         => 'Destination account does not start with ":trigger_value"',
-    'rule_trigger_not_destination_account_nr_is'          => 'Destination account number / IBAN is not ":trigger_value"',
-    'rule_trigger_not_destination_account_nr_contains'    => 'Destination account number / IBAN does not contain ":trigger_value"',
-    'rule_trigger_not_destination_account_nr_ends'        => 'Destination account number / IBAN does not end on ":trigger_value"',
-    'rule_trigger_not_destination_account_nr_starts'      => 'Destination account number / IBAN does not start with ":trigger_value"',
-    'rule_trigger_not_account_is'                         => 'Neither account is ":trigger_value"',
-    'rule_trigger_not_account_contains'                   => 'Neither account contains ":trigger_value"',
-    'rule_trigger_not_account_ends'                       => 'Neither account ends on ":trigger_value"',
-    'rule_trigger_not_account_starts'                     => 'Neither account starts with ":trigger_value"',
-    'rule_trigger_not_account_nr_is'                      => 'Neither account number / IBAN is ":trigger_value"',
-    'rule_trigger_not_account_nr_contains'                => 'Neither account number / IBAN contains ":trigger_value"',
-    'rule_trigger_not_account_nr_ends'                    => 'Neither account number / IBAN ends on ":trigger_value"',
-    'rule_trigger_not_account_nr_starts'                  => 'Neither account number / IBAN starts with ":trigger_value"',
-    'rule_trigger_not_category_is'                        => 'Category is not ":trigger_value"',
-    'rule_trigger_not_category_contains'                  => 'Category does not contain ":trigger_value"',
-    'rule_trigger_not_category_ends'                      => 'Category does not end on ":trigger_value"',
-    'rule_trigger_not_category_starts'                    => 'Category does not start with ":trigger_value"',
-    'rule_trigger_not_budget_is'                          => 'Budget is not ":trigger_value"',
-    'rule_trigger_not_budget_contains'                    => 'Budget does not contain ":trigger_value"',
-    'rule_trigger_not_budget_ends'                        => 'Budget does not end on ":trigger_value"',
-    'rule_trigger_not_budget_starts'                      => 'Budget does not start with ":trigger_value"',
-    'rule_trigger_not_bill_is'                            => 'Bill is not is ":trigger_value"',
-    'rule_trigger_not_bill_contains'                      => 'Bill does not contain ":trigger_value"',
-    'rule_trigger_not_bill_ends'                          => 'Bill does not end on ":trigger_value"',
-    'rule_trigger_not_bill_starts'                        => 'Bill does not end with ":trigger_value"',
-    'rule_trigger_not_external_id_is'                     => 'External ID is not ":trigger_value"',
-    'rule_trigger_not_external_id_contains'               => 'External ID does not contain ":trigger_value"',
-    'rule_trigger_not_external_id_ends'                   => 'External ID does not end on ":trigger_value"',
-    'rule_trigger_not_external_id_starts'                 => 'External ID does not start with ":trigger_value"',
-    'rule_trigger_not_internal_reference_is'              => 'Internal reference is not ":trigger_value"',
-    'rule_trigger_not_internal_reference_contains'        => 'Internal reference does not contain ":trigger_value"',
-    'rule_trigger_not_internal_reference_ends'            => 'Internal reference does not end on ":trigger_value"',
-    'rule_trigger_not_internal_reference_starts'          => 'Internal reference does not start with ":trigger_value"',
-    'rule_trigger_not_external_url_is'                    => 'External URL is not ":trigger_value"',
-    'rule_trigger_not_external_url_contains'              => 'External URL does not contain ":trigger_value"',
-    'rule_trigger_not_external_url_ends'                  => 'External URL does not end on ":trigger_value"',
-    'rule_trigger_not_external_url_starts'                => 'External URL does not start with ":trigger_value"',
-    'rule_trigger_not_currency_is'                        => 'Currency is not ":trigger_value"',
-    'rule_trigger_not_foreign_currency_is'                => 'Foreign currency is not ":trigger_value"',
-    'rule_trigger_not_id'                                 => 'Transaction ID is not ":trigger_value"',
-    'rule_trigger_not_journal_id'                         => 'Transaction journal ID is not ":trigger_value"',
-    'rule_trigger_not_recurrence_id'                      => 'Recurrence ID is not ":trigger_value"',
-    'rule_trigger_not_date_on'                            => 'Date is not on ":trigger_value"',
-    'rule_trigger_not_date_before'                        => 'Date is not before ":trigger_value"',
-    'rule_trigger_not_date_after'                         => 'Date is not after ":trigger_value"',
-    'rule_trigger_not_interest_date_on'                   => 'Interest date is not on ":trigger_value"',
-    'rule_trigger_not_interest_date_before'               => 'Interest date is not before ":trigger_value"',
-    'rule_trigger_not_interest_date_after'                => 'Interest date is not after ":trigger_value"',
-    'rule_trigger_not_book_date_on'                       => 'Book date is not on ":trigger_value"',
-    'rule_trigger_not_book_date_before'                   => 'Book date is not before ":trigger_value"',
-    'rule_trigger_not_book_date_after'                    => 'Book date is not after ":trigger_value"',
-    'rule_trigger_not_process_date_on'                    => 'Process date is not on ":trigger_value"',
-    'rule_trigger_not_process_date_before'                => 'Process date is not before ":trigger_value"',
-    'rule_trigger_not_process_date_after'                 => 'Process date is not after ":trigger_value"',
-    'rule_trigger_not_due_date_on'                        => 'Due date is not on ":trigger_value"',
-    'rule_trigger_not_due_date_before'                    => 'Due date is not before ":trigger_value"',
-    'rule_trigger_not_due_date_after'                     => 'Due date is not after ":trigger_value"',
-    'rule_trigger_not_payment_date_on'                    => 'Payment date is not on ":trigger_value"',
-    'rule_trigger_not_payment_date_before'                => 'Payment date is not before ":trigger_value"',
-    'rule_trigger_not_payment_date_after'                 => 'Payment date is not after ":trigger_value"',
-    'rule_trigger_not_invoice_date_on'                    => 'Invoice date is not on ":trigger_value"',
-    'rule_trigger_not_invoice_date_before'                => 'Invoice date is not before ":trigger_value"',
-    'rule_trigger_not_invoice_date_after'                 => 'Invoice date is not after ":trigger_value"',
-    'rule_trigger_not_created_at_on'                      => 'Transaction is not created on ":trigger_value"',
-    'rule_trigger_not_created_at_before'                  => 'Transaction is not created before ":trigger_value"',
-    'rule_trigger_not_created_at_after'                   => 'Transaction is not created after ":trigger_value"',
-    'rule_trigger_not_updated_at_on'                      => 'Transaction is not updated on ":trigger_value"',
-    'rule_trigger_not_updated_at_before'                  => 'Transaction is not updated before ":trigger_value"',
-    'rule_trigger_not_updated_at_after'                   => 'Transaction is not updated after ":trigger_value"',
-    'rule_trigger_not_amount_is'                          => 'Transaction amount is not ":trigger_value"',
-    'rule_trigger_not_amount_less'                        => 'Transaction amount is more than ":trigger_value"',
-    'rule_trigger_not_amount_more'                        => 'Transaction amount is less than ":trigger_value"',
-    'rule_trigger_not_foreign_amount_is'                  => 'Foreign transaction amount is not ":trigger_value"',
-    'rule_trigger_not_foreign_amount_less'                => 'Foreign transaction amount is more than ":trigger_value"',
-    'rule_trigger_not_foreign_amount_more'                => 'Foreign transaction amount is less than ":trigger_value"',
-    'rule_trigger_not_attachment_name_is'                 => 'No attachment is named ":trigger_value"',
-    'rule_trigger_not_attachment_name_contains'           => 'No attachment name contains ":trigger_value"',
-    'rule_trigger_not_attachment_name_starts'             => 'No attachment name starts with ":trigger_value"',
-    'rule_trigger_not_attachment_name_ends'               => 'No attachment name ends on ":trigger_value"',
-    'rule_trigger_not_attachment_notes_are'               => 'No attachment notes are ":trigger_value"',
-    'rule_trigger_not_attachment_notes_contains'          => 'No attachment notes contain ":trigger_value"',
-    'rule_trigger_not_attachment_notes_starts'            => 'No attachment notes start with ":trigger_value"',
-    'rule_trigger_not_attachment_notes_ends'              => 'No attachment notes end on ":trigger_value"',
-    'rule_trigger_not_reconciled'                         => 'Transaction is not reconciled',
-    'rule_trigger_not_exists'                             => 'Transaction does not exist',
-    'rule_trigger_not_has_attachments'                    => 'Transaction has no attachments',
-    'rule_trigger_not_has_any_category'                   => 'Transaction has no category',
-    'rule_trigger_not_has_any_budget'                     => 'Transaction has no category',
-    'rule_trigger_not_has_any_bill'                       => 'Transaction has no bill',
+    'rule_trigger_not_account_id'                         => 'L\'ID del conto non è ":trigger_value"',
+    'rule_trigger_not_source_account_id'                  => 'L\'ID del conto di origine non è ":trigger_value"',
+    'rule_trigger_not_destination_account_id'             => 'L\'ID del conto di destinazione non è ":trigger_value"',
+    'rule_trigger_not_transaction_type'                   => 'Il tipo di transazione non è ":trigger_value"',
+    'rule_trigger_not_tag_is'                             => 'Il tag non è ":trigger_value"',
+    'rule_trigger_not_tag_is_not'                         => 'Il tag è ":trigger_value"',
+    'rule_trigger_not_description_is'                     => 'La descrizione non è ":trigger_value"',
+    'rule_trigger_not_description_contains'               => 'La descrizione non contiene',
+    'rule_trigger_not_description_ends'                   => 'La descrizione non termina per ":trigger_value"',
+    'rule_trigger_not_description_starts'                 => 'La descrizione non inizia per ":trigger_value"',
+    'rule_trigger_not_notes_is'                           => 'Le note non sono ":trigger_value"',
+    'rule_trigger_not_notes_contains'                     => 'Le note non contengono ":trigger_value"',
+    'rule_trigger_not_notes_ends'                         => 'Le note non terminano per ":trigger_value"',
+    'rule_trigger_not_notes_starts'                       => 'Le note non iniziano per ":trigger_value"',
+    'rule_trigger_not_source_account_is'                  => 'Il conto di origine non è ":trigger_value"',
+    'rule_trigger_not_source_account_contains'            => 'Il conto di origine non contiene ":trigger_value"',
+    'rule_trigger_not_source_account_ends'                => 'Il conto di origine non termina per ":trigger_value"',
+    'rule_trigger_not_source_account_starts'              => 'Il conto di origine non inizia per ":trigger_value"',
+    'rule_trigger_not_source_account_nr_is'               => 'Il numero del conto di origine / IBAN non è ":trigger_value"',
+    'rule_trigger_not_source_account_nr_contains'         => 'Il numero del conto di origine / IBAN non contiene ":trigger_value"',
+    'rule_trigger_not_source_account_nr_ends'             => 'Il numero del conto di origine / IBAN non termina per ":trigger_value"',
+    'rule_trigger_not_source_account_nr_starts'           => 'Il numero del conto di origine / IBAN non inizia per ":trigger_value"',
+    'rule_trigger_not_destination_account_is'             => 'Il conto di destinazione non è ":trigger_value"',
+    'rule_trigger_not_destination_account_contains'       => 'Il conto di destinazione non contiene ":trigger_value"',
+    'rule_trigger_not_destination_account_ends'           => 'Il conto di destinazione non termina per ":trigger_value"',
+    'rule_trigger_not_destination_account_starts'         => 'Il conto di destinazione non inizia per ":trigger_value"',
+    'rule_trigger_not_destination_account_nr_is'          => 'Il numero del conto / IBAN di destinazione non è ":trigger_value"',
+    'rule_trigger_not_destination_account_nr_contains'    => 'Il numero del conto / IBAN di destinazione non contiene ":trigger_value"',
+    'rule_trigger_not_destination_account_nr_ends'        => 'Il numero del conto / IBAN di destinazione non termina per ":trigger_value"',
+    'rule_trigger_not_destination_account_nr_starts'      => 'Il numero del conto / IBAN di destinazione non inizia per ":trigger_value"',
+    'rule_trigger_not_account_is'                         => 'Nessun conto è ":trigger_value"',
+    'rule_trigger_not_account_contains'                   => 'Nessun conto contiene ":trigger_value"',
+    'rule_trigger_not_account_ends'                       => 'Nessun conto termina per ":trigger_value"',
+    'rule_trigger_not_account_starts'                     => 'Nessun conto inizia per ":trigger_value"',
+    'rule_trigger_not_account_nr_is'                      => 'Nessun numero di conto / IBAN è ":trigger_value"',
+    'rule_trigger_not_account_nr_contains'                => 'Nessun numero di conto / IBAN contiene ":trigger_value"',
+    'rule_trigger_not_account_nr_ends'                    => 'Nessun numero di conto / IBAN termina per ":trigger_value"',
+    'rule_trigger_not_account_nr_starts'                  => 'Nessun numero di conto / IBAN inizia per ":trigger_value"',
+    'rule_trigger_not_category_is'                        => 'La categoria non è ":trigger_value"',
+    'rule_trigger_not_category_contains'                  => 'La categoria non contiene ":trigger_value"',
+    'rule_trigger_not_category_ends'                      => 'La categoria non termina per ":trigger_value"',
+    'rule_trigger_not_category_starts'                    => 'La categoria non inizia per ":trigger_value"',
+    'rule_trigger_not_budget_is'                          => 'Il budget non è ":trigger_value"',
+    'rule_trigger_not_budget_contains'                    => 'Il budget non contiene ":trigger_value"',
+    'rule_trigger_not_budget_ends'                        => 'Il budget non termina il ":trigger_value"',
+    'rule_trigger_not_budget_starts'                      => 'Il budget non inizia per ":trigger_value"',
+    'rule_trigger_not_bill_is'                            => 'La fattura non è ":trigger_value"',
+    'rule_trigger_not_bill_contains'                      => 'La fattura non contiene ":trigger_value"',
+    'rule_trigger_not_bill_ends'                          => 'La fattura non termina il ":trigger_value"',
+    'rule_trigger_not_bill_starts'                        => 'La fattura non termina per ":trigger_value"',
+    'rule_trigger_not_external_id_is'                     => 'L\'ID esterno non è ":trigger_value"',
+    'rule_trigger_not_external_id_contains'               => 'L\'ID esterno non contiene ":trigger_value"',
+    'rule_trigger_not_external_id_ends'                   => 'L\'ID esterno non termina il ":trigger_value"',
+    'rule_trigger_not_external_id_starts'                 => 'L\'ID esterno non inizia per ":trigger_value"',
+    'rule_trigger_not_internal_reference_is'              => 'Il riferimento interno non è ":trigger_value"',
+    'rule_trigger_not_internal_reference_contains'        => 'Il riferimento interno non contiene ":trigger_value"',
+    'rule_trigger_not_internal_reference_ends'            => 'Il riferimento interno non termina il ":trigger_value"',
+    'rule_trigger_not_internal_reference_starts'          => 'Il riferimento interno non inizia per ":trigger_value"',
+    'rule_trigger_not_external_url_is'                    => 'L\'URL esterno non è ":trigger_value"',
+    'rule_trigger_not_external_url_contains'              => 'L\'URL esterno non contiene ":trigger_value"',
+    'rule_trigger_not_external_url_ends'                  => 'L\'URL esterno non termina il ":trigger_value"',
+    'rule_trigger_not_external_url_starts'                => 'L\'URL esterno non inizia per ":trigger_value"',
+    'rule_trigger_not_currency_is'                        => 'La valuta non è ":trigger_value"',
+    'rule_trigger_not_foreign_currency_is'                => 'La valuta straniera non è ":trigger_value"',
+    'rule_trigger_not_id'                                 => 'L\'ID della transazione non è ":trigger_value"',
+    'rule_trigger_not_journal_id'                         => 'L\'ID del diario della transazione non è ":trigger_value"',
+    'rule_trigger_not_recurrence_id'                      => 'L\'ID della ricorrenza non è ":trigger_value"',
+    'rule_trigger_not_date_on'                            => 'La data non è ":trigger_value"',
+    'rule_trigger_not_date_before'                        => 'La data non è prima del ":trigger_value"',
+    'rule_trigger_not_date_after'                         => 'La data non è dopo il ":trigger_value"',
+    'rule_trigger_not_interest_date_on'                   => 'La data d\'interesse non è il ":trigger_value"',
+    'rule_trigger_not_interest_date_before'               => 'La data d\'interesse non è prima del ":trigger_value"',
+    'rule_trigger_not_interest_date_after'                => 'La data d\'interesse non è dopo il ":trigger_value"',
+    'rule_trigger_not_book_date_on'                       => 'La data di prenotazione non è il ":trigger_value"',
+    'rule_trigger_not_book_date_before'                   => 'La data di prenotazione non è prima del ":trigger_value"',
+    'rule_trigger_not_book_date_after'                    => 'La data di prenotazione non è dopo il ":trigger_value"',
+    'rule_trigger_not_process_date_on'                    => 'La data di elaborazione non è il ":trigger_value"',
+    'rule_trigger_not_process_date_before'                => 'La data di elaborazione non è prima del ":trigger_value"',
+    'rule_trigger_not_process_date_after'                 => 'La data di elaborazione non è dopo il ":trigger_value"',
+    'rule_trigger_not_due_date_on'                        => 'La data di scadenza non è il ":trigger_value"',
+    'rule_trigger_not_due_date_before'                    => 'La data di scadenza non è prima del ":trigger_value"',
+    'rule_trigger_not_due_date_after'                     => 'La data di scadenza non è dopo il ":trigger_value"',
+    'rule_trigger_not_payment_date_on'                    => 'La data di pagamento non è il ":trigger_value"',
+    'rule_trigger_not_payment_date_before'                => 'La data di pagamento non è prima del ":trigger_value"',
+    'rule_trigger_not_payment_date_after'                 => 'La data di pagamento non è dopo il ":trigger_value"',
+    'rule_trigger_not_invoice_date_on'                    => 'La data della fattura non è il ":trigger_value"',
+    'rule_trigger_not_invoice_date_before'                => 'La data della fattura non è prima del ":trigger_value"',
+    'rule_trigger_not_invoice_date_after'                 => 'La data della fattura non è dopo il ":trigger_value"',
+    'rule_trigger_not_created_at_on'                      => 'La transazione non è stata creata il ":trigger_value"',
+    'rule_trigger_not_created_at_before'                  => 'La transazione non è stata creata prima del ":trigger_value"',
+    'rule_trigger_not_created_at_after'                   => 'La transazione non è stata creata dopo il ":trigger_value"',
+    'rule_trigger_not_updated_at_on'                      => 'La transazione non è stata aggiornata il ":trigger_value"',
+    'rule_trigger_not_updated_at_before'                  => 'La transazione non è stata aggiornata prima del ":trigger_value"',
+    'rule_trigger_not_updated_at_after'                   => 'La transazione non è stata aggiornata dopo il ":trigger_value"',
+    'rule_trigger_not_amount_is'                          => 'L\'importo della transazione non è ":trigger_value"',
+    'rule_trigger_not_amount_less'                        => 'L\'importo della transazione è maggiore di ":trigger_value"',
+    'rule_trigger_not_amount_more'                        => 'L\'importo della transazione è inferiore a ":trigger_value"',
+    'rule_trigger_not_foreign_amount_is'                  => 'L\'importo della transazione straniera non è ":trigger_value"',
+    'rule_trigger_not_foreign_amount_less'                => 'L\'importo della transazione straniera è maggiore di ":trigger_value"',
+    'rule_trigger_not_foreign_amount_more'                => 'L\'importo della transazione straniera è inferiore a ":trigger_value"',
+    'rule_trigger_not_attachment_name_is'                 => 'Nessun allegato denominato ":trigger_value"',
+    'rule_trigger_not_attachment_name_contains'           => 'Nessun nome dell\'allegato contiene ":trigger_value"',
+    'rule_trigger_not_attachment_name_starts'             => 'Nessun nome dell\'allegato inizia per ":trigger_value"',
+    'rule_trigger_not_attachment_name_ends'               => 'Nessun nome dell\'allegato termina in ":trigger_value"',
+    'rule_trigger_not_attachment_notes_are'               => 'Nessuna nota dell\'allegato è ":trigger_value"',
+    'rule_trigger_not_attachment_notes_contains'          => 'Nessuna nota dell\'allegato contiene ":trigger_value"',
+    'rule_trigger_not_attachment_notes_starts'            => 'Nessuna nota dell\'allegato inizia per ":trigger_value"',
+    'rule_trigger_not_attachment_notes_ends'              => 'Nessuna nota dell\'allegato termina per ":trigger_value"',
+    'rule_trigger_not_reconciled'                         => 'La transazione non è riconciliata',
+    'rule_trigger_not_exists'                             => 'La transazione non esiste',
+    'rule_trigger_not_has_attachments'                    => 'La transazione non ha allegati',
+    'rule_trigger_not_has_any_category'                   => 'La transazione non ha alcuna categoria',
+    'rule_trigger_not_has_any_budget'                     => 'La transazione non ha alcuna categoria',
+    'rule_trigger_not_has_any_bill'                       => 'La transazione non ha alcuna fattura',
    'rule_trigger_not_has_any_tag'                        => 'La transazione non ha alcun tag',
    'rule_trigger_not_any_notes'                          => 'La transazione non ha alcuna nota',
    'rule_trigger_not_any_external_url'                   => 'La transazione non ha alcun URL esterno',
@ -1208,9 +1208,9 @@ return [
    'rule_trigger_not_has_no_tag'                         => 'La transazione ha uno o più tag',
    'rule_trigger_not_no_notes'                           => 'La transazione contiene qualsiasi nota',
    'rule_trigger_not_no_external_url'                    => 'La transazione ha un URL esterno',
-    'rule_trigger_not_source_is_cash'                     => 'Source account is not a cash account',
-    'rule_trigger_not_destination_is_cash'                => 'Destination account is not a cash account',
-    'rule_trigger_not_account_is_cash'                    => 'Neither account is a cash account',
+    'rule_trigger_not_source_is_cash'                     => 'Il conto di origine non è un conto corrente',
+    'rule_trigger_not_destination_is_cash'                => 'Il conto di destinazione non è un conto corrente',
+    'rule_trigger_not_account_is_cash'                    => 'Nessun conto è un conto corrente',

    /*
 * PLEASE DO NOT EDIT THIS FILE DIRECTLY.
@ -1279,8 +1279,8 @@ return [
    'rule_action_append_notes_to_descr'                   => 'Aggiungi le note alla descrizione',
    'rule_action_move_descr_to_notes'                     => 'Sostituisci le note con la descrizione',
    'rule_action_move_notes_to_descr'                     => 'Sostituisci la descrizione con le note',
-    'rule_action_set_destination_to_cash_choice'          => 'Set destination account to (cash)',
-    'rule_action_set_source_to_cash_choice'               => 'Set source account to (cash)',
+    'rule_action_set_destination_to_cash_choice'          => 'Imposta il conto di destinazione a (corrente)',
+    'rule_action_set_source_to_cash_choice'               => 'Imposta il conto di origine a (corrente)',
    'rulegroup_for_bills_title'                           => 'Gruppo di regole per le bollette',
    'rulegroup_for_bills_description'                     => 'Un gruppo di regole speciale per tutte le regole relative alle fatture.',
    'rule_for_bill_title'                                 => 'Regola generata automaticamente per la fattura ":name"',
@ -1952,7 +1952,7 @@ return [

    // transactions:
    'wait_loading_transaction'                            => 'Attendi il caricamento del modello',
-    'wait_loading_data'                                   => 'Please wait for your information to load...',
+    'wait_loading_data'                                   => 'Ti preghiamo di attendere il caricamento delle tue informazioni...',
    'wait_attachments'                                    => 'Attendere che gli allegati vengano caricati.',
    'errors_upload'                                       => 'Caricamento fallito. Controlla la console del tuo browser per l\'errore.',
    'amount_foreign_if'                                   => 'Importo in valuta estera, nel caso',
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@ -1379,8 +1379,8 @@ return [
    'optional_tj_date_fields'                             => 'Campos de data',
    'optional_tj_other_fields'                            => 'Outros campos',
    'optional_tj_attachment_fields'                       => 'Campos de anexo',
-    'pref_optional_tj_interest_date'                      => 'Data de interesse',
-    'pref_optional_tj_book_date'                          => 'Data reserva',
+    'pref_optional_tj_interest_date'                      => 'Data de juros',
+    'pref_optional_tj_book_date'                          => 'Data de lançamento',
    'pref_optional_tj_process_date'                       => 'Data de processamento',
    'pref_optional_tj_due_date'                           => 'Data de vencimento',
    'pref_optional_tj_payment_date'                       => 'Data de pagamento',
--- a/resources/lang/ru_RU/email.php
+++ b/resources/lang/ru_RU/email.php
@ -143,7 +143,7 @@ return [
    'error_github_text'                       => 'Если вы предпочитаете, вы также можете открыть новый тикет на https://github.com/firefly-iii/firefly-iii/issues.',
    'error_stacktrace_below'                  => 'Полная трассировка стека:',
    'error_headers'                           => 'Заголовки также могут иметь отношение к следующим темам:',
-    'error_post'                              => 'This was submitted by the user:',
+    'error_post'                              => 'Это было отправлено пользователем:',

    /*
 * PLEASE DO NOT EDIT THIS FILE DIRECTLY.
--- a/resources/lang/ru_RU/firefly.php
+++ b/resources/lang/ru_RU/firefly.php
@ -1299,7 +1299,7 @@ return [
    'no_location_set'                                     => 'Местоположение не указано.',
    'meta_data'                                           => 'Расширенные данные',
    'location'                                            => 'Размещение',
-    'location_first_split'                                => 'The location for this transaction can be set on the first split of this transaction.',
+    'location_first_split'                                => 'Расположение для этой транзакции может быть установлено на первой части этой транзакции.',
    'without_date'                                        => 'Без даты',
    'result'                                              => 'Результат',
    'sums_apply_to_range'                                 => 'Все суммы относятся к выбранному диапазону',
@ -1951,12 +1951,12 @@ return [
 */

    // transactions:
-    'wait_loading_transaction'                            => 'Please wait for the form to load',
-    'wait_loading_data'                                   => 'Please wait for your information to load...',
+    'wait_loading_transaction'                            => 'Дождитесь загрузки формы',
+    'wait_loading_data'                                   => 'Пожалуйста, дождитесь загрузки вашей информации...',
    'wait_attachments'                                    => 'Пожалуйста, дождитесь загрузки вложений.',
-    'errors_upload'                                       => 'The upload has failed. Please check your browser console for the error.',
-    'amount_foreign_if'                                   => 'Amount in foreign currency, if any',
-    'amount_destination_account'                          => 'Amount in the currency of the destination account',
+    'errors_upload'                                       => 'Загрузка не удалась. Пожалуйста, проверьте консоль вашего браузера на наличие ошибки.',
+    'amount_foreign_if'                                   => 'Сумма в иностранной валюте, если таковая имеется',
+    'amount_destination_account'                          => 'Сумма в валюте счета назначения',
    'edit_transaction_title'                              => 'Редактировать транзакцию ":description"',
    'unreconcile'                                         => 'Отменить сверку',
    'update_withdrawal'                                   => 'Обновить расход',
@ -2342,7 +2342,7 @@ return [
    'average'                                             => 'Среднее значение',
    'balanceFor'                                          => 'Баланс для :name',
    'no_tags'                                             => '(нет меток)',
-    'nothing_found'                                       => '(nothing found)',
+    'nothing_found'                                       => '(ничего не найдено)',

    // piggy banks:
    'event_history'                                       => 'История событий',
@ -2555,7 +2555,7 @@ return [
    'after_update_create_another'                         => 'После обновления вернитесь сюда, чтобы продолжить редактирование.',
    'store_as_new'                                        => 'Сохранить как новую транзакцию вместо обновления.',
    'reset_after'                                         => 'Сбросить форму после отправки',
-    'errors_submission'                                   => 'There was something wrong with your submission. Please check out the errors below: %{errorMessage}',
+    'errors_submission'                                   => 'С вашей публикацией произошла ошибка. Пожалуйста, проверьте следующие ошибки: %{errorMessage}',
    'transaction_expand_split'                            => 'Expand split',
    'transaction_collapse_split'                          => 'Collapse split',

--- a/resources/lang/ru_RU/validation.php
+++ b/resources/lang/ru_RU/validation.php
@ -34,8 +34,8 @@
 declare(strict_types=1);

 return [
-    '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.',
+    'bad_type_source'                 => 'Firefly III не может определить тип транзакции на основе этого исходного счета.',
+    'bad_type_destination'            => 'Firefly III не может определить тип транзакции на основе этого счета.',
    'missing_where'                   => 'В массиве отсутствует связка "where" ("где")',
    'missing_update'                  => 'В массиве отсутствует связка "update" ("обновить")',
    'invalid_where_key'               => 'JSON содержит недопустимый ключ для связки "where" ("где")',
--- a/resources/lang/sl_SI/breadcrumbs.php
+++ b/resources/lang/sl_SI/breadcrumbs.php
@ -61,7 +61,7 @@ return [
    'search_result'          => 'Rezultati iskanja za ":query"',
    'withdrawal_list'        => 'Stroški',
    'Withdrawal_list'        => 'Stroški',
-    'deposit_list'           => 'Prihodki, dohodki in depoziti',
+    'deposit_list'           => 'Prihodki, dohodki in prilivi',
    'transfer_list'          => 'Prenosi',
    'transfers_list'         => 'Prenosi',

@ -77,8 +77,8 @@ return [
 */

    'reconciliation_list'    => 'Poravnave',
-    'create_withdrawal'      => 'Ustvari nov dvig',
-    'create_deposit'         => 'Ustvari nov depozit',
+    'create_withdrawal'      => 'Ustvari nov odliv',
+    'create_deposit'         => 'Ustvari nov priliv',
    'create_transfer'        => 'Ustvari nov prenos',
    'create_new_transaction' => 'Ustvari novo transakcijo',
    'edit_journal'           => 'Uredi transakcijo ":description"',
--- a/resources/lang/sl_SI/demo.php
+++ b/resources/lang/sl_SI/demo.php
@ -44,7 +44,7 @@ Računi obveznosti so vaši dolgovi in krediti, kot na primer dolg na kreditni k
    'reports-index-start'    => 'Firefly III podpira mnogo različnih poročil. Preberi več s klikom na ikono <i class="fa fa-question-circle"></i> v zgornjem desnem kotu.',
    'reports-index-examples' => 'Poglej si še ostale primere: <a href=":one"> mesečni finančni pregled</a>, <a href=":two">letni finančni pregled</a> in <a href=":three">pregled proračuna</a>.',
    'currencies-index'       => 'Firefly III podpira več valut. Čeprav je privzet Evro, je možno nastaviti USD in ostale valute. Nekaj valut je že vključenih, po želji pa lahko dodate svoje. Sprememba privzete valute ne bo spremenila valute na obstoječih transakcijah, Firefly III pa podpira uporabo več valut istočasno.',
-    'transactions-index'     => 'Ti stroški, prihodki in prenosi niso pretirano domiselni. Ustvarjeni so bili samodejno.',
+    'transactions-index'     => 'Ti stroški, prilivi in prenosi niso pretirano domiselni. Ustvarjeni so bili samodejno.',
    'piggy-banks-index'      => 'Obstajajo trije hranilniki. Uporabite gumba plus in minus da vplivate na količino denarja v vsakem. Kliknite na ime hranilnika za več informacij.',
    'profile-index'          => 'Demo spletno mesto se ponastavi vsake štiri ure. Dostop lahko izgubiš v vsakem trenutku. Ta proces je samodejen in ne gre za "bug".',
 ];
--- a/resources/lang/sl_SI/firefly.php
+++ b/resources/lang/sl_SI/firefly.php
@ -70,21 +70,21 @@ return [
    'asset_account_role_help'                             => 'Dodatne možnosti se lahko nastavljajo tudi kasneje.',
    'Opening balance'                                     => 'Začetno stanje',
    'create_new_stuff'                                    => 'Ustvari novo stvar',
-    'new_withdrawal'                                      => 'Nov dvig',
+    'new_withdrawal'                                      => 'Nov odliv',
    'create_new_transaction'                              => 'Ustvari novo transakcijo',
    'sidebar_frontpage_create'                            => 'Ustvari',
    'new_transaction'                                     => 'Nova transakcija',
    'no_rules_for_bill'                                   => 'Ta račun nima nastavljenih pravil.',
    'go_to_asset_accounts'                                => 'Oglej si račune sredstev',
    'go_to_budgets'                                       => 'Na proračune',
-    'go_to_withdrawals'                                   => 'Pojdi na svoje dvige',
+    'go_to_withdrawals'                                   => 'Pojdi na svoje odlive',
    'clones_journal_x'                                    => 'Ta transakcija je kopija ":description" (#:id)',
    'go_to_categories'                                    => 'Na kategorije',
    'go_to_bills'                                         => 'Na svoje račune',
    'go_to_expense_accounts'                              => 'Oglej si račune stroškov',
    'go_to_revenue_accounts'                              => 'Oglej si račune prihodkov',
    'go_to_piggies'                                       => 'Na hranilnike',
-    'new_deposit'                                         => 'Nov polog',
+    'new_deposit'                                         => 'Nov priliv',
    'new_transfer'                                        => 'Nov prenos',
    'new_transfers'                                       => 'Nov prenos',
    'new_asset_account'                                   => 'Nov račun sredstev',
@ -161,8 +161,8 @@ return [
    'chart_account_in_period'                             => 'Grafikon vseh transakcij za račun ":name" (:balance) med :start in :end',
    'chart_category_in_period'                            => 'Grafikon vseh transakcij za kategorijo ":name" med :start in :end',
    'chart_category_all'                                  => 'Grafikon vseh transakcij za kategorijo ":name"',
-    'clone_withdrawal'                                    => 'Kloniraj ta dvig',
-    'clone_deposit'                                       => 'Kloniraj ta polog',
+    'clone_withdrawal'                                    => 'Kloniraj ta odliv',
+    'clone_deposit'                                       => 'Kloniraj ta priliv',
    'clone_transfer'                                      => 'Kloniraj ta prenos',
    'multi_select_no_selection'                           => 'Nič ni izbrano',
    'multi_select_select_all'                             => 'Izberi vse',
@ -1265,8 +1265,8 @@ return [
    'rule_action_switch_accounts_choice'                  => 'Zamenjajte izvorni in ciljni račun (samo prenosi!)',
    'rule_action_switch_accounts'                         => 'Zamenjava vira in cilja',
    'rule_action_set_notes'                               => 'Nastavi opombe na ":action_value"',
-    'rule_action_convert_deposit_choice'                  => 'Pretvori transakcijo v polog',
-    'rule_action_convert_deposit'                         => 'Pretvori transakcijo v polog iz ":action_value"',
+    'rule_action_convert_deposit_choice'                  => 'Pretvori transakcijo v priliv',
+    'rule_action_convert_deposit'                         => 'Pretvori transakcijo v priliv iz ":action_value"',
    'rule_action_convert_withdrawal_choice'               => 'Pretvori transakcijo v odliv',
    'rule_action_convert_withdrawal'                      => 'Pretvori transakcijo v odliv na ":action_value"',
    'rule_action_convert_transfer_choice'                 => 'Pretvori transakcijo v prenos',
@ -1286,7 +1286,7 @@ return [
    'rule_for_bill_title'                                 => 'Samodejno ustvarjeno pravilo za račun ":name"',
    'rule_for_bill_description'                           => 'To pravilo je samodejno ustvarjeno za poskus ujemanja računa ":name".',
    'create_rule_for_bill'                                => 'Ustvari novo pravilo za račun ":name"',
-    'create_rule_for_bill_txt'                            => 'Pravkar ste ustvarili nov račun z imenom ":name", čestitamo! Firefly III lahko samodejno poveže nove dvige s tem računom.  Na primer, kadar koli plačate najemnino, bo račun "najemnina" povezan s stroški.  Tako vam lahko Firefly III natančno pokaže, kateri računi so zapadli in kateri ne.  Če želite to narediti, je treba ustvariti novo pravilo.  Firefly III je za vas izpolnil nekaj smiselnih privzetih vrednosti.  Preverite, ali so pravilni.  Če so te vrednosti pravilne, Firefly III samodejno poveže pravilen dvig s pravilnim računom.  Preverite sprožilce, da vidite, ali so pravilni, in jih dodajte, če so napačni.',
+    'create_rule_for_bill_txt'                            => 'Pravkar ste ustvarili nov račun z imenom ":name", čestitamo! Firefly III lahko samodejno poveže nove odlive s tem računom. Na primer, kadar koli plačate najemnino, bo račun "najemnina" povezan s stroški. Tako vam lahko Firefly III natančno pokaže, kateri računi so zapadli in kateri ne. Če želite to narediti, je treba ustvariti novo pravilo. Firefly III je za vas izpolnil nekaj smiselnih privzetih vrednosti. Preverite, ali so pravilni. Če so te vrednosti pravilne, Firefly III samodejno poveže pravilen odliv s pravilnim računom. Preverite sprožilce, da vidite, ali so pravilni, in jih dodajte, če so napačni.',
    'new_rule_for_bill_title'                             => 'Pravilo za račun ":name"',
    'new_rule_for_bill_description'                       => 'To pravilo označuje transakcije za račun ":name".',

@ -1366,7 +1366,7 @@ return [
    'preferences_security'                                => 'Varnost',
    'preferences_layout'                                  => 'Postavitev',
    'preferences_notifications'                           => 'Obvestila',
-    'pref_home_show_deposits'                             => 'Pokaži depozite na začetni strani',
+    'pref_home_show_deposits'                             => 'Pokaži prilive na začetni strani',
    'pref_home_show_deposits_info'                        => 'Prva stran že prikazuje vaše račune stroškov. Ali naj prikazuje tudi račune prihodkov?',
    'pref_home_do_show_deposits'                          => 'Da, pokaži jih',
    'successful_count'                                    => 'od tega :count uspešno',
@ -1438,10 +1438,10 @@ return [
    'delete_all_revenue_accounts'                         => 'Izbriši VSE račune prihodkov',
    'delete_all_liabilities'                              => 'Izbriši VSE obveznosti',
    'delete_all_transactions'                             => 'Izbriši VSE transakcije',
-    'delete_all_withdrawals'                              => 'Izbriši VSE dvige',
-    'delete_all_deposits'                                 => 'Izbriši VSE pologe',
+    'delete_all_withdrawals'                              => 'Izbriši VSE odlive',
+    'delete_all_deposits'                                 => 'Izbriši VSE prilive',
    'delete_all_transfers'                                => 'Izbriši VSE prenose ',
-    'also_delete_transactions'                            => 'Brisanje računa bo pobrisalo tudi VSE povezane dvige, pologe in prenose!',
+    'also_delete_transactions'                            => 'Brisanje računa bo pobrisalo tudi VSE povezane odlive, prilive in prenose!',
    'deleted_all_budgets'                                 => 'Vsi proračuni so bili izbrisani',
    'deleted_all_categories'                              => 'Vse kategorije so bile izbrisane',
    'deleted_all_tags'                                    => 'Vse oznake so bile izbrisane',
@ -1455,8 +1455,8 @@ return [
    'deleted_all_revenue_accounts'                        => 'Vsi računi prihodkov so bili izbrisani',
    'deleted_all_liabilities'                             => 'Vse obveznosti so bile izbrisane',
    'deleted_all_transactions'                            => 'Vse transakcije so bile izbrisane',
-    'deleted_all_withdrawals'                             => 'Vsi dvigi so bili izbrisani',
-    'deleted_all_deposits'                                => 'Vsi depoziti so bili izbrisani',
+    'deleted_all_withdrawals'                             => 'Vsi odlivi so bili izbrisani',
+    'deleted_all_deposits'                                => 'Vsi prilivi so bili izbrisani',
    'deleted_all_transfers'                               => 'Vsi prenosi so bili izbrisani',
    'deleted_all_recurring'                               => 'Vse ponavljajoče se transakcije so bile izbrisane',
    'change_your_password'                                => 'Spremeni geslo',
@ -1532,8 +1532,8 @@ return [
    'profile_try_again'                                   => "Nekaj \u{200b}\u{200b}je šlo narobe. Prosim poskusite znova.",
    'amounts'                                             => 'Zneski',
    'multi_account_warning_unknown'                       => 'Odvisno od vrste transakcije, ki jo ustvarite, lahko izvorni in/ali ciljni račun poznejših razdelitev preglasi tisto, kar je definirano v prvi razdelitvi transakcije.',
-    'multi_account_warning_withdrawal'                    => 'Upoštevajte, da bo izvorni račun poznejših razdelitev preglasilo tisto, kar je definirano v prvi razdelitvi dviga.',
-    'multi_account_warning_deposit'                       => 'Upoštevajte, da bo ciljni račun poznejših delitev preglasilo tisto, kar je opredeljeno v prvi delitvi depozita.',
+    'multi_account_warning_withdrawal'                    => 'Upoštevajte, da bo izvorni račun poznejših razdelitev preglasilo tisto, kar je definirano v prvi razdelitvi odliva.',
+    'multi_account_warning_deposit'                       => 'Upoštevajte, da bo ciljni račun poznejših delitev preglasilo tisto, kar je opredeljeno v prvi delitvi priliva.',
    'multi_account_warning_transfer'                      => 'Upoštevajte, da bo izvorni + ciljni račun poznejših razdelitev preglasilo tisto, kar je definirano v prvi razdelitvi prenosa.',

    /*
@ -1581,48 +1581,48 @@ return [
    'fire_webhooks_checkbox'                              => 'Sprožite Webhooke',

    // convert stuff:
-    'convert_is_already_type_Withdrawal'                  => 'Ta transakcija je že dvig',
-    'convert_is_already_type_Deposit'                     => 'Ta transakcija je že polog',
+    'convert_is_already_type_Withdrawal'                  => 'Ta transakcija je že odliv',
+    'convert_is_already_type_Deposit'                     => 'Ta transakcija je že priliv',
    'convert_is_already_type_Transfer'                    => 'Ta transakcija je že prenos',
-    'convert_to_Withdrawal'                               => 'Pretvori ":description" v dvig',
-    'convert_to_Deposit'                                  => 'Pretvori ":description" v polog',
+    'convert_to_Withdrawal'                               => 'Pretvori ":description" v odliv',
+    'convert_to_Deposit'                                  => 'Pretvori ":description" v priliv',
    'convert_to_Transfer'                                 => 'Pretvori ":description" v prenos',
-    'convert_options_WithdrawalDeposit'                   => 'Pretvori dvig v polog',
-    'convert_options_WithdrawalTransfer'                  => 'Pretvori dvig v prenos',
-    'convert_options_DepositTransfer'                     => 'Pretvori polog v prenos',
-    'convert_options_DepositWithdrawal'                   => 'Pretvori polog v dvig',
-    'convert_options_TransferWithdrawal'                  => 'Pretvori prenos v dvig',
-    'convert_options_TransferDeposit'                     => 'Pretvori prenos v polog',
-    'convert_Withdrawal_to_deposit'                       => 'Pretvori ta dvig v polog',
+    'convert_options_WithdrawalDeposit'                   => 'Pretvori odliv v priliv',
+    'convert_options_WithdrawalTransfer'                  => 'Pretvori odliv v prenos',
+    'convert_options_DepositTransfer'                     => 'Pretvori priliv v prenos',
+    'convert_options_DepositWithdrawal'                   => 'Pretvori polog v odliv',
+    'convert_options_TransferWithdrawal'                  => 'Pretvori prenos v odliv',
+    'convert_options_TransferDeposit'                     => 'Pretvori prenos v priliv',
+    'convert_Withdrawal_to_deposit'                       => 'Pretvori ta odliv v priliv',
    'convert_Withdrawal_to_transfer'                      => 'Pretvori ta dvig v prenos',
-    'convert_Deposit_to_withdrawal'                       => 'Pretvori ta polog v dvig',
-    'convert_Deposit_to_transfer'                         => 'Pretvori ta polog v prenos',
-    'convert_Transfer_to_deposit'                         => 'Pretvori ta prenos v polog',
-    'convert_Transfer_to_withdrawal'                      => 'Pretvori ta prenos v dvig',
+    'convert_Deposit_to_withdrawal'                       => 'Pretvori ta priliv v odliv',
+    'convert_Deposit_to_transfer'                         => 'Pretvori ta priliv v prenos',
+    'convert_Transfer_to_deposit'                         => 'Pretvori ta prenos v priliv',
+    'convert_Transfer_to_withdrawal'                      => 'Pretvori ta prenos v odliv',
    'convert_please_set_revenue_source'                   => 'Izberite račun prihodkov iz katerega boste prenesli denar.',
    'convert_please_set_asset_destination'                => 'Izberite račun sredstev na katerega boste prenesli denar.',
    'convert_please_set_expense_destination'              => 'Izberite na kateri račun stroškov bo šel denar.',
    'convert_please_set_asset_source'                     => 'Izberite račun sredstev iz katerega boste prenesli denar.',
-    'convert_expl_w_d'                                    => 'Pri pretvorbi iz dviga v depozit bo denar položen na prikazani ciljni račun, namesto da bi bil dvignjen z njega.|Pri pretvorbi iz dviga v depozit bo denar položen na prikazane ciljne račune, namesto da se od njih umika.',
-    'convert_expl_w_t'                                    => 'Pri pretvorbi dviga v prenos bo denar prenesen stran od izvornega računa na drug račun sredstev ali obveznosti, namesto da bi bil porabljen na prvotnem računu stroškov.|Pri pretvarjanju dviga v prenos bo denar prenesen stran od izvorni računi na druge račune sredstev ali obveznosti, namesto da bi bili porabljeni na prvotnih računih odhodkov.',
-    'convert_expl_d_w'                                    => 'Pri pretvorbi depozita v dvig, bo denar dvignjen s prikazanega izvornega računa, namesto da bi bil položen nanj.|Pri pretvorbi depozita v dvig, bo denar dvignjen s prikazanih izvornih računov, namesto da bi bil položen. vanje.',
-    'convert_expl_d_t'                                    => 'Ko pretvorite depozit v prenos, bo denar položen na navedeni ciljni račun s katerega koli računa sredstev ali obveznosti.|Ko pretvorite depozit v prenos, bo denar položen na navedene ciljne račune s katerega koli vaših računov sredstev ali obveznosti.',
-    'convert_expl_t_w'                                    => 'Ko pretvorite nakazilo v dvig, bo denar porabljen na ciljnem računu, ki ga nastavite tukaj, namesto da bi bil prenesen stran.|Ko pretvorite prenos v dvig, bo denar porabljen na ciljnih računih, ki ste jih nastavili tukaj , namesto da bi bil premeščen.',
-    'convert_expl_t_d'                                    => 'Ko pretvorite nakazilo v polog, bo denar položen na ciljni račun, ki ga vidite tukaj, namesto da bi bil nakazan vanj.|Ko pretvorite nakazilo v polog, bo denar položen na ciljne račune, ki jih vidite tukaj, namesto da bi bil prenesen vanje.',
+    'convert_expl_w_d'                                    => 'Pri pretvorbi iz odliva v priliv bo denar položen na prikazani ciljni račun, namesto da bi bil dvignjen z njega.|Pri pretvorbi iz odliva v priliv bo denar položen na prikazane ciljne račune, namesto da se od njih umika.',
+    'convert_expl_w_t'                                    => 'Pri pretvorbi odliva v prenos bo denar prenesen stran od izvornega računa na drug račun sredstev ali obveznosti, namesto da bi bil porabljen na prvotnem računu stroškov.|Pri pretvarjanju odliva v prenos bo denar prenesen stran od izvornega računa na druge račune sredstev ali obveznosti, namesto da bi bili porabljeni na prvotnih računih odhodkov.',
+    'convert_expl_d_w'                                    => 'Pri pretvorbi priliva v odliv, bo denar dvignjen s prikazanega izvornega računa, namesto da bi bil položen nanj.|Pri pretvorbi priliva v odliv, bo denar dvignjen s prikazanih izvornih računov, namesto da bi bil položen nanje.',
+    'convert_expl_d_t'                                    => 'Ko pretvorite priliv v prenos, bo denar položen na navedeni ciljni račun s katerega koli računa sredstev ali obveznosti.|Ko pretvorite priliv v prenos, bo denar položen na navedene ciljne račune s katerega koli vaših računov sredstev ali obveznosti.',
+    'convert_expl_t_w'                                    => 'Ko pretvorite nakazilo v odliv, bo denar porabljen na ciljnem računu, ki ga nastavite tukaj, namesto da bi bil prenesen stran.|Ko pretvorite prenos v odliv, bo denar porabljen na ciljnih računih, ki ste jih nastavili tukaj, namesto da bi bil premeščen.',
+    'convert_expl_t_d'                                    => 'Ko pretvorite nakazilo v priliv, bo denar položen na ciljni račun, ki ga vidite tukaj, namesto da bi bil nakazan vanj.|Ko pretvorite nakazilo v priliv, bo denar položen na ciljne račune, ki jih vidite tukaj, namesto da bi bil prenesen vanje.',
    'convert_select_sources'                              => 'Če želite dokončati pretvorbo, nastavite nov izvorni račun spodaj.|Za dokončanje pretvorbe nastavite nove izvorne račune spodaj.',
    'convert_select_destinations'                         => 'Za dokončanje konverzije spodaj izberite nov ciljni račun.|Za dokončanje konverzije spodaj izberite nove ciljne račune.',
-    'converted_to_Withdrawal'                             => 'Transakcija je bila pretvorjena v dvig',
-    'converted_to_Deposit'                                => 'Transakcija je bila pretvorjena v polog',
+    'converted_to_Withdrawal'                             => 'Transakcija je bila pretvorjena v odliv',
+    'converted_to_Deposit'                                => 'Transakcija je bila pretvorjena v priliv',
    'converted_to_Transfer'                               => 'Transakcija je bila pretvorjena v prenos',
    'invalid_convert_selection'                           => 'Račun, ki ste ga izbrali, je v tej transakciji že uporabljen ali pa ne obstaja.',
    'source_or_dest_invalid'                              => 'Ne najdem pravilnih podrobnosti o transakciji. Pretvorba ni mogoča.',
-    'convert_to_withdrawal'                               => 'Pretvori v dvig',
-    'convert_to_deposit'                                  => 'Pretvori v polog',
+    'convert_to_withdrawal'                               => 'Pretvori v odliv',
+    'convert_to_deposit'                                  => 'Pretvori v priliv',
    'convert_to_transfer'                                 => 'Pretvori v prenos',

    // create new stuff:
-    'create_new_withdrawal'                               => 'Ustvari nov dvig',
-    'create_new_deposit'                                  => 'Ustvari nov polog',
+    'create_new_withdrawal'                               => 'Ustvari nov odliv',
+    'create_new_deposit'                                  => 'Ustvari nov priliv',
    'create_new_transfer'                                 => 'Ustvari nov prenos',
    'create_new_asset'                                    => 'Ustvari nov račun sredstev',
    'create_new_liabilities'                              => 'Ustvari novo obveznost',
@ -1952,28 +1952,28 @@ return [

    // transactions:
    'wait_loading_transaction'                            => 'Počakajte, da se obrazec naloži',
-    'wait_loading_data'                                   => 'Please wait for your information to load...',
+    'wait_loading_data'                                   => 'Počakajte, da se vaši podatki naložijo...',
    'wait_attachments'                                    => 'Počakajte, da se priloge naložijo.',
    'errors_upload'                                       => 'Nalaganje ni uspelo. Preverite, ali je v konzoli brskalnika prišlo do napake.',
    'amount_foreign_if'                                   => 'Znesek v tuji valuti, če obstaja',
    'amount_destination_account'                          => 'Znesek v valuti ciljnega računa',
    'edit_transaction_title'                              => 'Uredi transakcijo ":description"',
    'unreconcile'                                         => 'Razveljavi uskladitev',
-    'update_withdrawal'                                   => 'Posodobi dvig',
-    'update_deposit'                                      => 'Posodobi polog',
+    'update_withdrawal'                                   => 'Posodobi odliv',
+    'update_deposit'                                      => 'Posodobi priliv',
    'update_transaction'                                  => 'Posodobi transakcije',
    'update_transfer'                                     => 'Posodobi prenos',
-    'updated_withdrawal'                                  => 'Dvig ":description" je posodobljen',
-    'updated_deposit'                                     => 'Polog ":description" je posodobljen',
+    'updated_withdrawal'                                  => 'Odliv ":description" je posodobljen',
+    'updated_deposit'                                     => 'Priliv ":description" je posodobljen',
    'updated_transfer'                                    => 'Prenos ":description" je posodobljen',
-    'no_changes_withdrawal'                               => 'Dvig ":description" ni bil spremenjen.',
-    'no_changes_deposit'                                  => 'Depozit ":description" ni bil spremenjen.',
+    'no_changes_withdrawal'                               => 'Odliv ":description" ni bil spremenjen.',
+    'no_changes_deposit'                                  => 'Priliv ":description" ni bil spremenjen.',
    'no_changes_transfer'                                 => 'Prenos ":description" ni bil spremenjen.',
-    'delete_withdrawal'                                   => 'Dvig ":description" je izbrisan',
-    'delete_deposit'                                      => 'Izbriši polog ":description"',
+    'delete_withdrawal'                                   => 'Odliv ":description" je izbrisan',
+    'delete_deposit'                                      => 'Izbriši priliv ":description"',
    'delete_transfer'                                     => 'Izbriši prenos ":description"',
-    'deleted_withdrawal'                                  => 'Dvig ":description" je uspešno izbrisan',
-    'deleted_deposit'                                     => 'Polog ":description" je uspešno izbrisan',
+    'deleted_withdrawal'                                  => 'Odliv ":description" je uspešno izbrisan',
+    'deleted_deposit'                                     => 'Priliv ":description" je uspešno izbrisan',
    'deleted_transfer'                                    => 'Prenos ":description" je uspešno izbrisan',
    'deleted_reconciliation'                              => 'Transakcija usklajevanja ":description" je bila uspešno izbrisana',
    'stored_journal'                                      => 'Nova transakcija ":description" je uspešno ustvarjena',
@ -2084,11 +2084,11 @@ return [
    'budgetsAndSpending'                                  => 'Proračuni in poraba',
    'budgets_and_spending'                                => 'Proračuni in poraba',
    'go_to_budget'                                        => 'Pojdi na proračun "{budget}"',
-    'go_to_deposits'                                      => 'Pojdi na depozite',
+    'go_to_deposits'                                      => 'Pojdi na prilive',
    'go_to_expenses'                                      => 'Pojdi na izdatke',
    'savings'                                             => 'Prihranki',
    'newWithdrawal'                                       => 'Nov strošek',
-    'newDeposit'                                          => 'Nov polog',
+    'newDeposit'                                          => 'Nov priliv',
    'newTransfer'                                         => 'Nov prenos',
    'bills_to_pay'                                        => 'Računi za plačilo',
    'per_day'                                             => 'Na dan',
@ -2155,13 +2155,13 @@ return [
    'piggy_banks'                                         => 'Hranilniki',
    'amount_x_of_y'                                       => '{current} od {total}',
    'bills'                                               => 'Računi',
-    'withdrawal'                                          => 'Dvig',
+    'withdrawal'                                          => 'Odliv',
    'opening_balance'                                     => 'Začetno stanje',
-    'deposit'                                             => 'Polog',
+    'deposit'                                             => 'Priliv',
    'account'                                             => 'Račun',
    'transfer'                                            => 'Prenos',
-    'Withdrawal'                                          => 'Dvig',
-    'Deposit'                                             => 'Polog',
+    'Withdrawal'                                          => 'Odliv',
+    'Deposit'                                             => 'Priliv',
    'Transfer'                                            => 'Prenos',
    'bill'                                                => 'Račun',
    'yes'                                                 => 'Da',
@ -2478,8 +2478,8 @@ return [
    'split_transaction_title_help'                        => 'Če ustvarite razdeljeno transakcijo, mora obstajati globalni opis za vse razdelitve transakcije.',
    'split_title_help'                                    => 'Če ustvarite razdeljeno transakcijo, mora obstajati globalni opis za vse dele transakcije.',
    'you_create_transfer'                                 => 'Ustvarjate prenos.',
-    'you_create_withdrawal'                               => 'Ustvarjate dvig.',
-    'you_create_deposit'                                  => 'Ustvari depozit.',
+    'you_create_withdrawal'                               => 'Ustvarjate odliv.',
+    'you_create_deposit'                                  => 'Ustvarjaš priliv.',

    // links
    'journal_link_configuration'                          => 'Nastavitev povezav transakcije',
@ -2510,8 +2510,8 @@ return [
    'journals_error_linked'                               => 'Te transakcije so že povezane.',
    'journals_link_to_self'                               => 'Transakcije ni mogoče povezati samo nase',
    'journal_links'                                       => 'Povezave transakcije',
-    'this_withdrawal'                                     => 'Ta dvig',
-    'this_deposit'                                        => 'Ta polog',
+    'this_withdrawal'                                     => 'Ta odliv',
+    'this_deposit'                                        => 'Ta priliv',
    'this_transfer'                                       => 'Ta prenos',
    'overview_for_link'                                   => 'Pregled vrste povezav ":name"',
    'source_transaction'                                  => 'Izvorna transakcija',
@ -2603,7 +2603,7 @@ return [
    'no_transactions_title_deposit'                       => 'Ustvarimo nov prihodek!',
    'no_transactions_intro_deposit'                       => 'Prihodkov še nimate. Za upravljanje vaših financ morate začeti beležiti prihodke.',
    'no_transactions_imperative_deposit'                  => 'Ste dobil nekaj denarja? Potem pa to vnesite:',
-    'no_transactions_create_deposit'                      => 'Ustvari polog',
+    'no_transactions_create_deposit'                      => 'Ustvari priliv',
    'no_transactions_title_transfers'                     => 'Ustvarimo nov prenos!',
    'no_transactions_intro_transfers'                     => 'Nimate še nobenih prenosov. Če prenašate denar med računi sredstev, se to zabeleži kot prenos.',
    'no_transactions_imperative_transfers'                => 'Ste že premikali denar naokoli? Potem pa to vnesite:',
@ -2638,11 +2638,11 @@ return [
    'overview_for_recurrence'                             => 'Pregled ponavljajočih se transakcij ":title"',
    'warning_duplicates_repetitions'                      => 'V redkih primerih se datumi na tem seznamu pojavijo dvakrat. To se lahko zgodi, če pride do večkratnih ponovitev. Firefly III bo vedno ustvaril eno transakcijo na dan.',
    'created_transactions'                                => 'Sorodne transakcije',
-    'expected_withdrawals'                                => 'Pričakovani dvigi',
-    'expected_deposits'                                   => 'Pričakovani pologi',
+    'expected_withdrawals'                                => 'Pričakovani odlivi',
+    'expected_deposits'                                   => 'Pričakovani prilivi',
    'expected_transfers'                                  => 'Pričakovani prenosi',
-    'created_withdrawals'                                 => 'Ustvarjeni dvigi',
-    'created_deposits'                                    => 'Ustvarjeni pologi',
+    'created_withdrawals'                                 => 'Ustvarjeni odlivi',
+    'created_deposits'                                    => 'Ustvarjeni prilivi',
    'created_transfers'                                   => 'Ustvarjeno prenosi',
    'recurring_info'                                      => 'Ponavljajoča se transakcija :count / :total',
    'created_from_recurrence'                             => 'Ustvarjeno iz ponavljajoče se transakcije ":title" (#:id)',
--- a/resources/lang/sl_SI/form.php
+++ b/resources/lang/sl_SI/form.php
@ -109,8 +109,8 @@ return [
    'interest_period'             => 'Obdobje obresti',
    'extension_date'              => 'Datum razširitve',
    'type'                        => 'Vrsta',
-    'convert_Withdrawal'          => 'Pretvori dvig',
-    'convert_Deposit'             => 'Pretvori polog',
+    'convert_Withdrawal'          => 'Pretvori odliv',
+    'convert_Deposit'             => 'Pretvori priliv',
    'convert_Transfer'            => 'Pretvori prenos',
    'amount'                      => 'Znesek',
    'foreign_amount'              => 'Tuj znesek',
--- a/resources/lang/sl_SI/intro.php
+++ b/resources/lang/sl_SI/intro.php
@ -102,8 +102,8 @@ return [
    // create transaction
    'transactions_create_switch_box'                          => 'Uporabite te gumbe za hitri prekop med tipi transakcij, ki jih želite shraniti.',
    'transactions_create_ffInput_category'                    => 'V to polje lahko prosto pišete. Predhodno ustvarjene kategorije bodo samodejno predlagane.',
-    'transactions_create_withdrawal_ffInput_budget'           => 'Povežite svoj dvig s proračunom za boljši finančni nadzor.',
-    'transactions_create_withdrawal_currency_dropdown_amount' => 'Uporabite ta spustni meni, ko je vaš dvig v drugi valuti.',
+    'transactions_create_withdrawal_ffInput_budget'           => 'Povežite svoj odliv s proračunom za boljši finančni nadzor.',
+    'transactions_create_withdrawal_currency_dropdown_amount' => 'Uporabite ta spustni meni, ko je vaš odliv v drugi valuti.',
    'transactions_create_deposit_currency_dropdown_amount'    => 'Uporabite ta spustni meni, ko je vaš depozit v drugi valuti.',
    'transactions_create_transfer_ffInput_piggy_bank_id'      => 'Izberite hranilnik in to nakazilo povežite s svojimi prihranki.',

--- a/resources/lang/sl_SI/list.php
+++ b/resources/lang/sl_SI/list.php
@ -97,8 +97,8 @@ return [
    'budget'                  => 'Proračun',
    'category'                => 'Kategorija',
    'bill'                    => 'Račun',
-    'withdrawal'              => 'Dvig',
-    'deposit'                 => 'Prihodek',
+    'withdrawal'              => 'Odliv',
+    'deposit'                 => 'Priliv',
    'transfer'                => 'Prenos',
    'type'                    => 'Vrsta',
    'completed'               => 'Dokončano',
@ -128,7 +128,7 @@ return [
    'total_amount'            => 'Skupni znesek',
    'sum'                     => 'Vsota',
    'sum_excluding_transfers' => 'Vsota (brez prenosov)',
-    'sum_withdrawals'         => 'Vsota dvigov',
+    'sum_withdrawals'         => 'Vsota odlivov',
    'sum_deposits'            => 'Vsota prilivov',
    'sum_transfers'           => 'Vsota prenosov',
    'sum_reconciliations'     => 'Vsota uskladitev',
--- a/resources/lang/sl_SI/rules.php
+++ b/resources/lang/sl_SI/rules.php
@ -35,15 +35,15 @@ return [
    'journal_already_no_notes'                    => 'Ta transakcija ni imela opomb, zato jih ni mogoče odstraniti',
    'journal_not_found'                           => 'Firefly III ne najde zahtevane transakcije',
    'split_group'                                 => 'Firefly III ne more izvesti tega dejanja na transakciji z več razdelitvami',
-    'is_already_withdrawal'                       => 'Ta transakcija je že dvig',
-    'is_already_deposit'                          => 'Ta transakcija je že depozit',
+    'is_already_withdrawal'                       => 'Ta transakcija je že odliv',
+    'is_already_deposit'                          => 'Ta transakcija je že priliv',
    'is_already_transfer'                         => 'Ta transakcija je že prenos',
    'is_not_transfer'                             => 'Ta transakcija ni prenos',
    'complex_error'                               => "Nekaj \u{200b}\u{200b}zapletenega je šlo narobe. Oprostite za to. Prosimo, preglejte dnevnike Firefly III",
    'no_valid_opposing'                           => 'Pretvorba ni uspela, ker ni veljavnega računa z imenom ":account"',
    'new_notes_empty'                             => 'Opombe, ki jih želite nastaviti, so prazne',
-    'unsupported_transaction_type_withdrawal'     => 'Firefly III ne more pretvoriti ":type" v dvig',
-    'unsupported_transaction_type_deposit'        => 'Firefly III ne more pretvoriti ":type" v depozit',
+    'unsupported_transaction_type_withdrawal'     => 'Firefly III ne more pretvoriti ":type" v odliv',
+    'unsupported_transaction_type_deposit'        => 'Firefly III ne more pretvoriti ":type" v priliv',
    'unsupported_transaction_type_transfer'       => 'Firefly III ne more pretvoriti ":type" v prenos',
    'already_has_source_asset'                    => 'Ta transakcija že ima ":name" kot izvorni račun sredstva',
    'already_has_destination_asset'               => 'Ta transakcija že ima »:name« kot ciljni račun sredstev',
@ -55,8 +55,8 @@ return [
    'cannot_find_subscription'                    => 'Firefly III ne najde naročnine ":name"',
    'no_notes_to_move'                            => 'Transakcija nima nobenih opomb, ki bi jih bilo treba premakniti v polje opisa',
    'no_tags_to_remove'                           => 'Transakcija nima oznak za odstranitev',
-    'not_withdrawal'                              => 'Transakcija ni dvig',
-    'not_deposit'                                 => 'Transakcija ni depozit',
+    'not_withdrawal'                              => 'Transakcija ni odliv',
+    'not_deposit'                                 => 'Transakcija ni priliv',
    'cannot_find_tag'                             => 'Firefly III ne najde oznake ":tag"',
    'cannot_find_asset'                           => 'Firefly III ne najde računa sredstev ":name"',
    'cannot_find_accounts'                        => 'Firefly III ne najde izvornega ali ciljnega računa',
--- a/resources/lang/sl_SI/validation.php
+++ b/resources/lang/sl_SI/validation.php
@ -243,8 +243,8 @@ return [
    'withdrawal_dest_need_data'       => '[a] Za nadaljevanje potrebujete veljaven ID ciljnega računa in/ali veljavno ime ciljnega računa.',
    'withdrawal_dest_bad_data'        => 'Pri iskanju ID-ja ":id" ali imena ":name" ni bilo mogoče najti veljavnega ciljnega računa.',

-    'withdrawal_dest_iban_exists'     => 'Ta IBAN ciljnega računa že uporablja račun sredstev ali obveznosti in ga ni mogoče uporabiti kot cilj dviga.',
-    'deposit_src_iban_exists'         => 'Ta izvorni račun IBAN že uporablja račun sredstev ali obveznosti in ga ni mogoče uporabiti kot vir depozita.',
+    'withdrawal_dest_iban_exists'     => 'Ta IBAN ciljnega računa že uporablja račun sredstev ali obveznosti in ga ni mogoče uporabiti kot cilj odliva.',
+    'deposit_src_iban_exists'         => 'Ta izvorni račun IBAN že uporablja račun sredstev ali obveznosti in ga ni mogoče uporabiti kot vir priliva.',

    'reconciliation_source_bad_data'  => 'Pri iskanju ID-ja ":id" ali imena ":name" ni bilo mogoče najti veljavnega računa za usklajevanje.',

--- a/resources/lang/zh_TW/email.php
+++ b/resources/lang/zh_TW/email.php
@ -56,39 +56,39 @@ return [
 */

    // invite
-    'invitation_created_subject'              => 'An invitation has been created',
-    'invitation_created_body'                 => 'Admin user ":email" created a user invitation which can be used by whoever is behind email address ":invitee". The invite will be valid for 48hrs.',
-    'invite_user_subject'                     => 'You\'ve been invited to create a Firefly III account.',
-    'invitation_introduction'                 => 'You\'ve been invited to create a Firefly III account on **:host**. Firefly III  is a personal, self-hosted, private personal finance manager. All the cool kids are using it.',
-    'invitation_invited_by'                   => 'You\'ve been invited by ":admin" and this invitation was sent to ":invitee". That\'s you, right?',
-    'invitation_url'                          => 'The invitation is valid for 48 hours and can be redeemed by surfing to [Firefly III](:url). Enjoy!',
+    'invitation_created_subject'              => '已建立邀請',
+    'invitation_created_body'                 => '管理員 ":email" 已透過電郵 ":invitee" 邀請用戶建立一個新的帳戶。該邀請有效期為48小時。',
+    'invite_user_subject'                     => '你已被邀請建立Firefly III 帳戶',
+    'invitation_introduction'                 => '你已經被邀請在 **:host** 建立一個Firefly III 帳戶。 Firefly III 是一個私隱、自架、個人的財富管理。',
+    'invitation_invited_by'                   => '你已被:admin 邀請，而該邀請已發送到:invitee',
+    'invitation_url'                          => '此邀請有效期為48 小時，並可在 [Firefly III](:url) 兌換。祝您使用愉快！',

    // new IP
    'login_from_new_ip'                       => '自 Firefly III 的新登入',
-    'slack_login_from_new_ip'                 => 'New Firefly III login from IP :ip (:host)',
+    'slack_login_from_new_ip'                 => '從 IP :ip (:host) 新的 Firefly III 登入',
    'new_ip_body'                             => 'Firefly III 監測到未知 IP 位址在您帳號的1筆新登入訊息，若您未曾使用下列 IP 位址，或是使用該位址登入已超過6個月餘，Firefly III 會警示您。',
-    'new_ip_warning'                          => 'If you recognize this IP address or the login, you can ignore this message. If you didn\'t login, of if you have no idea what this is about, verify your password security, change it, and log out all other sessions. To do this, go to your profile page. Of course you have 2FA enabled already, right? Stay safe!',
-    'ip_address'                              => 'IP address',
-    'host_name'                               => 'Host',
-    'date_time'                               => 'Date + time',
+    'new_ip_warning'                          => '如果你知道這個IP 地址或登入紀錄，你可以無視這個訊息。如果你沒有登入或不知道在發生什麼事，請到你的個人資料頁面，確認你的密碼強度、更改密碼並登出所有其他登入階段。我們強烈建議你啟用多重要素驗證以確保你的資料安全。',
+    'ip_address'                              => 'IP 地址',
+    'host_name'                               => '主機',
+    'date_time'                               => '日期和時間',

    // access token created
-    'access_token_created_subject'            => 'A new access token was created',
-    'access_token_created_body'               => 'Somebody (hopefully you) just created a new Firefly III API Access Token for your user account.',
-    'access_token_created_explanation'        => 'With this token, they can access **all** of your financial records through the Firefly III API.',
-    'access_token_created_revoke'             => 'If this wasn\'t you, please revoke this token as soon as possible at :url',
+    'access_token_created_subject'            => '已建立新的存取權杖',
+    'access_token_created_body'               => '有人（希望是你）剛剛在你的Firefly III 帳戶中建立了新的 Firefly III API 存取權杖。',
+    'access_token_created_explanation'        => '你可以利用這個權杖透過Firefly 應用程式介面(API) 存取你**所有**的財務紀錄',
+    'access_token_created_revoke'             => '如果你沒有建立權杖，請盡快到 :url 撤銷權杖。',

    // registered
-    'registered_subject'                      => 'Welcome to Firefly III!',
-    'registered_subject_admin'                => 'A new user has registered',
-    'admin_new_user_registered'               => 'A new user has registered. User **:email** was given user ID #:id.',
-    'registered_welcome'                      => 'Welcome to [Firefly III](:address). Your registration has made it, and this email is here to confirm it. Yay!',
-    'registered_pw'                           => 'If you have forgotten your password already, please reset it using [the password reset tool](:address/password/reset).',
-    'registered_help'                         => 'There is a help-icon in the top right corner of each page. If you need help, click it!',
-    'registered_closing'                      => 'Enjoy!',
-    'registered_firefly_iii_link'             => 'Firefly III:',
-    'registered_pw_reset_link'                => 'Password reset:',
-    'registered_doc_link'                     => 'Documentation:',
+    'registered_subject'                      => '歡迎使用 Firefly III！',
+    'registered_subject_admin'                => '一名新用戶已經註冊',
+    'admin_new_user_registered'               => '一名新用戶已經註冊。用戶 **:email** 的ID為 #:id',
+    'registered_welcome'                      => '歡迎使用 [Firefly III](:address)！此電郵用於確認你已經成功註冊！',
+    'registered_pw'                           => '如果你忘記了你的密碼，請使用[密碼重設工具](:address/password/reset)重設你的密碼。',
+    'registered_help'                         => '求助按鈕在畫面的右上方。如需協助時，請按一下按鈕。',
+    'registered_closing'                      => '祝您使用愉快！',
+    'registered_firefly_iii_link'             => 'Firefly III：',
+    'registered_pw_reset_link'                => '重置密碼：',
+    'registered_doc_link'                     => '說明文件：',

    /*
 * PLEASE DO NOT EDIT THIS FILE DIRECTLY.
@ -102,48 +102,48 @@ return [
 */

    // new version
-    'new_version_email_subject'               => 'A new Firefly III version is available',
+    'new_version_email_subject'               => '有新的Firefly III 版本',

    // email change
-    'email_change_subject'                    => 'Your Firefly III email address has changed',
-    'email_change_body_to_new'                => 'You or somebody with access to your Firefly III account has changed your email address. If you did not expect this message, please ignore and delete it.',
-    'email_change_body_to_old'                => 'You or somebody with access to your Firefly III account has changed your email address. If you did not expect this to happen, you **must** follow the "undo"-link below to protect your account!',
-    'email_change_ignore'                     => 'If you initiated this change, you may safely ignore this message.',
-    'email_change_old'                        => 'The old email address was: :email',
-    'email_change_old_strong'                 => 'The old email address was: **:email**',
-    'email_change_new'                        => 'The new email address is: :email',
-    'email_change_new_strong'                 => 'The new email address is: **:email**',
-    'email_change_instructions'               => 'You cannot use Firefly III until you confirm this change. Please follow the link below to do so.',
-    'email_change_undo_link'                  => 'To undo the change, follow this link:',
+    'email_change_subject'                    => '你的Firefly III 電郵地址已被更變',
+    'email_change_body_to_new'                => '你或其他人在你的 Firefly III 帳戶更改了你的電郵地址。如果你沒有提出該請求，請無視並刪除此電郵。',
+    'email_change_body_to_old'                => '你或其他人於你的 Firefly III 帳戶更改你的電郵你的電郵地址。如果這不是你，你**必須**使用以下的「撤消」連結保護你的帳戶！',
+    'email_change_ignore'                     => '如果你提出了這項更變，你可以無視這段訊息。',
+    'email_change_old'                        => '舊的電郵地址為：:email',
+    'email_change_old_strong'                 => '舊的電郵地址為：**:email**',
+    'email_change_new'                        => '新的電郵地址為：**:email**',
+    'email_change_new_strong'                 => '新的電郵地址為：**:email**',
+    'email_change_instructions'               => '在確認這項更變前你不能使用你的Firefly III 帳戶。請使用以下連結確認。',
+    'email_change_undo_link'                  => '如要重設這個變更，請使用以下連結：',

    // OAuth token created
-    'oauth_created_subject'                   => 'A new OAuth client has been created',
-    'oauth_created_body'                      => 'Somebody (hopefully you) just created a new Firefly III API OAuth Client for your user account. It\'s labeled ":name" and has callback URL `:url`.',
-    'oauth_created_explanation'               => 'With this client, they can access **all** of your financial records through the Firefly III API.',
-    'oauth_created_undo'                      => 'If this wasn\'t you, please revoke this client as soon as possible at `:url`',
+    'oauth_created_subject'                   => '已建立新的 OAuth 客戶端',
+    'oauth_created_body'                      => '有人 (希望是你) 剛剛在你的 Firefly III 帳戶建立了新的 Firefly III API OAuth 客戶端。該標籤為 ":name"、回調連結為 `:url`。',
+    'oauth_created_explanation'               => '你可以利用這個客戶端透過Firefly 應用程式介面(API) 存取你**所有**的財務紀錄',
+    'oauth_created_undo'                      => '如果這不是你，請盡快在 `:url` 撤消這個客戶端',

    // reset password
-    'reset_pw_subject'                        => 'Your password reset request',
-    'reset_pw_instructions'                   => 'Somebody tried to reset your password. If it was you, please follow the link below to do so.',
-    'reset_pw_warning'                        => '**PLEASE** verify that the link actually goes to the Firefly III you expect it to go!',
+    'reset_pw_subject'                        => '你的密碼重設請求',
+    'reset_pw_instructions'                   => '有人嘗試重設你的密碼。如果你發送到重設請求，請透過以下連結繼續：',
+    'reset_pw_warning'                        => '請**確認該連結**為你所想造訪的Firefly III 站台！',

    // error
-    'error_subject'                           => 'Caught an error in Firefly III',
-    'error_intro'                             => 'Firefly III v:version ran into an error: <span style="font-family: monospace;">:errorMessage</span>.',
-    'error_type'                              => 'The error was of type ":class".',
-    'error_timestamp'                         => 'The error occurred on/at: :time.',
-    'error_location'                          => 'This error occurred in file "<span style="font-family: monospace;">:file</span>" on line :line with code :code.',
-    'error_user'                              => 'The error was encountered by user #:id, <a href="mailto::email">:email</a>.',
-    'error_no_user'                           => 'There was no user logged in for this error or no user was detected.',
-    'error_ip'                                => 'The IP address related to this error is: :ip',
-    'error_url'                               => 'URL is: :url',
-    'error_user_agent'                        => 'User agent: :userAgent',
+    'error_subject'                           => '偵測到Firefly III 發生錯誤',
+    'error_intro'                             => 'Firefly III v:version 發生了錯誤：<span style="font-family: monospace;">:errorMessage</span>.',
+    'error_type'                              => '錯誤類別為 ":class"',
+    'error_timestamp'                         => '錯誤發生在 :time',
+    'error_location'                          => '該錯誤發生在檔案 "<span style="font-family: monospace;">:file</span>" 於第 :line 行；代碼為 :code.',
+    'error_user'                              => '用戶#:id, <a href="mailto::email">:email</a> 遭遇了該錯誤',
+    'error_no_user'                           => '在錯誤發生時，未偵測到有用戶在登入',
+    'error_ip'                                => '有關該錯誤的IP 地址: :ip',
+    'error_url'                               => '連結為 :url',
+    'error_user_agent'                        => '使用者代理： :userAgent',
    'error_stacktrace'                        => 'The full stacktrace is below. If you think this is a bug in Firefly III, you can forward this message to <a href="mailto:james@firefly-iii.org?subject=BUG!">james@firefly-iii.org</a>. This can help fix the bug you just encountered.',
-    'error_github_html'                       => 'If you prefer, you can also open a new issue on <a href="https://github.com/firefly-iii/firefly-iii/issues">GitHub</a>.',
-    'error_github_text'                       => 'If you prefer, you can also open a new issue on https://github.com/firefly-iii/firefly-iii/issues.',
+    'error_github_html'                       => '你亦可以在<a href="https://github.com/firefly-iii/firefly-iii/issues">GitHub</a> 建立新的問題 (issue)。',
+    'error_github_text'                       => '你亦可以在 https://github.com/firefly-iii/firefly-iii/issues 建立新的問題 (issue)。',
    'error_stacktrace_below'                  => 'The full stacktrace is below:',
-    'error_headers'                           => 'The following headers may also be relevant:',
-    'error_post'                              => 'This was submitted by the user:',
+    'error_headers'                           => '有關的HTTP頭欄位如下：',
+    'error_post'                              => '提交此的用戶:',

    /*
 * PLEASE DO NOT EDIT THIS FILE DIRECTLY.
@ -157,19 +157,19 @@ return [
 */

    // report new journals
-    'new_journals_subject'                    => 'Firefly III has created a new transaction|Firefly III has created :count new transactions',
+    'new_journals_subject'                    => 'Firefly III 已建立了一項新的交易|Firefly III 已建立了 :count項新的交易',
    'new_journals_header'                     => 'Firefly III has created a transaction for you. You can find it in your Firefly III installation:|Firefly III has created :count transactions for you. You can find them in your Firefly III installation:',

    // bill warning
-    'bill_warning_subject_end_date'           => 'Your bill ":name" is due to end in :diff days',
-    'bill_warning_subject_now_end_date'       => 'Your bill ":name" is due to end TODAY',
-    'bill_warning_subject_extension_date'     => 'Your bill ":name" is due to be extended or cancelled in :diff days',
-    'bill_warning_subject_now_extension_date' => 'Your bill ":name" is due to be extended or cancelled TODAY',
-    'bill_warning_end_date'                   => 'Your bill **":name"** is due to end on :date. This moment will pass in about **:diff days**.',
-    'bill_warning_extension_date'             => 'Your bill **":name"** is due to be extended or cancelled on :date. This moment will pass in about **:diff days**.',
-    'bill_warning_end_date_zero'              => 'Your bill **":name"** is due to end on :date. This moment will pass **TODAY!**',
-    'bill_warning_extension_date_zero'        => 'Your bill **":name"** is due to be extended or cancelled on :date. This moment will pass **TODAY!**',
-    'bill_warning_please_action'              => 'Please take the appropriate action.',
+    'bill_warning_subject_end_date'           => '你的帳單 ":name" 將於 :diff 日內到期',
+    'bill_warning_subject_now_end_date'       => '你的帳單 ":name" 將於今天到期',
+    'bill_warning_subject_extension_date'     => '你的帳單 ":name" 將於 :diff 日內延期或取消',
+    'bill_warning_subject_now_extension_date' => '你的帳單 ":name" 將於今天延期或取消',
+    'bill_warning_end_date'                   => '你的帳單 ":name" 將於 :date 到期，即大約 **:diff 日**',
+    'bill_warning_extension_date'             => '你的帳單 ":name" 將於 :date 延期或取消，即大約 **:diff 日**',
+    'bill_warning_end_date_zero'              => '你的帳單 ":name" 將於 :date ，即**今天**到期',
+    'bill_warning_extension_date_zero'        => '你的帳單 ":name" 將於 :date 即**今天**延期或消取',
+    'bill_warning_please_action'              => '請採取適當的行動。',
 ];
 /*
 * PLEASE DO NOT EDIT THIS FILE DIRECTLY.
--- a/resources/lang/zh_TW/firefly.php
+++ b/resources/lang/zh_TW/firefly.php
@ -40,10 +40,10 @@ return [
    'edit'                                                => '編輯',
    'delete'                                              => '刪除',
    'split'                                               => '分割',
-    'single_split'                                        => 'Split',
+    'single_split'                                        => '拆分',
    'clone'                                               => '複製',
-    'clone_and_edit'                                      => 'Clone and edit',
-    'confirm_action'                                      => 'Confirm action',
+    'clone_and_edit'                                      => '複制並編輯',
+    'confirm_action'                                      => '確認',
    'last_seven_days'                                     => '最近7天',
    'last_thirty_days'                                    => '最近30天',
    'last_180_days'                                       => '最近 180 天',
@ -78,7 +78,7 @@ return [
    'go_to_asset_accounts'                                => '檢視您的資產帳戶',
    'go_to_budgets'                                       => '前往您的預算',
    'go_to_withdrawals'                                   => 'Go to your withdrawals',
-    'clones_journal_x'                                    => 'This transaction is a clone of ":description" (#:id)',
+    'clones_journal_x'                                    => '這項交易是從":description" (#:id) 複制出來',
    'go_to_categories'                                    => '前往您的分類',
    'go_to_bills'                                         => '前往您的帳單',
    'go_to_expense_accounts'                              => '查看您的支出帳戶',
@ -144,8 +144,8 @@ return [
    'sum_of_income'                                       => '收入總和',
    'liabilities'                                         => '債務',
    'spent_in_specific_budget'                            => '預算「:budget」中的花費',
-    'spent_in_specific_double'                            => 'Spent in account ":account"',
-    'earned_in_specific_double'                           => 'Earned in account ":account"',
+    'spent_in_specific_double'                            => '於帳戶 ":account" 花費了',
+    'earned_in_specific_double'                           => '於帳戶 ":account" 賺取了',
    'source_account'                                      => '來源帳戶',
    'source_account_reconciliation'                       => 'You can\'t edit the source account of a reconciliation transaction.',
    'destination_account'                                 => '目標帳戶',
@ -226,12 +226,12 @@ return [
    'active_bills_only_total'                             => 'all active bills',
    'active_exp_bills_only'                               => 'active and expected bills only',
    'active_exp_bills_only_total'                         => 'all active expected bills only',
-    'per_period_sum_1D'                                   => 'Expected daily costs',
-    'per_period_sum_1W'                                   => 'Expected weekly costs',
-    'per_period_sum_1M'                                   => 'Expected monthly costs',
-    'per_period_sum_3M'                                   => 'Expected quarterly costs',
-    'per_period_sum_6M'                                   => 'Expected half-yearly costs',
-    'per_period_sum_1Y'                                   => 'Expected yearly costs',
+    'per_period_sum_1D'                                   => '預期每日開支',
+    'per_period_sum_1W'                                   => '預期每週開支',
+    'per_period_sum_1M'                                   => '預期每月開支',
+    'per_period_sum_3M'                                   => '預期每季度開支',
+    'per_period_sum_6M'                                   => '預期每半年開支',
+    'per_period_sum_1Y'                                   => '預期每年開支',
    'average_per_bill'                                    => '每張帳單的平均數',
    'expected_total'                                      => '預期總數',
    'reconciliation_account_name'                         => ':name reconciliation (:currency)',
@ -245,14 +245,14 @@ return [
    'webhooks_breadcrumb'                                 => 'Webhooks',
    'webhooks_menu_disabled'                              => 'disabled',
    'no_webhook_messages'                                 => 'There are no webhook messages',
-    'webhook_trigger_STORE_TRANSACTION'                   => 'After transaction creation',
-    'webhook_trigger_UPDATE_TRANSACTION'                  => 'After transaction update',
-    'webhook_trigger_DESTROY_TRANSACTION'                 => 'After transaction delete',
-    'webhook_response_TRANSACTIONS'                       => 'Transaction details',
-    'webhook_response_ACCOUNTS'                           => 'Account details',
+    'webhook_trigger_STORE_TRANSACTION'                   => '在交易建立後',
+    'webhook_trigger_UPDATE_TRANSACTION'                  => '在交易更新後',
+    'webhook_trigger_DESTROY_TRANSACTION'                 => '在交易刪除後',
+    'webhook_response_TRANSACTIONS'                       => '交易詳情',
+    'webhook_response_ACCOUNTS'                           => '帳號詳情',
    'webhook_response_none_NONE'                          => 'No details',
    'webhook_delivery_JSON'                               => 'JSON',
-    'inspect'                                             => 'Inspect',
+    'inspect'                                             => '檢查',
    'create_new_webhook'                                  => 'Create new webhook',
    'webhooks_create_breadcrumb'                          => 'Create new webhook',
    'webhook_trigger_form_help'                           => 'Indicate on what event the webhook will trigger',
@ -268,7 +268,7 @@ return [
    'show_webhook'                                        => 'Webhook ":title"',
    'webhook_was_triggered'                               => 'The webhook was triggered on the indicated transaction. Please wait for results to appear.',
    'webhook_messages'                                    => 'Webhook message',
-    'view_message'                                        => 'View message',
+    'view_message'                                        => '查看訊息',
    'view_attempts'                                       => 'View failed attempts',
    'message_content_title'                               => 'Webhook message content',
    'message_content_help'                                => 'This is the content of the message that was sent (or tried) using this webhook.',
@ -276,8 +276,8 @@ return [
    '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.',
    'no_attempts'                                         => 'There are no unsuccessful attempts. That\'s a good thing!',
    'webhook_attempt_at'                                  => 'Attempt at {moment}',
-    'logs'                                                => 'Logs',
-    'response'                                            => 'Response',
+    'logs'                                                => '紀錄日誌',
+    'response'                                            => '回覆',
    'visit_webhook_url'                                   => 'Visit webhook URL',
    'reset_webhook_secret'                                => 'Reset webhook secret',
    'webhook_stored_link'                                 => '<a href="webhooks/show/{ID}">Webhook #{ID} ("{title}")</a> has been stored.',
@ -291,13 +291,13 @@ return [
    'scopes_will_be_able'                                 => '此應用程式可以：',
    'button_authorize'                                    => '授權',
    'none_in_select_list'                                 => '(空)',
-    'no_piggy_bank'                                       => '(no piggy bank)',
+    'no_piggy_bank'                                       => '(無小豬撲滿)',
    'name_in_currency'                                    => ':name 於 :currency',
    'paid_in_currency'                                    => '以 :currency 支付',
    'unpaid_in_currency'                                  => '未以 :currency 支付',
    'is_alpha_warning'                                    => 'You are running an ALPHA version. Be wary of bugs and issues.',
    'is_beta_warning'                                     => 'You are running an BETA version. Be wary of bugs and issues.',
-    'all_destination_accounts'                            => 'Destination accounts',
+    'all_destination_accounts'                            => '目標帳戶',
    'all_source_accounts'                                 => '來源帳戶',
    'back_to_index'                                       => 'Back to the index',
    'cant_logout_guard'                                   => 'Firefly III can\'t log you out.',
@ -323,7 +323,7 @@ return [
    'unknown_error'                                       => 'Unknown error. Sorry about that.',
    'just_new_release'                                    => 'A new version is available! Version :version was released :date. This release is very fresh. Wait a few days for the new release to stabilize.',
    'disabled_but_check'                                  => 'You disabled update checking. So don\'t forget to check for updates yourself every now and then. Thank you!',
-    'admin_update_channel_title'                          => 'Update channel',
+    'admin_update_channel_title'                          => '更新頻道',
    'admin_update_channel_explain'                        => 'Firefly III has three update "channels" which determine how ahead of the curve you are in terms of features, enhancements and bugs. Use the "beta" channel if you\'re adventurous and the "alpha" when you like to live life dangerously.',
    'update_channel_stable'                               => 'Stable. Everything should work as expected.',
    'update_channel_beta'                                 => 'Beta. New features but things may be broken.',
@ -350,11 +350,11 @@ return [
 *
 */

-    'search_modifier_date_on'                             => 'Transaction date is ":value"',
+    'search_modifier_date_on'                             => '交易日期為 ":value"',
    'search_modifier_not_date_on'                         => 'Transaction date is not ":value"',
    'search_modifier_reconciled'                          => 'Transaction is reconciled',
    'search_modifier_not_reconciled'                      => 'Transaction is not reconciled',
-    'search_modifier_id'                                  => 'Transaction ID is ":value"',
+    'search_modifier_id'                                  => '交易ID為 ":value"',
    'search_modifier_not_id'                              => 'Transaction ID is not ":value"',
    'search_modifier_date_before'                         => 'Transaction date is before or on ":value"',
    'search_modifier_date_after'                          => 'Transaction date is after or on ":value"',
@ -2228,8 +2228,8 @@ return [
    'inactive'                                            => '未啟用',
    'active'                                              => '啟用',
    'difference'                                          => '差異',
-    'money_flowing_in'                                    => '在',
-    'money_flowing_out'                                   => '外',
+    'money_flowing_in'                                    => '流入',
+    'money_flowing_out'                                   => '流出',
    'topX'                                                => '前 :number',
    'show_full_list'                                      => '顯示所有清單',
    'show_only_top'                                       => '僅顯示前 :number',
--- a/resources/views/transactions/mass/edit.twig
+++ b/resources/views/transactions/mass/edit.twig
@ -92,7 +92,7 @@
                                    <td>
                                        {# DATE #}
                                        <input class="form-control input-sm" autocomplete="off"
-                                               name="date[{{ journal.transaction_journal_id }}]" type="date" value="{{ journal.date|slice(0,10) }}">
+                                               name="date[{{ journal.transaction_journal_id }}]" type="datetime-local" value="{{ journal.date }}">
                                    </td>
                                    <!-- {{ journal.transaction_type_type }} -->
                                    <!-- Source: {{ journal.source_account_name }} ({{ journal.source_account_id }}) -->