Meta files for new release.

changelog.md

@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 6.0.24 - 2023-09-16
+
+### Fixed
+
+- [Issue 7920](https://github.com/firefly-iii/firefly-iii/issues/7920) Issues with automatic budgets
+- [Issue 7940](https://github.com/firefly-iii/firefly-iii/issues/7940) Edge cases in the data import routine
+- [Issue 7963](https://github.com/firefly-iii/firefly-iii/issues/7963) Fix audit items for rules
+- Fixed all issues with relative URLs (which I caused myself)
+
+### API
+
+- [Issue 7944](https://github.com/firefly-iii/firefly-iii/issues/7944) Make sure all IDs are strings in the API
+
 ## 6.0.23 - 2023-09-04
 
 ### Changed

composer.lock

@@ -1939,16 +1939,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v10.22.0",
+            "version": "v10.23.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "9234388a895206d4e1df37342b61adc67e5c5d31"
+                "reference": "dbfd495557678759153e8d71cc2f6027686ca51e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/9234388a895206d4e1df37342b61adc67e5c5d31",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/dbfd495557678759153e8d71cc2f6027686ca51e",
-                "reference": "9234388a895206d4e1df37342b61adc67e5c5d31",
+                "reference": "dbfd495557678759153e8d71cc2f6027686ca51e",
                 "shasum": ""
             },
             "require": {
@@ -2048,7 +2048,7 @@
                 "league/flysystem-read-only": "^3.3",
                 "league/flysystem-sftp-v3": "^3.0",
                 "mockery/mockery": "^1.5.1",
-                "orchestra/testbench-core": "^8.4",
+                "orchestra/testbench-core": "^8.10",
                 "pda/pheanstalk": "^4.0",
                 "phpstan/phpstan": "^1.4.7",
                 "phpunit/phpunit": "^10.0.7",
@@ -2135,7 +2135,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2023-09-05T13:20:01+00:00"
+            "time": "2023-09-13T14:51:46+00:00"
         },
         {
             "name": "laravel/passport",
@@ -2217,16 +2217,16 @@
         },
         {
             "name": "laravel/prompts",
-            "version": "v0.1.6",
+            "version": "v0.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/prompts.git",
-                "reference": "b514c5620e1b3b61221b0024dc88def26d9654f4"
+                "reference": "554e7d855a22e87942753d68e23b327ad79b2070"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/b514c5620e1b3b61221b0024dc88def26d9654f4",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/554e7d855a22e87942753d68e23b327ad79b2070",
-                "reference": "b514c5620e1b3b61221b0024dc88def26d9654f4",
+                "reference": "554e7d855a22e87942753d68e23b327ad79b2070",
                 "shasum": ""
             },
             "require": {
@@ -2259,22 +2259,22 @@
             ],
             "support": {
                 "issues": "https://github.com/laravel/prompts/issues",
-                "source": "https://github.com/laravel/prompts/tree/v0.1.6"
+                "source": "https://github.com/laravel/prompts/tree/v0.1.7"
             },
-            "time": "2023-08-18T13:32:23+00:00"
+            "time": "2023-09-12T11:09:22+00:00"
         },
         {
             "name": "laravel/sanctum",
-            "version": "v3.3.0",
+            "version": "v3.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/sanctum.git",
-                "reference": "95a0181900019e2d79acbd3e2ee7d57e3d0a086b"
+                "reference": "338f633e6487e76b255470d3373fbc29228aa971"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/sanctum/zipball/95a0181900019e2d79acbd3e2ee7d57e3d0a086b",
+                "url": "https://api.github.com/repos/laravel/sanctum/zipball/338f633e6487e76b255470d3373fbc29228aa971",
-                "reference": "95a0181900019e2d79acbd3e2ee7d57e3d0a086b",
+                "reference": "338f633e6487e76b255470d3373fbc29228aa971",
                 "shasum": ""
             },
             "require": {
@@ -2327,7 +2327,7 @@
                 "issues": "https://github.com/laravel/sanctum/issues",
                 "source": "https://github.com/laravel/sanctum"
             },
-            "time": "2023-09-04T14:26:54+00:00"
+            "time": "2023-09-07T15:46:33+00:00"
         },
         {
             "name": "laravel/serializable-closure",
@@ -3351,20 +3351,20 @@
         },
         {
             "name": "league/uri",
-            "version": "7.2.1",
+            "version": "7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/uri.git",
-                "reference": "8b644f8ff80352530bbc0ea467d5b5a89b60d832"
+                "reference": "36743c3961bb82bf93da91917b6bced0358a8d45"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/uri/zipball/8b644f8ff80352530bbc0ea467d5b5a89b60d832",
+                "url": "https://api.github.com/repos/thephpleague/uri/zipball/36743c3961bb82bf93da91917b6bced0358a8d45",
-                "reference": "8b644f8ff80352530bbc0ea467d5b5a89b60d832",
+                "reference": "36743c3961bb82bf93da91917b6bced0358a8d45",
                 "shasum": ""
             },
             "require": {
-                "league/uri-interfaces": "^7.2",
+                "league/uri-interfaces": "^7.3",
                 "php": "^8.1"
             },
             "conflict": {
@@ -3429,7 +3429,7 @@
                 "docs": "https://uri.thephpleague.com",
                 "forum": "https://thephpleague.slack.com",
                 "issues": "https://github.com/thephpleague/uri-src/issues",
-                "source": "https://github.com/thephpleague/uri/tree/7.2.1"
+                "source": "https://github.com/thephpleague/uri/tree/7.3.0"
             },
             "funding": [
                 {
@@ -3437,20 +3437,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-30T21:06:57+00:00"
+            "time": "2023-09-09T17:21:43+00:00"
         },
         {
             "name": "league/uri-interfaces",
-            "version": "7.2.0",
+            "version": "7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/uri-interfaces.git",
-                "reference": "43fa071050fcba89aefb5d4789a4a5a73874c44b"
+                "reference": "c409b60ed2245ff94c965a8c798a60166db53361"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/43fa071050fcba89aefb5d4789a4a5a73874c44b",
+                "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/c409b60ed2245ff94c965a8c798a60166db53361",
-                "reference": "43fa071050fcba89aefb5d4789a4a5a73874c44b",
+                "reference": "c409b60ed2245ff94c965a8c798a60166db53361",
                 "shasum": ""
             },
             "require": {
@@ -3513,7 +3513,7 @@
                 "docs": "https://uri.thephpleague.com",
                 "forum": "https://thephpleague.slack.com",
                 "issues": "https://github.com/thephpleague/uri-src/issues",
-                "source": "https://github.com/thephpleague/uri-interfaces/tree/7.2.0"
+                "source": "https://github.com/thephpleague/uri-interfaces/tree/7.3.0"
             },
             "funding": [
                 {
@@ -3521,7 +3521,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-30T19:43:38+00:00"
+            "time": "2023-09-09T17:21:43+00:00"
         },
         {
             "name": "mailchimp/transactional",
@@ -4675,16 +4675,16 @@
         },
         {
             "name": "predis/predis",
-            "version": "v2.2.1",
+            "version": "v2.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/predis/predis.git",
-                "reference": "5f2b410a74afaff296a87a494e4c5488cf9fab57"
+                "reference": "b1d3255ed9ad4d7254f9f9bba386c99f4bb983d1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/predis/predis/zipball/5f2b410a74afaff296a87a494e4c5488cf9fab57",
+                "url": "https://api.github.com/repos/predis/predis/zipball/b1d3255ed9ad4d7254f9f9bba386c99f4bb983d1",
-                "reference": "5f2b410a74afaff296a87a494e4c5488cf9fab57",
+                "reference": "b1d3255ed9ad4d7254f9f9bba386c99f4bb983d1",
                 "shasum": ""
             },
             "require": {
@@ -4724,7 +4724,7 @@
             ],
             "support": {
                 "issues": "https://github.com/predis/predis/issues",
-                "source": "https://github.com/predis/predis/tree/v2.2.1"
+                "source": "https://github.com/predis/predis/tree/v2.2.2"
             },
             "funding": [
                 {
@@ -4732,7 +4732,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-15T23:01:46+00:00"
+            "time": "2023-09-13T16:42:03+00:00"
         },
         {
             "name": "psr/cache",
@@ -10006,16 +10006,16 @@
         },
         {
             "name": "phpstan/phpdoc-parser",
-            "version": "1.23.1",
+            "version": "1.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "846ae76eef31c6d7790fac9bc399ecee45160b26"
+                "reference": "3510b0a6274cc42f7219367cb3abfc123ffa09d6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/846ae76eef31c6d7790fac9bc399ecee45160b26",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/3510b0a6274cc42f7219367cb3abfc123ffa09d6",
-                "reference": "846ae76eef31c6d7790fac9bc399ecee45160b26",
+                "reference": "3510b0a6274cc42f7219367cb3abfc123ffa09d6",
                 "shasum": ""
             },
             "require": {
@@ -10047,22 +10047,22 @@
             "description": "PHPDoc parser with support for nullable, intersection and generic types",
             "support": {
                 "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.23.1"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.0"
             },
-            "time": "2023-08-03T16:32:59+00:00"
+            "time": "2023-09-07T20:46:32+00:00"
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.33",
+            "version": "1.10.34",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "03b1cf9f814ba0863c4e9affea49a4d1ed9a2ed1"
+                "reference": "7f806b6f1403e6914c778140e2ba07c293cb4901"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/03b1cf9f814ba0863c4e9affea49a4d1ed9a2ed1",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/7f806b6f1403e6914c778140e2ba07c293cb4901",
-                "reference": "03b1cf9f814ba0863c4e9affea49a4d1ed9a2ed1",
+                "reference": "7f806b6f1403e6914c778140e2ba07c293cb4901",
                 "shasum": ""
             },
             "require": {
@@ -10111,7 +10111,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-09-04T12:20:53+00:00"
+            "time": "2023-09-13T09:49:47+00:00"
         },
         {
             "name": "phpstan/phpstan-deprecation-rules",
@@ -10212,16 +10212,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "10.1.4",
+            "version": "10.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "cd59bb34756a16ca8253ce9b2909039c227fff71"
+                "reference": "1df504e42a88044c27a90136910f0b3fe9e91939"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/cd59bb34756a16ca8253ce9b2909039c227fff71",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/1df504e42a88044c27a90136910f0b3fe9e91939",
-                "reference": "cd59bb34756a16ca8253ce9b2909039c227fff71",
+                "reference": "1df504e42a88044c27a90136910f0b3fe9e91939",
                 "shasum": ""
             },
             "require": {
@@ -10278,7 +10278,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                 "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.4"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.5"
             },
             "funding": [
                 {
@@ -10286,7 +10286,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-31T14:04:38+00:00"
+            "time": "2023-09-12T14:37:22+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -10533,16 +10533,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "10.3.2",
+            "version": "10.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "0dafb1175c366dd274eaa9a625e914451506bcd1"
+                "reference": "b8d59476f19115c9774b3b447f78131781c6c32b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0dafb1175c366dd274eaa9a625e914451506bcd1",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b8d59476f19115c9774b3b447f78131781c6c32b",
-                "reference": "0dafb1175c366dd274eaa9a625e914451506bcd1",
+                "reference": "b8d59476f19115c9774b3b447f78131781c6c32b",
                 "shasum": ""
             },
             "require": {
@@ -10556,7 +10556,7 @@
                 "phar-io/manifest": "^2.0.3",
                 "phar-io/version": "^3.0.2",
                 "php": ">=8.1",
-                "phpunit/php-code-coverage": "^10.1.1",
+                "phpunit/php-code-coverage": "^10.1.5",
                 "phpunit/php-file-iterator": "^4.0",
                 "phpunit/php-invoker": "^4.0",
                 "phpunit/php-text-template": "^3.0",
@@ -10614,7 +10614,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.3.2"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.3.4"
             },
             "funding": [
                 {
@@ -10630,7 +10630,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-08-15T05:34:23+00:00"
+            "time": "2023-09-12T14:42:28+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -11067,16 +11067,16 @@
         },
         {
             "name": "sebastian/exporter",
-            "version": "5.0.0",
+            "version": "5.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "f3ec4bf931c0b31e5b413f5b4fc970a7d03338c0"
+                "reference": "32ff03d078fed1279c4ec9a407d08c5e9febb480"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/f3ec4bf931c0b31e5b413f5b4fc970a7d03338c0",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/32ff03d078fed1279c4ec9a407d08c5e9febb480",
-                "reference": "f3ec4bf931c0b31e5b413f5b4fc970a7d03338c0",
+                "reference": "32ff03d078fed1279c4ec9a407d08c5e9febb480",
                 "shasum": ""
             },
             "require": {
@@ -11132,7 +11132,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/5.0.0"
+                "security": "https://github.com/sebastianbergmann/exporter/security/policy",
+                "source": "https://github.com/sebastianbergmann/exporter/tree/5.0.1"
             },
             "funding": [
                 {
@@ -11140,7 +11141,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-03T07:06:49+00:00"
+            "time": "2023-09-08T04:46:58+00:00"
         },
         {
             "name": "sebastian/global-state",

config/firefly.php

@@ -111,8 +111,8 @@ return [
         'handle_debts' => true,
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => '6.0.23',
+    'version'                      => '6.0.24',
-    'api_version'                  => '2.0.7',
+    'api_version'                  => '2.0.8',
     'db_version'                   => 20,
 
     // generic settings

frontend/src/i18n/sl_SI/index.js

@@ -50,8 +50,8 @@ export default {
         "transactions": "Transakcije",
         "title_expenses": "Stro\u0161ki",
         "title_withdrawal": "Stro\u0161ki",
-        "title_revenue": "Dohodki prihodki",
+        "title_revenue": "Dohodki \/ prihodki",
-        "title_deposit": "Dohodki\/prihodki",
+        "title_deposit": "Dohodki \/ prihodki",
         "title_transfer": "Prenosi",
         "title_transfers": "Prenosi",
         "asset_accounts": "Premo\u017eenjski ra\u010duni",
@@ -72,7 +72,7 @@ export default {
         "newTransfer": "Nov prenos",
         "submission_options": "Submission options",
         "apply_rules_checkbox": "Uporabi pravila",
-        "fire_webhooks_checkbox": "Fire webhooks",
+        "fire_webhooks_checkbox": "Spro\u017ei Webhooke",
         "newDeposit": "Nov polog",
         "newWithdrawal": "Nov stro\u0161ek",
         "bills_paid": "Pla\u010dani trajniki",
@@ -222,7 +222,7 @@ export default {
         "pref_last30": "Zadnjih 30 dni",
         "pref_last7": "Zadnjih 7 dni",
         "pref_YTD": "Leto do datuma",
-        "pref_QTD": "Quarter to date",
+        "pref_QTD": "\u010cetrtletje do danes",
-        "pref_MTD": "Month to date"
+        "pref_MTD": "Mesec do datuma"
     }
 }

frontend/src/i18n/uk_UA/index.js

@@ -27,7 +27,7 @@ export default {
         "name": "\u041d\u0430\u0437\u0432\u0430",
         "amount_min": "\u041c\u0456\u043d\u0456\u043c\u0430\u043b\u044c\u043d\u0430 \u0441\u0443\u043c\u0430",
         "amount_max": "\u041c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u0430 \u0441\u0443\u043c\u0430",
-        "url": "URL",
+        "url": "URL-\u0430\u0434\u0440\u0435\u0441\u0430",
         "title": "\u041d\u0430\u0437\u0432\u0430",
         "first_date": "\u041f\u0435\u0440\u0448\u0430 \u0434\u0430\u0442\u0430",
         "repetitions": "\u041f\u043e\u0432\u0442\u043e\u0440\u0435\u043d\u043d\u044f",
@@ -105,9 +105,9 @@ export default {
         "rule_trigger_destination_account_nr_contains_choice": "\u0420\u0430\u0445\u0443\u043d\u043e\u043a \u043f\u0440\u0438\u0437\u043d\u0430\u0447\u0435\u043d\u043d\u044f \/ IBAN \u043c\u0456\u0441\u0442\u0438\u0442\u044c..",
         "rule_trigger_transaction_type_choice": "\u0422\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0456\u044f \u043c\u0430\u0454 \u0442\u0438\u043f..",
         "rule_trigger_category_is_choice": "\u041a\u0430\u0442\u0435\u0433\u043e\u0440\u0456\u044f \u0454..",
-        "rule_trigger_amount_less_choice": "Amount is less than or equal to ..",
+        "rule_trigger_amount_less_choice": "\u0421\u0443\u043c\u0430 \u043c\u0435\u043d\u0448\u0430 \u0430\u0431\u043e \u0434\u043e\u0440\u0456\u0432\u043d\u044e\u0454 ..",
         "rule_trigger_amount_is_choice": "\u0421\u0443\u043c\u0430..",
-        "rule_trigger_amount_more_choice": "Amount is more than or equal to..",
+        "rule_trigger_amount_more_choice": "\u0421\u0443\u043c\u0430 \u0431\u0456\u043b\u044c\u0448\u0435 \u0430\u0431\u043e \u0434\u043e\u0440\u0456\u0432\u043d\u044e\u0454..",
         "rule_trigger_description_starts_choice": "\u041e\u043f\u0438\u0441 \u043f\u043e\u0447\u0438\u043d\u0430\u0454\u0442\u044c\u0441\u044f \u0437..",
         "rule_trigger_description_ends_choice": "\u041e\u043f\u0438\u0441 \u0437\u0430\u043a\u0456\u043d\u0447\u0443\u0454\u0442\u044c\u0441\u044f \u043d\u0430..",
         "rule_trigger_description_contains_choice": "\u041e\u043f\u0438\u0441 \u043c\u0456\u0441\u0442\u0438\u0442\u044c..",
@@ -140,7 +140,7 @@ export default {
         "rule_trigger_external_id_is_choice": "\u0417\u043e\u0432\u043d\u0456\u0448\u043d\u0456\u0439 ID \u043c\u0456\u0441\u0442\u0438\u0442\u044c..",
         "rule_trigger_internal_reference_is_choice": "\u0412\u043d\u0443\u0442\u0440\u0456\u0448\u043d\u0454 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f - \u0446\u0435..",
         "rule_trigger_journal_id_choice": "\u0406\u0434\u0435\u043d\u0442\u0438\u0444\u0456\u043a\u0430\u0442\u043e\u0440 \u0436\u0443\u0440\u043d\u0430\u043b\u0443 \u043e\u043f\u0435\u0440\u0430\u0446\u0456\u0439 \u0454..",
-        "rule_trigger_any_external_url_choice": "Transaction has an (any) external URL",
+        "rule_trigger_any_external_url_choice": "\u041e\u043f\u0435\u0440\u0430\u0446\u0456\u044f \u043c\u0430\u0454 (\u044f\u043a\u0443\u0441\u044c) \u0437\u043e\u0432\u043d\u0456\u0448\u043d\u044e URL-\u0430\u0434\u0440\u0435\u0441\u0443",
         "rule_trigger_no_external_url_choice": "\u041e\u043f\u0435\u0440\u0430\u0446\u0456\u044f \u043d\u0435 \u043c\u0430\u0454 \u0437\u043e\u0432\u043d\u0456\u0448\u043d\u044c\u043e\u0457 URL-\u0430\u0434\u0440\u0435\u0441\u0438",
         "rule_trigger_id_choice": "\u0406\u0434\u0435\u043d\u0442\u0438\u0444\u0456\u043a\u0430\u0442\u043e\u0440 \u043e\u043f\u0435\u0440\u0430\u0446\u0456\u0457..",
         "rule_action_delete_transaction_choice": "\u0412\u0418\u0414\u0410\u041b\u0418\u0422\u0418 \u043e\u043f\u0435\u0440\u0430\u0446\u0456\u044e(!)",
@@ -151,7 +151,7 @@ export default {
         "rule_action_add_tag_choice": "\u0414\u043e\u0434\u0430\u0442\u0438 \u0442\u0435\u0433..",
         "rule_action_remove_tag_choice": "\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0442\u0435\u0433..",
         "rule_action_remove_all_tags_choice": "\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0443\u0441\u0456 \u0442\u0435\u0433\u0438",
-        "rule_action_set_description_choice": "Set description to ..",
+        "rule_action_set_description_choice": "\u0412\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u0438 \u043e\u043f\u0438\u0441 \u043d\u0430..",
         "rule_action_update_piggy_choice": "Add \/ remove transaction amount in piggy bank ..",
         "rule_action_append_description_choice": "Append description with ..",
         "rule_action_prepend_description_choice": "Prepend description with ..",
@@ -209,7 +209,7 @@ export default {
         "amount": "\u0421\u0443\u043c\u0430",
         "date": "\u0414\u0430\u0442\u0430",
         "time": "Time",
-        "preferences": "Preferences",
+        "preferences": "\u041d\u0430\u043b\u0430\u0448\u0442\u0443\u0432\u0430\u043d\u043d\u044f",
         "transactions": "\u0422\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0456\u0457",
         "balance": "Balance",
         "budgets": "\u0411\u044e\u0434\u0436\u0435\u0442\u0438",

package-lock.json

@@ -26,9 +26,9 @@
             }
         },
         "node_modules/@babel/runtime": {
-            "version": "7.22.11",
+            "version": "7.22.15",
-            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.11.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.15.tgz",
-            "integrity": "sha512-ee7jVNlWN09+KftVOu9n7S8gQzD/Z6hN/I8VBRXW4P1+Xe7kJGXMwu8vds4aGIMHZnNbdpSWCfZZtinytpcAvA==",
+            "integrity": "sha512-T0O+aa+4w0u06iNmapipJXMV4HoUir03hpx3/YqXXhu9xim3w+dVphjFWl1OH8NbZHw5Lbm9k45drDkgq2VNNA==",
             "dependencies": {
                 "regenerator-runtime": "^0.14.0"
             },
@@ -480,9 +480,9 @@
             }
         },
         "node_modules/bootstrap": {
-            "version": "5.3.1",
+            "version": "5.3.2",
-            "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.1.tgz",
+            "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.2.tgz",
-            "integrity": "sha512-jzwza3Yagduci2x0rr9MeFSORjcHpt0lRZukZPZQJT1Dth5qzV7XcgGqYzi39KGAVYR8QEDVoO0ubFKOxzMG+g==",
+            "integrity": "sha512-D32nmNWiQHo94BKHLmOrdjlL05q1c8oxbtBphQFb9Z5to6eGRDCm0QgeaZ4zFBHzfg2++rqa2JkqCcxDy0sH0g==",
             "funding": [
                 {
                     "type": "github",
@@ -498,9 +498,9 @@
             }
         },
         "node_modules/bootstrap5-autocomplete": {
-            "version": "1.1.20",
+            "version": "1.1.22",
-            "resolved": "https://registry.npmjs.org/bootstrap5-autocomplete/-/bootstrap5-autocomplete-1.1.20.tgz",
+            "resolved": "https://registry.npmjs.org/bootstrap5-autocomplete/-/bootstrap5-autocomplete-1.1.22.tgz",
-            "integrity": "sha512-lvX/Za+GnZ7fC1NqVXQr4DWA0eQMR+/uyFjTasdfNSwAMTFhBTIexCsEM+0pXiKdJJnZUXbfcxaNxW1I0rAwLw=="
+            "integrity": "sha512-vn4/+j/MmupcfQB9dwoGFadyk3OorxZh2Eyo8YVSBiaJBcaM1u+FYl0lgOCHQWRqN3MXqM4YCebo8xiyFIW/fw=="
         },
         "node_modules/braces": {
             "version": "3.0.2",
@@ -916,9 +916,9 @@
             "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
         },
         "node_modules/rollup": {
-            "version": "3.28.1",
+            "version": "3.29.1",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.28.1.tgz",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.1.tgz",
-            "integrity": "sha512-R9OMQmIHJm9znrU3m3cpE8uhN0fGdXiawME7aZIpQqvpS/85+Vt1Hq1/yVIcYfOmaQiHjvXkQAoJukvLpau6Yw==",
+            "integrity": "sha512-c+ebvQz0VIH4KhhCpDsI+Bik0eT8ZFEVZEYw0cGMVqIP8zc+gnwl7iXCamTw7vzv2MeuZFZfdx5JJIq+ehzDlg==",
             "dev": true,
             "bin": {
                 "rollup": "dist/bin/rollup"
@@ -932,9 +932,9 @@
             }
         },
         "node_modules/sass": {
-            "version": "1.66.1",
+            "version": "1.67.0",
-            "resolved": "https://registry.npmjs.org/sass/-/sass-1.66.1.tgz",
+            "resolved": "https://registry.npmjs.org/sass/-/sass-1.67.0.tgz",
-            "integrity": "sha512-50c+zTsZOJVgFfTgwwEzkjA3/QACgdNsKueWPyAR0mRINIvLAStVQBbPg14iuqEQ74NPDbXzJARJ/O4SI1zftA==",
+            "integrity": "sha512-SVrO9ZeX/QQyEGtuZYCVxoeAL5vGlYjJ9p4i4HFuekWl8y/LtJ7tJc10Z+ck1c8xOuoBm2MYzcLfTAffD0pl/A==",
             "dev": true,
             "dependencies": {
                 "chokidar": ">=3.0.0 <4.0.0",

public/.well-known/security.txt

@@ -4,13 +4,15 @@ Hash: SHA256
 # Please report security issues related to Firefly III to me ASAP, via the email address below.
 # Feel free to encrypt your message using GPG altough it's a pain let's be honest
 #
-# Please do not contact me for random vulnerabilities on other people's websites.
+# There are some ground rules, please keep them in mind:
 #
-# If it's not related to Firefly III I will not be able to help you.
+# 1. Your security report must be related to Firefly III or the associated tools
+# 2. There is no bug bounty program
+# 3. Don't report denial of service attacks on the login form
 #
 
 Contact: mailto:james@firefly-iii.org
-Expires: 2023-12-31T23:00:00.000Z
+Expires: 2024-12-31T23:00:00.000Z
 Preferred-Languages: en, nl
 Policy: https://docs.firefly-iii.org/firefly-iii/support/
 
@@ -19,18 +21,18 @@ Policy: https://docs.firefly-iii.org/firefly-iii/support/
 #
 -----BEGIN PGP SIGNATURE-----
 
-iQJKBAABCAA0FiEEAvQEbEsjbgYJVxYStJoyS36tbYAFAmT5U18WHGphbWVzQGZp
+iQJKBAABCAA0FiEEAvQEbEsjbgYJVxYStJoyS36tbYAFAmUEl4MWHGphbWVzQGZp
-cmVmbHktaWlpLm9yZwAKCRC0mjJLfq1tgFS5D/9vPf3QKbiDcXhjdG/cNchlK8JQ
+cmVmbHktaWlpLm9yZwAKCRC0mjJLfq1tgKipEADC1bsgtE7YNY+2W/qkX3sBlKc3
-lVSy7AZ/fQfiaJHcjvVVSLIwdv+V88tyZXuyxydiQd6cr2VLcSmWcIKm/f4bDbOM
+E8tDV/dr7D+jWMpV81poGyDzEe8sytJ5DmZWGTFiQez6jxZN5czT5KxZ7fMQOzbw
-8/n0gFNUTyoOl4FBlXdIrDZMIVJetZoCbGT5u3PnYbC9HdMcDueU0eFNCNHHa25l
+kjT+S6CxKrvD2H05pe5v2ziY+lfDIVe4kI1vxYRB6bgTYi0pfGJF9woSH4qhwMMa
-tJDGxtWEUFlMbWg6X4C0CWvBWVZG7NzTaPYcYyPpFIYWKtDWYiXeYWmUadB8ueH2
+5cai0Rj6Ew9pHPx06BvcHOoNjOcmqPWRoBt5a1LOK8EqSMJHbdUv8deAbQSkO/8t
-Kc/w5awF6eEcCH7Rahscm5Fvsw2/tfL5KTeqsrp13BWh99/eoF0jElYKhEwwMqxs
+gDEA7FVRXXB0QRIraOR2cMtU2uW/o7NymDzZeaqWR9+g4eWeosRJjLA4K05akPx+
-bopdB3MBGJ7QJbJSyf4RVb4TxGDXYVw4LX+33zLsas8SgQ8jFa1ZbJ9x4iF2KIj+
+3mrKG0qV76dBexfMC99IEfjgk+xiffxg2iiKh37uBbsgK74aakAujYta1q4SsX8d
-KEWET/l9mT8F2GpMp8wewOZUwRFG9o3857h+Sxiw0/Acoy5Ho7G75uNZcJrNA3GP
+BXMvBpSi6mFuw13tgeueQS7IKqZsbh3vb6M325Dkv+hRe1e/Tw+qE9OWNFBQ2WS4
-1OF7eOFRQQKNwJVvWA3r5HsECZOrINXWmsBqasj+RQPVCbxgvWXQwLlIPbP7lcJy
+H+sJZ8u1Ke++BctttaNkAkOZF0l8+f7+aEZhEaIan31hq0Y1KpFNPLiPMvMEDDBZ
-kQyzdW1oGOB1siWvxzr7+Wi+SBDSXj6KafZlkOxf4KIDSAkh/cprb8PXbXhzj2Lt
+9OhqIZaWmpZv0vUu/pK+0IU5ESRAU8dSPLi1anj+LWSF+YkaOW8gmA5Di0Oiqta8
-mDJBjp1auyz9kbvbeDayjQyNAQ09RDrkkp+D6d7Td5kN4Q3T0WnKLsF91dUIEaC9
+xRDOaDSDgLN9ESd5gF8rca263AXeH1iPoPRHWPEFWgQPTcxVruwAhe7P+0dclCMx
-7WEW2m869MDd28GnNuO9EIQn3OL9zNEAtSHpbwZ6M1U2gAykwIz3jBvGxS5n+K0E
+8eIaHoc21VGk299lwiCy4X9Wxp2+tQFH9iQG+Lnd/koxnufE6vGEIBLMzPxij6L4
-SWQVwbDxbtbM2Ko67w==
+2oFicDqAMXd0Ls8kWA==
-=hT7Q
+=8skS
 -----END PGP SIGNATURE-----

public/.well-known/security.txt.sig

@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQJKBAABCAA0FiEEAvQEbEsjbgYJVxYStJoyS36tbYAFAmT5U18WHGphbWVzQGZp
+iQJKBAABCAA0FiEEAvQEbEsjbgYJVxYStJoyS36tbYAFAmUEl4MWHGphbWVzQGZp
-cmVmbHktaWlpLm9yZwAKCRC0mjJLfq1tgFS5D/9vPf3QKbiDcXhjdG/cNchlK8JQ
+cmVmbHktaWlpLm9yZwAKCRC0mjJLfq1tgKipEADC1bsgtE7YNY+2W/qkX3sBlKc3
-lVSy7AZ/fQfiaJHcjvVVSLIwdv+V88tyZXuyxydiQd6cr2VLcSmWcIKm/f4bDbOM
+E8tDV/dr7D+jWMpV81poGyDzEe8sytJ5DmZWGTFiQez6jxZN5czT5KxZ7fMQOzbw
-8/n0gFNUTyoOl4FBlXdIrDZMIVJetZoCbGT5u3PnYbC9HdMcDueU0eFNCNHHa25l
+kjT+S6CxKrvD2H05pe5v2ziY+lfDIVe4kI1vxYRB6bgTYi0pfGJF9woSH4qhwMMa
-tJDGxtWEUFlMbWg6X4C0CWvBWVZG7NzTaPYcYyPpFIYWKtDWYiXeYWmUadB8ueH2
+5cai0Rj6Ew9pHPx06BvcHOoNjOcmqPWRoBt5a1LOK8EqSMJHbdUv8deAbQSkO/8t
-Kc/w5awF6eEcCH7Rahscm5Fvsw2/tfL5KTeqsrp13BWh99/eoF0jElYKhEwwMqxs
+gDEA7FVRXXB0QRIraOR2cMtU2uW/o7NymDzZeaqWR9+g4eWeosRJjLA4K05akPx+
-bopdB3MBGJ7QJbJSyf4RVb4TxGDXYVw4LX+33zLsas8SgQ8jFa1ZbJ9x4iF2KIj+
+3mrKG0qV76dBexfMC99IEfjgk+xiffxg2iiKh37uBbsgK74aakAujYta1q4SsX8d
-KEWET/l9mT8F2GpMp8wewOZUwRFG9o3857h+Sxiw0/Acoy5Ho7G75uNZcJrNA3GP
+BXMvBpSi6mFuw13tgeueQS7IKqZsbh3vb6M325Dkv+hRe1e/Tw+qE9OWNFBQ2WS4
-1OF7eOFRQQKNwJVvWA3r5HsECZOrINXWmsBqasj+RQPVCbxgvWXQwLlIPbP7lcJy
+H+sJZ8u1Ke++BctttaNkAkOZF0l8+f7+aEZhEaIan31hq0Y1KpFNPLiPMvMEDDBZ
-kQyzdW1oGOB1siWvxzr7+Wi+SBDSXj6KafZlkOxf4KIDSAkh/cprb8PXbXhzj2Lt
+9OhqIZaWmpZv0vUu/pK+0IU5ESRAU8dSPLi1anj+LWSF+YkaOW8gmA5Di0Oiqta8
-mDJBjp1auyz9kbvbeDayjQyNAQ09RDrkkp+D6d7Td5kN4Q3T0WnKLsF91dUIEaC9
+xRDOaDSDgLN9ESd5gF8rca263AXeH1iPoPRHWPEFWgQPTcxVruwAhe7P+0dclCMx
-7WEW2m869MDd28GnNuO9EIQn3OL9zNEAtSHpbwZ6M1U2gAykwIz3jBvGxS5n+K0E
+8eIaHoc21VGk299lwiCy4X9Wxp2+tQFH9iQG+Lnd/koxnufE6vGEIBLMzPxij6L4
-SWQVwbDxbtbM2Ko67w==
+2oFicDqAMXd0Ls8kWA==
-=hT7Q
+=8skS
 -----END PGP SIGNATURE-----

public/build/manifest.json

@@ -30,10 +30,10 @@
     "integrity": "sha384-B73JAwYNSgI4rwb14zwxigHgAkg1Ms+j6+9sJoDpiL11+VW5RjQCLfIh0RVoi0h6"
   },
   "resources/assets/v2/pages/dashboard/dashboard.js": {
-    "file": "assets/dashboard-e6afec51.js",
+    "file": "assets/dashboard-1fecd60d.js",
     "isEntry": true,
     "src": "resources/assets/v2/pages/dashboard/dashboard.js",
-    "integrity": "sha384-XD/DlmRXlkNFLzbZu2S6Wor6xmQinxFelQCpT7KvalJaKR8J8iwjp2I0Hqo9/sAH"
+    "integrity": "sha384-uMRd+uHPChnXYXCT2/X5tvQtKHVVW65WptA71MNTIGO0/i22IQHg/ry2j4ILO/Av"
   },
   "resources/assets/v2/sass/app.scss": {
     "file": "assets/app-28a195fd.css",

public/v2/i18n/uk_UA.json

@@ -14,7 +14,7 @@
             "money_flowing_out": "Out",
             "category": "Category",
             "unknown_category_plain": "No category",
-            "all_money": "All your money",
+            "all_money": "\u0423\u0441\u0456 \u0432\u0430\u0448\u0456 \u0433\u0440\u043e\u0448\u0456",
             "unknown_source_plain": "Unknown source account",
             "unknown_dest_plain": "Unknown destination account",
             "unknown_any_plain": "Unknown account",

resources/assets/js/locales/sl.json

@@ -16,7 +16,7 @@
         "transaction_journal_information": "Informacije o transakciji",
         "submission_options": "Submission options",
         "apply_rules_checkbox": "Uporabi pravila",
-        "fire_webhooks_checkbox": "Fire webhooks",
+        "fire_webhooks_checkbox": "Spro\u017ei Webhooke",
         "no_budget_pointer": "Zdi se, da \u0161e nimate prora\u010duna. Ustvarite jih nekaj na strani <a href=\"budgets\">prora\u010duni<\/a>. Prora\u010duni vam lahko pomagajo spremljati stro\u0161ke.",
         "no_bill_pointer": "Zdi se, da \u0161e nimate ra\u010dunov. Ustvarite jih na strani <a href=\"bills\">ra\u010duni<\/a>. Ra\u010duni vam lahko pomagajo spremljati stro\u0161ke.",
         "source_account": "Izvorni ra\u010dun",
@@ -86,7 +86,7 @@
         "piggy_bank": "Dodaj hranilnik",
         "profile_oauth_client_secret_title": "Client Secret",
         "profile_oauth_client_secret_expl": "Here is your new client secret. This is the only time it will be shown so don't lose it! You may now use this secret to make API requests.",
-        "profile_oauth_confidential": "Confidential",
+        "profile_oauth_confidential": "Zaupno",
         "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "Depending on the type of transaction you create, the source and\/or destination account of subsequent splits may be overruled by whatever is defined in the first split of the transaction.",
         "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.",

resources/assets/js/locales/uk.json

@@ -9,8 +9,8 @@
         "split": "\u0420\u043e\u0437\u0434\u0456\u043b\u0438\u0442\u0438",
         "single_split": "\u0420\u043e\u0437\u0434\u0456\u043b\u0438\u0442\u0438",
         "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_stored_link": "<a href=\"webhooks\/show\/{ID}\">\u0412\u0435\u0431\u0445\u0443\u043a #{ID} (\"{title}\")<\/a> \u0431\u0443\u0432 \u0437\u0431\u0435\u0440\u0435\u0436\u0435\u043d\u0438\u0439.",
-        "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") has been updated.",
+        "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">\u0412\u0435\u0431\u0445\u0443\u043a #{ID}<\/a> (\"{title}\") \u0431\u0443\u0432 \u043e\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0439.",
         "transaction_updated_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> (\"{title}\") has been updated.",
         "transaction_new_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been stored.",
         "transaction_journal_information": "Transaction information",
@@ -112,7 +112,7 @@
         "webhook_delivery_form_help": "\u0423 \u044f\u043a\u043e\u043c\u0443 \u0444\u043e\u0440\u043c\u0430\u0442\u0456 \u0432\u0435\u0431-\u0445\u0443\u043a \u043c\u0430\u0454 \u043d\u0430\u0434\u0430\u0432\u0430\u0442\u0438 \u0434\u0430\u043d\u0456.",
         "webhook_active_form_help": "\u0412\u0435\u0431-\u0445\u0443\u043a \u043c\u0430\u0454 \u0431\u0443\u0442\u0438 \u0430\u043a\u0442\u0438\u0432\u043d\u0438\u043c, \u0456\u043d\u0430\u043a\u0448\u0435 \u0439\u043e\u0433\u043e \u043d\u0435 \u0431\u0443\u0434\u0435 \u0432\u0438\u043a\u043b\u0438\u043a\u0430\u043d\u043e.",
         "edit_webhook_js": "\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0432\u0435\u0431-\u0445\u0443\u043a \"{title}\"",
-        "webhook_was_triggered": "The webhook was triggered on the indicated transaction. Please wait for results to appear.",
+        "webhook_was_triggered": "\u0412\u0435\u0431\u0445\u0443\u043a \u0431\u0443\u0432 \u0437\u0430\u043f\u0443\u0449\u0435\u043d\u0438\u0439 \u0432 \u0437\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0456\u0439 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0456\u0457. \u0411\u0443\u0434\u044c \u043b\u0430\u0441\u043a\u0430, \u0437\u0430\u0447\u0435\u043a\u0430\u0439\u0442\u0435 \u043d\u0430 \u043e\u0442\u0440\u0438\u043c\u0430\u043d\u043d\u044f \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u0456\u0432.",
         "view_message": "\u041f\u0435\u0440\u0435\u0433\u043b\u044f\u043d\u0443\u0442\u0438 \u043f\u043e\u0432\u0456\u0434\u043e\u043c\u043b\u0435\u043d\u043d\u044f",
         "view_attempts": "\u041f\u0435\u0440\u0435\u0433\u043b\u044f\u043d\u0443\u0442\u0438 \u043d\u0435\u0432\u0434\u0430\u043b\u0456 \u0441\u043f\u0440\u043e\u0431\u0438",
         "message_content_title": "\u0412\u043c\u0456\u0441\u0442 \u0432\u0435\u0431-\u0445\u0443\u043a \u043f\u043e\u0432\u0456\u0434\u043e\u043c\u043b\u0435\u043d\u043d\u044f",
@@ -127,7 +127,7 @@
         "reset_webhook_secret": "\u0412\u0456\u0434\u043d\u043e\u0432\u0438\u0442\u0438 \u0441\u0456\u043a\u0440\u0435\u0442 \u0432\u0435\u0431-\u0445\u0443\u043a\u0430"
     },
     "form": {
-        "url": "URL",
+        "url": "URL-\u0430\u0434\u0440\u0435\u0441\u0430",
         "active": "\u0410\u043a\u0442\u0438\u0432\u043d\u043e",
         "interest_date": "\u0414\u0430\u0442\u0430 \u043d\u0430\u0440\u0430\u0445\u0443\u0432\u0430\u043d\u043d\u044f \u0432\u0456\u0434\u0441\u043e\u0442\u043a\u0443",
         "title": "\u041d\u0430\u0437\u0432\u0430",

resources/lang/bg_BG/rules.php

@@ -50,6 +50,8 @@ return [
     'already_has_destination'                     => 'This transaction already has ":name" as the destination account',
     'already_has_source'                          => 'This transaction already has ":name" as the source account',
     'already_linked_to_subscription'              => 'The transaction is already linked to subscription ":name"',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
     'cannot_find_subscription'                    => 'Firefly III can\'t find subscription ":name"',
     'no_notes_to_move'                            => 'The transaction has no notes to move to the description field',
     'no_tags_to_remove'                           => 'The transaction has no tags to remove',

resources/lang/ca_ES/rules.php

@@ -50,6 +50,8 @@ return [
     'already_has_destination'                     => 'Aquesta transacció ja té ":name" com al compte destí',
     'already_has_source'                          => 'Aquesta transacció ja té ":name" com al compte font',
     'already_linked_to_subscription'              => 'La transacció ja està enllaçada a la subscripció ":name"',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
     'cannot_find_subscription'                    => 'Firefly III no pot trobar la subscripció ":name"',
     'no_notes_to_move'                            => 'La transacció no té cap nota que moure al camp de descripció',
     'no_tags_to_remove'                           => 'La transacció no té etiquetes que eliminar',

resources/lang/cs_CZ/rules.php

@@ -50,6 +50,8 @@ return [
     'already_has_destination'                     => 'This transaction already has ":name" as the destination account',
     'already_has_source'                          => 'This transaction already has ":name" as the source account',
     'already_linked_to_subscription'              => 'The transaction is already linked to subscription ":name"',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
     'cannot_find_subscription'                    => 'Firefly III can\'t find subscription ":name"',
     'no_notes_to_move'                            => 'The transaction has no notes to move to the description field',
     'no_tags_to_remove'                           => 'The transaction has no tags to remove',

resources/lang/da_DK/rules.php

@@ -50,6 +50,8 @@ return [
     'already_has_destination'                     => 'This transaction already has ":name" as the destination account',
     'already_has_source'                          => 'This transaction already has ":name" as the source account',
     'already_linked_to_subscription'              => 'The transaction is already linked to subscription ":name"',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
     'cannot_find_subscription'                    => 'Firefly III can\'t find subscription ":name"',
     'no_notes_to_move'                            => 'The transaction has no notes to move to the description field',
     'no_tags_to_remove'                           => 'The transaction has no tags to remove',

resources/lang/de_DE/rules.php

@@ -42,24 +42,26 @@ return [
     'complex_error'                               => 'Etwas kompliziertes ist schief gelaufen. Bitte die Protokolle von Firefly III überprüfen',
     'no_valid_opposing'                           => 'Conversion failed because there is no valid account named ":account"',
     'new_notes_empty'                             => 'Die zu setzenden Notizen sind leer',
-    'unsupported_transaction_type_withdrawal'     => 'Firefly III cannot convert a ":type" to a withdrawal',
+    'unsupported_transaction_type_withdrawal'     => 'Firefly III kann eine ":type" nicht in eine Auszahlung konvertieren',
-    'unsupported_transaction_type_deposit'        => 'Firefly III cannot convert a ":type" to a deposit',
+    'unsupported_transaction_type_deposit'        => 'Firefly III kann ein ":type" nicht in eine Einzahlung umwandeln',
-    'unsupported_transaction_type_transfer'       => 'Firefly III cannot convert a ":type" to a transfer',
+    'unsupported_transaction_type_transfer'       => 'Firefly III kann eine ":type" nicht in eine Überweisung umwandeln',
     'already_has_source_asset'                    => 'This transaction already has ":name" as the source asset account',
     'already_has_destination_asset'               => 'This transaction already has ":name" as the destination asset account',
-    'already_has_destination'                     => 'This transaction already has ":name" as the destination account',
+    'already_has_destination'                     => 'Diese Transaktion hat bereits ":name" als Zielkonto',
-    'already_has_source'                          => 'This transaction already has ":name" as the source account',
+    'already_has_source'                          => 'Diese Transaktion hat bereits ":name" als Quellkonto',
     'already_linked_to_subscription'              => 'The transaction is already linked to subscription ":name"',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
     'cannot_find_subscription'                    => 'Firefly III can\'t find subscription ":name"',
     'no_notes_to_move'                            => 'The transaction has no notes to move to the description field',
     'no_tags_to_remove'                           => 'Die Buchung hat keine Schlagworte zum Entfernen',
     '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',
-    'cannot_find_source_transaction'              => 'Firefly III can\'t find the source transaction',
+    'cannot_find_source_transaction'              => 'Firefly III kann die Quelltransaktion nicht finden',
-    'cannot_find_destination_transaction'         => 'Firefly III can\'t find the destination transaction',
+    'cannot_find_destination_transaction'         => 'Firefly III kann die Zieltransaktion nicht finden',
-    'cannot_find_source_transaction_account'      => 'Firefly III can\'t find the source transaction account',
+    'cannot_find_source_transaction_account'      => 'Firefly III konnte das Quellkonto nicht finden',
-    'cannot_find_destination_transaction_account' => 'Firefly III can\'t find the destination transaction account',
+    'cannot_find_destination_transaction_account' => 'Firefly III kann das Zielkonto nicht finden',
     'cannot_find_piggy'                           => 'Firefly III kann kein Sparschwein mit dem Namen ":name" finden',
     'no_link_piggy'                               => 'Die Konten dieser Buchung sind nicht mit dem Sparschwein verbunden, daher wird nichts gemacht',
     'cannot_unlink_tag'                           => 'Schlagwort ":tag" ist nicht mit dieser Buchung verknüpft',

resources/lang/el_GR/rules.php

@@ -50,6 +50,8 @@ return [
     'already_has_destination'                     => 'This transaction already has ":name" as the destination account',
     'already_has_source'                          => 'This transaction already has ":name" as the source account',
     'already_linked_to_subscription'              => 'The transaction is already linked to subscription ":name"',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
     'cannot_find_subscription'                    => 'Firefly III can\'t find subscription ":name"',
     'no_notes_to_move'                            => 'The transaction has no notes to move to the description field',
     'no_tags_to_remove'                           => 'The transaction has no tags to remove',

resources/lang/en_GB/rules.php

@@ -50,6 +50,8 @@ return [
     'already_has_destination'                     => 'This transaction already has ":name" as the destination account',
     'already_has_source'                          => 'This transaction already has ":name" as the source account',
     'already_linked_to_subscription'              => 'The transaction is already linked to subscription ":name"',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
     'cannot_find_subscription'                    => 'Firefly III can\'t find subscription ":name"',
     'no_notes_to_move'                            => 'The transaction has no notes to move to the description field',
     'no_tags_to_remove'                           => 'The transaction has no tags to remove',

resources/lang/es_ES/rules.php

@@ -50,6 +50,8 @@ return [
     'already_has_destination'                     => 'Esta transacción ya tiene ":name" como cuenta de destino',
     'already_has_source'                          => 'Esta transacción ya tiene ":name" como cuenta de origen',
     'already_linked_to_subscription'              => 'La transacción ya está vinculada a la suscripción ":name"',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
     'cannot_find_subscription'                    => 'Firefly III no puede encontrar la suscripción ":name"',
     'no_notes_to_move'                            => 'La transacción no tiene notas para mover al campo de descripción',
     'no_tags_to_remove'                           => 'La transacción no tiene etiquetas que eliminar',

resources/lang/fi_FI/rules.php

@@ -50,6 +50,8 @@ return [
     'already_has_destination'                     => 'This transaction already has ":name" as the destination account',
     'already_has_source'                          => 'This transaction already has ":name" as the source account',
     'already_linked_to_subscription'              => 'The transaction is already linked to subscription ":name"',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
     'cannot_find_subscription'                    => 'Firefly III can\'t find subscription ":name"',
     'no_notes_to_move'                            => 'The transaction has no notes to move to the description field',
     'no_tags_to_remove'                           => 'The transaction has no tags to remove',

resources/lang/fr_FR/rules.php

@@ -50,6 +50,8 @@ return [
     'already_has_destination'                     => 'Cette opération a déjà «:name» comme compte de destination',
     'already_has_source'                          => 'Cette opération a déjà ":name" comme compte source',
     'already_linked_to_subscription'              => 'L\'opération est déjà liée à l\'abonnement ":name"',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
     'cannot_find_subscription'                    => 'Firefly III ne trouve pas l\'abonnement ":name"',
     'no_notes_to_move'                            => 'L\'opération n\'a pas de notes à déplacer dans le champ description',
     'no_tags_to_remove'                           => 'L\'opération n\'a pas de tags à supprimer',

resources/lang/hu_HU/rules.php

@@ -50,6 +50,8 @@ return [
     'already_has_destination'                     => 'This transaction already has ":name" as the destination account',
     'already_has_source'                          => 'This transaction already has ":name" as the source account',
     'already_linked_to_subscription'              => 'The transaction is already linked to subscription ":name"',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
     'cannot_find_subscription'                    => 'Firefly III can\'t find subscription ":name"',
     'no_notes_to_move'                            => 'The transaction has no notes to move to the description field',
     'no_tags_to_remove'                           => 'The transaction has no tags to remove',

resources/lang/id_ID/rules.php

@@ -50,6 +50,8 @@ return [
     'already_has_destination'                     => 'This transaction already has ":name" as the destination account',
     'already_has_source'                          => 'This transaction already has ":name" as the source account',
     'already_linked_to_subscription'              => 'The transaction is already linked to subscription ":name"',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
     'cannot_find_subscription'                    => 'Firefly III can\'t find subscription ":name"',
     'no_notes_to_move'                            => 'The transaction has no notes to move to the description field',
     'no_tags_to_remove'                           => 'The transaction has no tags to remove',

resources/lang/it_IT/rules.php

@@ -50,6 +50,8 @@ return [
     'already_has_destination'                     => 'This transaction already has ":name" as the destination account',
     'already_has_source'                          => 'This transaction already has ":name" as the source account',
     'already_linked_to_subscription'              => 'The transaction is already linked to subscription ":name"',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
     'cannot_find_subscription'                    => 'Firefly III can\'t find subscription ":name"',
     'no_notes_to_move'                            => 'The transaction has no notes to move to the description field',
     'no_tags_to_remove'                           => 'The transaction has no tags to remove',

resources/lang/ja_JP/rules.php

@@ -50,6 +50,8 @@ return [
     'already_has_destination'                     => 'この取引はすでに宛先の口座は「:name」です',
     'already_has_source'                          => 'この取引はすでに元となる口座は「:name」です',
     'already_linked_to_subscription'              => 'この取引はすでにサブスクリプション「:name」にリンクされています',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
     'cannot_find_subscription'                    => 'Firefly IIIはサブスクリプション「":name"」を見つけられませんでした',
     'no_notes_to_move'                            => '取引には概要に設定できるメモがありません',
     'no_tags_to_remove'                           => '取引には削除できるタグがありません',

resources/lang/ko_KR/rules.php

@@ -50,6 +50,8 @@ return [
     'already_has_destination'                     => 'This transaction already has ":name" as the destination account',
     'already_has_source'                          => 'This transaction already has ":name" as the source account',
     'already_linked_to_subscription'              => 'The transaction is already linked to subscription ":name"',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
     'cannot_find_subscription'                    => 'Firefly III can\'t find subscription ":name"',
     'no_notes_to_move'                            => 'The transaction has no notes to move to the description field',
     'no_tags_to_remove'                           => 'The transaction has no tags to remove',

resources/lang/nb_NO/rules.php

@@ -50,6 +50,8 @@ return [
     'already_has_destination'                     => 'This transaction already has ":name" as the destination account',
     'already_has_source'                          => 'This transaction already has ":name" as the source account',
     'already_linked_to_subscription'              => 'The transaction is already linked to subscription ":name"',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
     'cannot_find_subscription'                    => 'Firefly III can\'t find subscription ":name"',
     'no_notes_to_move'                            => 'The transaction has no notes to move to the description field',
     'no_tags_to_remove'                           => 'The transaction has no tags to remove',

resources/lang/nl_NL/rules.php

@@ -50,6 +50,8 @@ return [
     'already_has_destination'                     => 'Deze transactie heeft ":name" al als doelrekening',
     'already_has_source'                          => 'Deze transactie heeft ":name" al als bronrekening',
     'already_linked_to_subscription'              => 'De transactie is al gekoppeld aan abonnement ":name"',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
     'cannot_find_subscription'                    => 'Firefly III kan geen abonnement met naam ":name" vinden',
     'no_notes_to_move'                            => 'De transactie heeft geen notities om te verplaatsen naar het omschrijvingsveld',
     'no_tags_to_remove'                           => 'De transactie heeft geen tags om te verwijderen',

resources/lang/nl_NL/validation.php

@@ -62,8 +62,8 @@ return [
     'belongs_user'                   => 'Deze waarde is ongeldig voor dit veld.',
     'at_least_one_transaction'       => 'Er is op zijn minst één transactie nodig.',
     'recurring_transaction_id'       => 'Er is op zijn minst één transactie nodig.',
-    'need_id_to_match'               => 'Je moet dit item met een ID versturen, anders snapt de API het niet.',
+    'need_id_to_match'               => 'Je moet dit item met een ID versturen, zodat de API het kan matchen.',
-    'too_many_unmatched'             => 'Te veel transacties kunnen niet worden gekoppeld aan hun respectievelijke database-entries. Zorg ervoor dat bestaande transacties een geldig ID hebben.',
+    'too_many_unmatched'             => 'Te veel transacties kunnen niet worden gekoppeld aan hun respectievelijke databank gegeven. Zorg ervoor dat bestaande transacties een geldig ID hebben.',
     'id_does_not_match'              => 'Ingediend ID #:id komt niet overeen met het verwachte ID. Zorg ervoor dat het overeenkomt of laat het veld weg.',
     'at_least_one_repetition'        => 'Er is op zijn minst één herhaling nodig.',
     'require_repeat_until'           => 'Je moet een aantal herhalingen opgeven, of een einddatum (repeat_until). Niet beide.',

resources/lang/nn_NO/firefly.php

@@ -320,7 +320,7 @@ return [
     'update_newer_version_alert'           => 'Du køyrer :your_version, som er nyare enn den nyaste versjonen, :new_version.',
     'update_check_error'                   => 'Det oppstod ein feil under søk etter oppdatering: :error',
     'unknown_error'                        => 'Ukjent feil. Beklager det.',
-    'just_new_release'                     => 'Ein ny versjon er tilgjengelig! Versjon :version vart utgitt :date. Denne utgjevinga er heilt ny. Vent gjerne nokon dager slik at den nye utgaven er stabil.',
+    'just_new_release'                     => 'Ein ny versjon er tilgjengeleg! Versjon :version vart tilgjengeleg :date. Denne utgjevinga er heilt ny. Vent gjerne nokre dagar for å sikra at den nye utgåva er stabil.',
     'disabled_but_check'                   => 'Du har deaktivert oppdateringssjekk. Ikke glem å oppdatera sjølv av og til. Tusen takk!',
     'admin_update_channel_title'           => 'Oppdater kanal',
     'admin_update_channel_explain'         => 'Firefly III har tre oppdaterings "kanaler" som bestemmer kor mykje du ønskar å ligga foran med tanke på funksjoner, forbetringar og feil. Bruk beta-kanalen dersom du er eventyrlysten og "alfa" når du liker å leve farlig.',

resources/lang/nn_NO/rules.php

@@ -50,6 +50,8 @@ return [
     'already_has_destination'                     => 'This transaction already has ":name" as the destination account',
     'already_has_source'                          => 'This transaction already has ":name" as the source account',
     'already_linked_to_subscription'              => 'The transaction is already linked to subscription ":name"',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
     'cannot_find_subscription'                    => 'Firefly III can\'t find subscription ":name"',
     'no_notes_to_move'                            => 'The transaction has no notes to move to the description field',
     'no_tags_to_remove'                           => 'The transaction has no tags to remove',

resources/lang/pl_PL/rules.php

@@ -50,6 +50,8 @@ return [
     'already_has_destination'                     => 'This transaction already has ":name" as the destination account',
     'already_has_source'                          => 'This transaction already has ":name" as the source account',
     'already_linked_to_subscription'              => 'The transaction is already linked to subscription ":name"',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
     'cannot_find_subscription'                    => 'Firefly III can\'t find subscription ":name"',
     'no_notes_to_move'                            => 'The transaction has no notes to move to the description field',
     'no_tags_to_remove'                           => 'The transaction has no tags to remove',

resources/lang/pt_BR/rules.php

@@ -50,6 +50,8 @@ return [
     'already_has_destination'                     => 'This transaction already has ":name" as the destination account',
     'already_has_source'                          => 'This transaction already has ":name" as the source account',
     'already_linked_to_subscription'              => 'The transaction is already linked to subscription ":name"',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
     'cannot_find_subscription'                    => 'Firefly III can\'t find subscription ":name"',
     'no_notes_to_move'                            => 'The transaction has no notes to move to the description field',
     'no_tags_to_remove'                           => 'The transaction has no tags to remove',

resources/lang/pt_PT/rules.php

@@ -50,6 +50,8 @@ return [
     'already_has_destination'                     => 'This transaction already has ":name" as the destination account',
     'already_has_source'                          => 'This transaction already has ":name" as the source account',
     'already_linked_to_subscription'              => 'The transaction is already linked to subscription ":name"',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
     'cannot_find_subscription'                    => 'Firefly III can\'t find subscription ":name"',
     'no_notes_to_move'                            => 'The transaction has no notes to move to the description field',
     'no_tags_to_remove'                           => 'The transaction has no tags to remove',

resources/lang/ro_RO/rules.php

@@ -50,6 +50,8 @@ return [
     'already_has_destination'                     => 'This transaction already has ":name" as the destination account',
     'already_has_source'                          => 'This transaction already has ":name" as the source account',
     'already_linked_to_subscription'              => 'The transaction is already linked to subscription ":name"',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
     'cannot_find_subscription'                    => 'Firefly III can\'t find subscription ":name"',
     'no_notes_to_move'                            => 'The transaction has no notes to move to the description field',
     'no_tags_to_remove'                           => 'The transaction has no tags to remove',

resources/lang/ru_RU/rules.php

@@ -50,6 +50,8 @@ return [
     'already_has_destination'                     => 'This transaction already has ":name" as the destination account',
     'already_has_source'                          => 'This transaction already has ":name" as the source account',
     'already_linked_to_subscription'              => 'The transaction is already linked to subscription ":name"',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
     'cannot_find_subscription'                    => 'Firefly III can\'t find subscription ":name"',
     'no_notes_to_move'                            => 'The transaction has no notes to move to the description field',
     'no_tags_to_remove'                           => 'The transaction has no tags to remove',

resources/lang/sk_SK/rules.php

@@ -50,6 +50,8 @@ return [
     'already_has_destination'                     => 'This transaction already has ":name" as the destination account',
     'already_has_source'                          => 'This transaction already has ":name" as the source account',
     'already_linked_to_subscription'              => 'The transaction is already linked to subscription ":name"',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
     'cannot_find_subscription'                    => 'Firefly III can\'t find subscription ":name"',
     'no_notes_to_move'                            => 'The transaction has no notes to move to the description field',
     'no_tags_to_remove'                           => 'The transaction has no tags to remove',

resources/lang/sl_SI/breadcrumbs.php

@@ -41,8 +41,8 @@ return [
     'transactions'     => 'Transakcije',
     'title_expenses'   => 'Stroški',
     'title_withdrawal' => 'Stroški',
-    'title_revenue'    => 'Dohodki prihodki',
+    'title_revenue'    => 'Dohodki / prihodki',
-    'title_deposit'    => 'Dohodki/prihodki',
+    'title_deposit'    => 'Dohodki / prihodki',
     'title_transfer'   => 'Prenosi',
     'title_transfers'  => 'Prenosi',
     'edit_currency'    => 'uredi valuto ":name"',

resources/lang/sl_SI/firefly.php

@@ -573,18 +573,18 @@ return [
     'search_modifier_interest_date_after_year'            => 'Datum obresti transakcije je po ali v letu ":value"',
     'search_modifier_interest_date_after_month'           => 'Datum obresti transakcije je po ali v mesecu ":value"',
     'search_modifier_interest_date_after_day'             => 'Datum obresti transakcije je po ali na dan v mesecu ":value"',
-    'search_modifier_book_date_on_year'                   => 'Datum transakcijske knjige je v letu ":value"',
+    'search_modifier_book_date_on_year'                   => 'Datum knjiženja je v letu ":value"',
-    'search_modifier_book_date_on_month'                  => 'Datum transakcijske knjige je v mesecu ":value"',
+    'search_modifier_book_date_on_month'                  => 'Datum knjiženja je v mesecu ":value"',
-    'search_modifier_book_date_on_day'                    => 'Datum transakcijske knjige je na dan v mesecu ":value"',
+    'search_modifier_book_date_on_day'                    => 'Datum knjiženja je na dan v mesecu ":value"',
-    'search_modifier_not_book_date_on_year'               => 'Datum transakcijske knjige ni v letu ":value"',
+    'search_modifier_not_book_date_on_year'               => 'Datum knjiženja ni v letu ":value"',
-    'search_modifier_not_book_date_on_month'              => 'Datum transakcijske knjige ni v mesecu ":value"',
+    'search_modifier_not_book_date_on_month'              => 'Datum knjiženja ni v mesecu ":value"',
-    'search_modifier_not_book_date_on_day'                => 'Datum transakcijske knjige ni na dan v mesecu ":value"',
+    'search_modifier_not_book_date_on_day'                => 'Datum knjiženja ni na dan v mesecu ":value"',
-    'search_modifier_book_date_before_year'               => 'Datum transakcijske knjige je pred ali v letu ":value"',
+    'search_modifier_book_date_before_year'               => 'Datum knjiženja je pred ali v letu ":value"',
-    'search_modifier_book_date_before_month'              => 'Datum transakcijske knjige je pred ali v mesecu ":value"',
+    'search_modifier_book_date_before_month'              => 'Datum knjiženja je pred ali v mesecu ":value"',
-    'search_modifier_book_date_before_day'                => 'Datum transakcijske knjige je pred ali na dan v mesecu ":value"',
+    'search_modifier_book_date_before_day'                => 'Datum knjiženja je pred ali na dan v mesecu ":value"',
-    'search_modifier_book_date_after_year'                => 'Datum transakcijske knjige je za ali v letu ":value"',
+    'search_modifier_book_date_after_year'                => 'Datum knjiženja je za ali v letu ":value"',
-    'search_modifier_book_date_after_month'               => 'Datum transakcijske knjige je za ali v mesecu ":value"',
+    'search_modifier_book_date_after_month'               => 'Datum knjiženja je za ali v mesecu ":value"',
-    'search_modifier_book_date_after_day'                 => 'Datum transakcijske knjige je za ali na dan v mesecu ":value"',
+    'search_modifier_book_date_after_day'                 => 'Datum knjiženja je za ali na dan v mesecu ":value"',
     'search_modifier_process_date_on_year'                => 'Datum postopka transakcije je v letu ":value"',
     'search_modifier_process_date_on_month'               => 'Datum postopka transakcije je v mesecu ":value"',
     'search_modifier_process_date_on_day'                 => 'Datum postopka transakcije je na dan v mesecu ":value"',
@@ -660,10 +660,10 @@ return [
     'search_modifier_created_at_after_day'                => 'Transakcija je bila ustvarjena na ali po dnevu v mesecu ":value"',
     'search_modifier_interest_date_before'                => 'Datum obresti transakcije je na ali pred ":value"',
     'search_modifier_interest_date_after'                 => 'Datum obresti transakcije je na ali po ":value"',
-    'search_modifier_book_date_on'                        => 'Datum transakcijske knjige je ":value"',
+    'search_modifier_book_date_on'                        => 'Datum knjiženja je ":value"',
-    'search_modifier_not_book_date_on'                    => 'Datum transakcijske knjige ni ":value"',
+    'search_modifier_not_book_date_on'                    => 'Datum knjiženja ni ":value"',
-    'search_modifier_book_date_before'                    => 'Datum transakcijske knjige je na ali pred ":value"',
+    'search_modifier_book_date_before'                    => 'Datum knjiženja je na ali pred ":value"',
-    'search_modifier_book_date_after'                     => 'Datum transakcijske knjige je na ali po ":value"',
+    'search_modifier_book_date_after'                     => 'Datum knjiženja je na ali po ":value"',
     'search_modifier_process_date_on'                     => 'Datum postopka transakcije je na ":value"',
     'search_modifier_not_process_date_on'                 => 'Datum postopka transakcije ni na ":value"',
     'search_modifier_process_date_before'                 => 'Datum postopka transakcije je na ali pred ":value"',
@@ -1279,10 +1279,10 @@ return [
     'rule_action_move_notes_to_descr'                     => 'Zamenjajte opis z opombami',
     'rulegroup_for_bills_title'                           => 'Skupina pravil za trajnike',
     'rulegroup_for_bills_description'                     => 'Posebna skupina pravil za vsa pravila, ki vključujejo račune.',
-    'rule_for_bill_title'                                 => 'Auto-generated rule for bill ":name"',
+    'rule_for_bill_title'                                 => 'Samodejno ustvarjeno pravilo za račun ":name"',
-    'rule_for_bill_description'                           => 'This rule is auto-generated to try to match bill ":name".',
+    'rule_for_bill_description'                           => 'To pravilo je samodejno ustvarjeno za poskus ujemanja računa ":name".',
     'create_rule_for_bill'                                => 'Ustvari novo pravilo za trajnik: ":name"',
-    'create_rule_for_bill_txt'                            => 'You have just created a new bill called ":name", congratulations!Firefly III can automagically match new withdrawals to this bill. For example, whenever you pay your rent, the bill "rent" will be linked to the expense. This way, Firefly III can accurately show you which bills are due and which ones aren\'t. In order to do so, a new rule must be created. Firefly III has filled in some sensible defaults for you. Please make sure these are correct. If these values are correct, Firefly III will automatically link the correct withdrawal to the correct bill. Please check out the triggers to see if they are correct, and add some if they\'re wrong.',
+    '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.',
     'new_rule_for_bill_title'                             => 'Pravilo za trajnik ":name"',
     'new_rule_for_bill_description'                       => 'To pravilo označuje transakcije za trajnik ":name".',
 
@@ -1303,9 +1303,9 @@ return [
     'clear_location'                            => 'Počisti lokacijo',
     'delete_all_selected_tags'                  => 'Izbriši vse izbrane oznake',
     'select_tags_to_delete'                     => 'Ne pozabi izbrati oznak.',
-    'deleted_x_tags'                            => 'Deleted :count tag.|Deleted :count tags.',
+    'deleted_x_tags'                            => 'Izbrisana :count oznaka.|Izbrisanih :count oznak.',
     'create_rule_from_transaction'              => 'Ustvari pravilo, ki temelji na transakciji',
-    'create_recurring_from_transaction'         => 'Create recurring transaction based on transaction',
+    'create_recurring_from_transaction'         => 'Ustvarite ponavljajočo se transakcijo na podlagi transakcije',
 
 
     // preferences
@@ -1314,7 +1314,7 @@ return [
     'dark_mode_option_dark'                     => 'Vedno temna tema',
     'equal_to_language'                         => '(enako jeziku)',
     'dark_mode_preference'                      => 'Temen način',
-    'dark_mode_preference_help'                 => 'Tell Firefly III when to use dark mode.',
+    'dark_mode_preference_help'                 => 'Povejte Firefly III, kdaj naj uporabi temni način.',
     'pref_home_screen_accounts'                 => 'Računi na začetni strani',
     'pref_home_screen_accounts_help'            => 'Kateri računi naj bodo prikazani na začetni strani?',
     'pref_view_range'                           => 'Ogled intervala',
@@ -1330,13 +1330,13 @@ return [
     'pref_last30'                               => 'Zadnjih 30 dni',
     'pref_last7'                                => 'Zadnjih 7 dni',
     'pref_YTD'                                  => 'Leto do datuma',
-    'pref_QTD'                                  => 'Quarter to date',
+    'pref_QTD'                                  => 'Četrtletje do danes',
-    'pref_MTD'                                  => 'Month to date',
+    'pref_MTD'                                  => 'Mesec do datuma',
     'pref_languages'                            => 'Jeziki',
     'pref_locale'                               => 'Področne nastavitve',
     'pref_languages_help'                       => 'Firefly III podpira več jezikov. Kateri ti je ljubši?',
     'pref_locale_help'                          => 'V Firefly III lahko nastaviš ostale nastavitve lokalizacije, kot na primer prikaz valut, števil in datumov. Tvoj sistem morda ne podpira vnosov na tem seznamu. Firefly III nima pravilnih nastavitev prikaza datuma za vse lokalizacije; kontaktirajte me za izboljšave.',
-    'pref_locale_no_demo'                       => 'This feature won\'t work for the demo user.',
+    'pref_locale_no_demo'                       => 'Ta funkcija ne bo delovala za demo uporabnika.',
     'pref_custom_fiscal_year'                   => 'Nastavitve fiskalnega leta',
     'pref_custom_fiscal_year_label'             => 'Omogočeno',
     'pref_custom_fiscal_year_help'              => 'V državah, ki uporabljajo finančno leto, ki je drugače od 1. januarja do 31. decembra, lahko to vklopite in določite prvi / zadnji dan fiskalnega leta',
@@ -1392,44 +1392,44 @@ return [
     'optional_field_meta_data'                  => 'Izbirni meta podatki',
     'external_url'                              => 'Zunanji URL',
     'pref_notification_bill_reminder'           => 'Opomnik o poteklih trajnikih',
-    'pref_notification_new_access_token'        => 'Alert when a new API access token is created',
+    'pref_notification_new_access_token'        => 'Opozorilo, ko je ustvarjen nov žeton za dostop do API-ja',
-    'pref_notification_transaction_creation'    => 'Alert when a transaction is created automatically',
+    'pref_notification_transaction_creation'    => 'Opozorilo, ko je transakcija ustvarjena samodejno',
-    'pref_notification_user_login'              => 'Alert when you login from a new location',
+    'pref_notification_user_login'              => 'Opozorilo, ko se prijavite z nove lokacije',
     'pref_notification_rule_action_failures'    => 'Opozorilo, ko se dejanja pravila ne izvedejo (samo Slack ali Discord)',
     'pref_notifications'                        => 'Obvestila',
-    'pref_notifications_help'                   => 'Indicate if these are notifications you would like to get. Some notifications may contain sensitive financial information.',
+    'pref_notifications_help'                   => 'Označite, ali so to obvestila, ki jih želite prejemati.  Nekatera obvestila lahko vsebujejo občutljive finančne podatke.',
     'slack_webhook_url'                         => 'Slack Webhook URL',
-    'slack_webhook_url_help'                    => 'If you want Firefly III to notify you using Slack, enter the webhook URL here. Otherwise leave the field blank. If you are an admin, you need to set this URL in the administration as well.',
+    'slack_webhook_url_help'                    => 'Če želite, da vas Firefly III obvesti s storitvijo Slack, tukaj vnesite URL webhook.  V nasprotnem primeru pustite polje prazno.  Če ste skrbnik, morate ta URL nastaviti tudi v administraciji.',
-    'slack_url_label'                           => 'Slack "incoming webhook" URL',
+    'slack_url_label'                           => 'Slack "dohodni webhook" URL',
 
     // Financial administrations
     'administration_index'                      => 'Finančna administracija',
     'administrations_index_menu'                => 'Finančna administracija',
 
     // profile:
-    'purge_data_title'                          => 'Purge data from Firefly III',
+    'purge_data_title'                          => 'Čiščenje podatkov iz Firefly III',
-    'purge_data_expl'                           => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. The button below deletes all of these previously "deleted" records FOREVER.',
+    'purge_data_expl'                           => '"Čiščenje" pomeni "brisanje tistega, kar je že izbrisano".  V normalnih okoliščinah Firefly III ničesar trajno ne izbriše.  To samo skriva.  Spodnji gumb izbriše vse te prej "izbrisane" zapise ZA VEDNO.',
-    'delete_stuff_header'                       => 'Delete and purge data',
+    'delete_stuff_header'                       => 'Brisanje in čiščenje podatkov',
-    'purge_all_data'                            => 'Purge all deleted records',
+    'purge_all_data'                            => 'Počisti vse izbrisane zapise',
     'purge_data'                                => 'Izbris podatkov',
-    'purged_all_records'                        => 'All deleted records have been purged.',
+    'purged_all_records'                        => 'Vsi izbrisani zapisi so bili izbrisani.',
-    'delete_data_title'                         => 'Delete data from Firefly III',
+    'delete_data_title'                         => 'Izbrišite podatke iz Firefly III',
-    'permanent_delete_stuff'                    => 'You can delete stuff from Firefly III. Using the buttons below means that your items will be removed from view and hidden. There is no undo-button for this, but the items may remain in the database where you can salvage them if necessary.',
+    'permanent_delete_stuff'                    => 'Iz Firefly III lahko izbrišete stvari.  Uporaba spodnjih gumbov pomeni, da bodo vaši predmeti odstranjeni iz pogleda in skriti.  Za to ni gumba za razveljavitev, vendar lahko elementi ostanejo v bazi podatkov, kjer jih lahko po potrebi rešite.',
-    'other_sessions_logged_out'                 => 'All your other sessions have been logged out.',
+    'other_sessions_logged_out'                 => 'Vse vaše druge seje so bile odjavljene.',
-    'delete_unused_accounts'                    => 'Deleting unused accounts will clean your auto-complete lists.',
+    'delete_unused_accounts'                    => 'Če izbrišete neuporabljene račune, boste počistili svoje sezname za samodejno dokončanje.',
-    'delete_all_unused_accounts'                => 'Delete unused accounts',
+    'delete_all_unused_accounts'                => 'Izbrišite neuporabljene račune',
-    'deleted_all_unused_accounts'               => 'All unused accounts are deleted',
+    'deleted_all_unused_accounts'               => 'Vsi neuporabljeni računi so izbrisani',
     'delete_all_budgets'                        => 'Izbriši VSE proračune',
-    'delete_all_categories'                     => 'Delete ALL your categories',
+    'delete_all_categories'                     => 'Izbrišite VSE vaše kategorije',
-    'delete_all_tags'                           => 'Delete ALL your tags',
+    'delete_all_tags'                           => 'Izbriši VSE oznake',
-    'delete_all_bills'                          => 'Delete ALL your bills',
+    'delete_all_bills'                          => 'Izbriši VSE račune',
-    'delete_all_piggy_banks'                    => 'Delete ALL your piggy banks',
+    'delete_all_piggy_banks'                    => 'Izbriši VSE hranilnike',
-    'delete_all_rules'                          => 'Delete ALL your rules',
+    'delete_all_rules'                          => 'Izbriši VSA pravila',
-    'delete_all_recurring'                      => 'Delete ALL your recurring transactions',
+    'delete_all_recurring'                      => 'Izbriši VSE ponavljajoče transakcije',
     'delete_all_object_groups'                  => 'Delete ALL your object groups',
     'delete_all_accounts'                       => 'Delete ALL your accounts',
     'delete_all_asset_accounts'                 => 'Delete ALL your asset accounts',
-    'delete_all_expense_accounts'               => 'Delete ALL your expense accounts',
+    'delete_all_expense_accounts'               => 'Izbriši VSE račune stroškov',
     'delete_all_revenue_accounts'               => 'Delete ALL your revenue accounts',
     'delete_all_liabilities'                    => 'Delete ALL your liabilities',
     'delete_all_transactions'                   => 'Delete ALL your transactions',
@@ -1439,7 +1439,7 @@ return [
     'also_delete_transactions'                  => 'Brisanje računa bo pobrisalo tudi VSE povezane dvige, pologe in prenose!',
     'deleted_all_budgets'                       => 'Vsi proračuni so bili izbrisani',
     'deleted_all_categories'                    => 'Vse kategorije so bile izbrisane',
-    'deleted_all_tags'                          => 'All tags have been deleted',
+    'deleted_all_tags'                          => 'Vse oznake so bile izbrisane',
     'deleted_all_bills'                         => 'All bills have been deleted',
     'deleted_all_piggy_banks'                   => 'Vsi hranilniki so bili izbrisani',
     'deleted_all_rules'                         => 'All rules and rule groups have been deleted',
@@ -1514,7 +1514,7 @@ return [
     'profile_oauth_client_secret_expl'          => 'Here is your new client secret. This is the only time it will be shown so don\'t lose it! You may now use this secret to make API requests.',
     'profile_personal_access_tokens'            => 'Personal Access Tokens',
     'profile_personal_access_token'             => 'Personal Access Token',
-    'profile_oauth_confidential'                => 'Confidential',
+    'profile_oauth_confidential'                => 'Zaupno',
     'profile_oauth_confidential_help'           => 'Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.',
     'profile_personal_access_token_explanation' => 'Here is your new personal access token. This is the only time it will be shown so don\'t lose it! You may now use this token to make API requests.',
     'profile_no_personal_access_token'          => 'You have not created any personal access tokens.',
@@ -1549,7 +1549,7 @@ return [
     'export_data_bc'                            => 'Izvozi podatke iz Firefly III',
     'export_data_main_title'                    => 'Izvozi podatke iz Firefly III',
     'export_data_expl'                          => 'This link allows you to export all transactions + meta data from Firefly III. Please refer to the help (top right (?)-icon) for more information about the process.',
-    'export_data_all_transactions'              => 'Export all transactions',
+    'export_data_all_transactions'              => 'Izvozi vse transakcije',
     'export_data_advanced_expl'                 => 'If you need a more advanced or specific type of export, read the help on how to use the console command <code>php artisan help firefly-iii:export-data</code>.',
 
     // attachments
@@ -1573,7 +1573,7 @@ return [
     'title_transfers'                           => 'Prenosi',
     'submission_options'                        => 'Submission options',
     'apply_rules_checkbox'                      => 'Uporabi pravila',
-    'fire_webhooks_checkbox'                    => 'Fire webhooks',
+    'fire_webhooks_checkbox'                    => 'Sproži Webhooke',
 
     // convert stuff:
     'convert_is_already_type_Withdrawal'        => 'Ta transakcija je že odliv',
@@ -1786,7 +1786,7 @@ return [
     'bill_repeats_yearly_skip'                  => 'Repeats every {skip} years',
     'subscriptions'                             => 'Naročnine',
     'go_to_subscriptions'                       => 'Pojdite na svoje naročnine',
-    'forever'                                   => 'Forever',
+    'forever'                                   => 'V nedolged',
     'extension_date_is'                         => 'Extension date is {date}',
 
     // accounts:
@@ -1983,13 +1983,13 @@ return [
     'cannot_change_amount_reconciled'           => 'You can\'t change the amount of reconciled transactions.',
     'no_budget'                                 => '(brez proračuna)',
     'no_bill'                                   => '(ni računa)',
-    'account_per_budget'                        => 'Account per budget',
+    'account_per_budget'                        => 'Porabljeno po proračunu',
     'account_per_category'                      => 'Account per category',
     'create_new_object'                         => 'Ustvari',
-    'empty'                                     => '(empty)',
+    'empty'                                     => '(prazno)',
     'all_other_budgets'                         => '(all other budgets)',
     'all_other_accounts'                        => '(all other accounts)',
-    'expense_per_source_account'                => 'Expenses per source account',
+    'expense_per_source_account'                => 'Stroški po računih',
     'expense_per_destination_account'           => 'Expenses per destination account',
     'income_per_destination_account'            => 'Income per destination account',
     'spent_in_specific_category'                => 'Spent in category ":category"',
@@ -2156,7 +2156,7 @@ return [
     'interest_period_help'                      => 'This field is purely cosmetic and won\'t be calculated for you. As it turns out banks are very sneaky so Firefly III never gets it right.',
     'store_new_liabilities_account'             => 'Shrani novo obveznost',
     'edit_liabilities_account'                  => 'Uredi obveznost ":name"',
-    'financial_control'                         => 'Financial control',
+    'financial_control'                         => 'Nadzor financ',
     'accounting'                                => 'Računovodstvo',
     'automation'                                => 'Avtomatizacija',
     'others'                                    => 'Drugo',

resources/lang/sl_SI/form.php

@@ -68,7 +68,7 @@ return [
     'journal_description'       => 'Opis',
     'note'                      => 'Opombe',
     'currency'                  => 'Valuta',
-    'account_id'                => 'premoženjski račun',
+    'account_id'                => 'Račun sredstev',
     'budget_id'                 => 'Proračun',
     'bill_id'                   => 'Račun',
     'opening_balance'           => 'Začetno stanje',
@@ -97,7 +97,7 @@ return [
     'returnHereExplanation'       => 'Po shranjevanju se vrni sem in ustvari še eno.',
     'returnHereUpdateExplanation' => 'Po shranjevanju se vrni sem.',
     'description'                 => 'Opis',
-    'expense_account'             => 'konto stroškov',
+    'expense_account'             => 'Račun stroškov',
     'revenue_account'             => 'Račun prihodkov',
     'decimal_places'              => 'Decimalke',
     'destination_amount'          => 'Znesek (cilj)',

resources/lang/sl_SI/list.php

@@ -44,7 +44,7 @@ return [
     'balance_before'        => 'Stanje prej',
     'balance_after'         => 'Stanje potem',
     'name'                  => 'ime',
-    'role'                  => 'vloga',
+    'role'                  => 'Vloga',
     'currentBalance'        => 'trenutno stanje',
     'linked_to_rules'       => 'Ustrezna pravila',
     'active'                => 'Aktiviran?',
@@ -94,7 +94,7 @@ return [
     'internal_reference'      => 'Interna referenca',
     'notes'                   => 'Zabeležke',
     'from'                    => 'Pošiljatelj',
-    'piggy_bank'              => 'Pujsek',
+    'piggy_bank'              => 'Hranilnik',
     'to'                      => 'Prejemnik',
     'budget'                  => 'Budžet',
     'category'                => 'Kategorija',

resources/lang/sl_SI/rules.php

@@ -50,6 +50,8 @@ return [
     'already_has_destination'                     => 'Ta transakcija že ima ":name" kot ciljni račun',
     'already_has_source'                          => 'Ta transakcija že ima ":name" kot izvorni račun',
     'already_linked_to_subscription'              => 'Transakcija je že povezana z naročnino ":name"',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
     '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',

resources/lang/sv_SE/rules.php

@@ -50,6 +50,8 @@ return [
     'already_has_destination'                     => 'This transaction already has ":name" as the destination account',
     'already_has_source'                          => 'This transaction already has ":name" as the source account',
     'already_linked_to_subscription'              => 'The transaction is already linked to subscription ":name"',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
     'cannot_find_subscription'                    => 'Firefly III can\'t find subscription ":name"',
     'no_notes_to_move'                            => 'The transaction has no notes to move to the description field',
     'no_tags_to_remove'                           => 'The transaction has no tags to remove',

resources/lang/th_TH/rules.php

@@ -50,6 +50,8 @@ return [
     'already_has_destination'                     => 'This transaction already has ":name" as the destination account',
     'already_has_source'                          => 'This transaction already has ":name" as the source account',
     'already_linked_to_subscription'              => 'The transaction is already linked to subscription ":name"',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
     'cannot_find_subscription'                    => 'Firefly III can\'t find subscription ":name"',
     'no_notes_to_move'                            => 'The transaction has no notes to move to the description field',
     'no_tags_to_remove'                           => 'The transaction has no tags to remove',

resources/lang/tr_TR/rules.php

@@ -50,6 +50,8 @@ return [
     'already_has_destination'                     => 'This transaction already has ":name" as the destination account',
     'already_has_source'                          => 'This transaction already has ":name" as the source account',
     'already_linked_to_subscription'              => 'The transaction is already linked to subscription ":name"',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
     'cannot_find_subscription'                    => 'Firefly III can\'t find subscription ":name"',
     'no_notes_to_move'                            => 'The transaction has no notes to move to the description field',
     'no_tags_to_remove'                           => 'The transaction has no tags to remove',

resources/lang/uk_UA/firefly.php

@@ -265,7 +265,7 @@ return [
     'updated_webhook'                      => 'Оновлено веб-хук ":title"',
     'edit_webhook_js'                      => 'Редагувати веб-хук "{title}"',
     'show_webhook'                         => 'Веб-хук ":title"',
-    'webhook_was_triggered'                => 'The webhook was triggered on the indicated transaction. Please wait for results to appear.',
+    'webhook_was_triggered'                => 'Вебхук був запущений в зазначеній транзакції. Будь ласка, зачекайте на отримання результатів.',
     'webhook_messages'                     => 'Повідомлення веб-хука',
     'view_message'                         => 'Переглянути повідомлення',
     'view_attempts'                        => 'Переглянути невдалі спроби',
@@ -279,8 +279,8 @@ return [
     'response'                             => 'Відповідь',
     'visit_webhook_url'                    => 'Відвідайте URL-адресу веб-хуку',
     'reset_webhook_secret'                 => 'Відновити сікрет веб-хука',
-    'webhook_stored_link'                  => '<a href="webhooks/show/{ID}">Webhook #{ID} ("{title}")</a> has been stored.',
+    'webhook_stored_link'                  => '<a href="webhooks/show/{ID}">Вебхук #{ID} ("{title}")</a> був збережений.',
-    'webhook_updated_link'                 => '<a href="webhooks/show/{ID}">Webhook #{ID}</a> ("{title}") has been updated.',
+    'webhook_updated_link'                 => '<a href="webhooks/show/{ID}">Вебхук #{ID}</a> ("{title}") був оновлений.',
 
     // API access
     'authorization_request'                => 'Firefly III v:version запит авторизації',
@@ -363,11 +363,11 @@ return [
     'search_modifier_no_external_url'                     => 'Операція не має зовнішнього URL',
     'search_modifier_no_external_id'                      => 'Операція не має зовнішнього ID',
     'search_modifier_not_any_external_url'                => 'Операція не має зовнішнього URL',
-    'search_modifier_not_any_external_id'                 => 'The transaction has no external ID',
+    'search_modifier_not_any_external_id'                 => 'Операція не має зовнішнього ID',
     'search_modifier_any_external_url'                    => 'Операція повинна мати зовнішні URL-адреси (будь-який)',
-    'search_modifier_any_external_id'                     => 'The transaction must have a (any) external ID',
+    'search_modifier_any_external_id'                     => 'Операція повинна мати (якийсь) зовнішній ID',
     'search_modifier_not_no_external_url'                 => 'Операція повинна мати (будь-які) зовнішні URL-адреси',
-    'search_modifier_not_no_external_id'                  => 'The transaction must have a (any) external ID',
+    'search_modifier_not_no_external_id'                  => 'Операція повинна мати (якийсь) зовнішній ID',
     'search_modifier_internal_reference_is'               => 'Внутрішнє посилання - ":value"',
     'search_modifier_not_internal_reference_is'           => 'Внутрішнє посилання не ":value"',
     'search_modifier_description_starts'                  => 'Опис починається з ":value"',
@@ -705,7 +705,7 @@ return [
     'search_modifier_not_attachment_notes_contains'       => 'Будь-які примітки вкладення не містять ":value"',
     'search_modifier_not_attachment_notes_starts'         => 'Будь-які примітки до вкладення починаються з ":value"',
     'search_modifier_not_attachment_notes_ends'           => 'Примітки до вкладення не закінчуються на ":value"',
-    'search_modifier_sepa_ct_is'                          => 'SEPA CT is ":value"',
+    'search_modifier_sepa_ct_is'                          => 'SEPA CT дорівнює ":value"',
     'update_rule_from_query'                              => 'Оновити правило ":rule" із пошукового запиту',
     'create_rule_from_query'                              => 'Створити нове правило з пошукового запиту',
     'rule_from_search_words'                              => 'Рушію правил важко обробити ":string". Пропоноване правило, яке відповідає вашому запиту, може дати різні результати. Будь ласка, уважно перевіряйте умови.',
@@ -864,12 +864,12 @@ return [
     'rule_trigger_transaction_type'                       => 'Тип операції ":trigger_value"',
     'rule_trigger_category_is_choice'                     => 'Категорія є..',
     'rule_trigger_category_is'                            => 'Категорія дорівнює ":trigger_value"',
-    'rule_trigger_amount_less_choice'                     => 'Amount is less than or equal to ..',
+    'rule_trigger_amount_less_choice'                     => 'Сума менша або дорівнює ..',
-    'rule_trigger_amount_less'                            => 'Amount is less than or equal to :trigger_value',
+    'rule_trigger_amount_less'                            => 'Сума менша або дорівнює :trigger_value',
     'rule_trigger_amount_is_choice'                       => 'Сума..',
     'rule_trigger_amount_is'                              => 'Сума :trigger_value',
-    'rule_trigger_amount_more_choice'                     => 'Amount is more than or equal to..',
+    'rule_trigger_amount_more_choice'                     => 'Сума більше або дорівнює..',
-    'rule_trigger_amount_more'                            => 'Amount is more than or equal to :trigger_value',
+    'rule_trigger_amount_more'                            => 'Сума більше або дорівнює :trigger_value',
     'rule_trigger_description_starts_choice'              => 'Опис починається з..',
     'rule_trigger_description_starts'                     => 'Опис починається з ":trigger_value"',
     'rule_trigger_description_ends_choice'                => 'Опис закінчується на..',
@@ -934,17 +934,17 @@ return [
     'rule_trigger_internal_reference_is'                  => 'Внутрішнє посилання ":trigger_value"',
     'rule_trigger_journal_id_choice'                      => 'Ідентифікатор журналу операцій є..',
     'rule_trigger_journal_id'                             => 'Ідентифікатор журналу операцій є ":trigger_value"',
-    'rule_trigger_any_external_url'                       => 'Transaction has an (any) external URL',
+    'rule_trigger_any_external_url'                       => 'Операція має (якусь) зовнішню URL-адресу',
-    'rule_trigger_any_external_url_choice'                => 'Transaction has an (any) external URL',
+    'rule_trigger_any_external_url_choice'                => 'Операція має (якусь) зовнішню URL-адресу',
-    'rule_trigger_any_external_id'                        => 'Transaction has an (any) external ID',
+    'rule_trigger_any_external_id'                        => 'Операція має (якийсь) зовнішній ID',
-    'rule_trigger_any_external_id_choice'                 => 'Transaction has an (any) external ID',
+    'rule_trigger_any_external_id_choice'                 => 'Операція має (якийсь) зовнішній ID',
     'rule_trigger_no_external_url_choice'                 => 'Операція не має зовнішньої URL-адреси',
     'rule_trigger_no_external_url'                        => 'Операція не має зовнішньої URL-адреси',
-    'rule_trigger_no_external_id_choice'                  => 'Transaction has no external ID',
+    'rule_trigger_no_external_id_choice'                  => 'Операція не має зовнішнього ID',
-    'rule_trigger_no_external_id'                         => 'Transaction has no external ID',
+    'rule_trigger_no_external_id'                         => 'Операція не має зовнішнього ID',
     'rule_trigger_id_choice'                              => 'Ідентифікатор операції..',
     'rule_trigger_id'                                     => 'Ідентифікатор операції: ":trigger_value"',
-    'rule_trigger_sepa_ct_is_choice'                      => 'SEPA CT is..',
+    'rule_trigger_sepa_ct_is_choice'                      => 'SEPA CT дорівнює..',
     'rule_trigger_sepa_ct_is'                             => 'SEPA CT is ":trigger_value"',
 
     // new values:
@@ -1242,7 +1242,7 @@ return [
     'rule_action_add_tag_choice'                          => 'Додати тег..',
     'rule_action_remove_tag_choice'                       => 'Видалити тег..',
     'rule_action_remove_all_tags_choice'                  => 'Видалити усі теги',
-    'rule_action_set_description_choice'                  => 'Set description to ..',
+    'rule_action_set_description_choice'                  => 'Встановити опис на..',
     'rule_action_update_piggy_choice'                     => 'Add / remove transaction amount in piggy bank ..',
     'rule_action_update_piggy'                            => 'Додати/видалити суму транзакції в скарбничці ":action_value"',
     'rule_action_append_description_choice'               => 'Append description with ..',
@@ -1309,9 +1309,9 @@ return [
 
 
     // preferences
-    'dark_mode_option_browser'                  => 'Let your browser decide',
+    'dark_mode_option_browser'                  => 'Дозвольте браузеру вирішити',
-    'dark_mode_option_light'                    => 'Always light',
+    'dark_mode_option_light'                    => 'Завжди світла',
-    'dark_mode_option_dark'                     => 'Always dark',
+    'dark_mode_option_dark'                     => 'Завжди темна',
     'equal_to_language'                         => '(прирівнюється до мови)',
     'dark_mode_preference'                      => 'Темний режим',
     'dark_mode_preference_help'                 => 'Tell Firefly III when to use dark mode.',
@@ -1336,7 +1336,7 @@ return [
     'pref_locale'                               => 'Налаштування локалі',
     'pref_languages_help'                       => 'Firefly III підтримує декілька мов. Якій ви віддаєте перевагу?',
     'pref_locale_help'                          => 'Firefly III дозволяє встановлювати інші локальні налаштування, такі як валюти, числа та дати. Записи в цьому списку можуть не підтримуватися вашою системою. Firefly III не має правильних параметрів дати для кожної локалі; зв\'яжіться зі мною для вдосконалення.',
-    'pref_locale_no_demo'                       => 'This feature won\'t work for the demo user.',
+    'pref_locale_no_demo'                       => 'Ця функція не працюватиме для демо-користувача.',
     'pref_custom_fiscal_year'                   => 'Налаштування фінансового року',
     'pref_custom_fiscal_year_label'             => 'Увiмкнено',
     'pref_custom_fiscal_year_help'              => 'У країнах, які використовують фінансовий рік, крім 1 січня до 31 грудня, ви можете увімкнути це і вказати початкові/кінцеві дні фіскального року',
@@ -1351,8 +1351,8 @@ return [
     'pref_two_factor_auth_reset_code'           => 'Скинути код підтвердження',
     'pref_two_factor_auth_disable_2fa'          => 'Вимкнути 2FA',
     '2fa_use_secret_instead'                    => 'If you cannot scan the QR code, feel free to use the secret instead: <code>:secret</code>.',
-    '2fa_backup_codes'                          => 'Store these backup codes for access in case you lose your device.',
+    '2fa_backup_codes'                          => 'Збережіть ці резервні коди доступу на випадок втрати вашого пристрій.',
-    '2fa_already_enabled'                       => '2-step verification is already enabled.',
+    '2fa_already_enabled'                       => 'Двоетапну перевірку вже увімкнено.',
     'wrong_mfa_code'                            => 'Цей MFA код не дійсний.',
     'pref_save_settings'                        => 'Зберегти налаштування',
     'saved_preferences'                         => 'Налаштування збережено!',
@@ -2080,15 +2080,15 @@ return [
 
     // menu and titles, should be recycled as often as possible:
     'currency'                                  => 'Валюта',
-    'preferences'                               => 'Preferences',
+    'preferences'                               => 'Налаштування',
-    'logout'                                    => 'Logout',
+    'logout'                                    => 'Вихід із системи',
-    'logout_other_sessions'                     => 'Logout all other sessions',
+    'logout_other_sessions'                     => 'Вийти з усіх інших сеансів',
-    'toggleNavigation'                          => 'Toggle navigation',
+    'toggleNavigation'                          => 'Переключити навігацію',
     'searchPlaceholder'                         => 'Пошук...',
     'version'                                   => 'Версія',
     'dashboard'                                 => 'Головна панель',
     'income_and_expense'                        => 'Income and expense',
-    'all_money'                                 => 'All your money',
+    'all_money'                                 => 'Усі ваші гроші',
     'unknown_source_plain'                      => 'Unknown source account',
     'unknown_dest_plain'                        => 'Unknown destination account',
     'unknown_any_plain'                         => 'Unknown account',

resources/lang/uk_UA/form.php

@@ -70,7 +70,7 @@ return [
     'currency'                  => 'Валюта',
     'account_id'                => 'Рахунок активів',
     'budget_id'                 => 'Бюджет',
-    'bill_id'                   => 'Bill',
+    'bill_id'                   => 'Рахунок',
     'opening_balance'           => 'Початковий баланс',
     'tagMode'                   => 'Режим міток',
     'virtual_balance'           => 'Віртуальний баланс',
@@ -146,12 +146,12 @@ return [
     'stop_processing'             => 'Зупинити обробку',
     'start_date'                  => 'Початок діапазону',
     'end_date'                    => 'Кінець діапазону',
-    'enddate'                     => 'End date',
+    'enddate'                     => 'Кінцева дата',
-    'move_rules_before_delete'    => 'Rule group',
+    'move_rules_before_delete'    => 'Група правил',
     'start'                       => 'Початок діапазону',
     'end'                         => 'Кінець діапазону',
     'delete_account'              => 'Видалити акаунт ":name"',
-    'delete_webhook'              => 'Delete webhook ":title"',
+    'delete_webhook'              => 'Видалити вебхук ":title"',
     'delete_bill'                 => 'Видалити квитанцію ":name"',
     'delete_budget'               => 'Видалити бюджет ":name"',
     'delete_category'             => 'Видалити категорію ":name"',
@@ -166,13 +166,13 @@ return [
     'user_areYouSure'             => 'Якщо ви видалите користувача ":email", усе зникне. Не існує операції відміни. Якщо видалите себе, ви втратите доступ до цього екземпяру Firefly III.',
     'attachment_areYouSure'       => 'Ви дійсно бажаєте видалити прикріплення з назвою ":name"?',
     'account_areYouSure'          => 'Ви впевнені, що хочете видалити обліковий запис з назвою ":name"?',
-    'account_areYouSure_js'       => 'Are you sure you want to delete the account named "{name}"?',
+    'account_areYouSure_js'       => 'Ви впевнені, що хочете видалити рахунок "{name}"?',
     'bill_areYouSure'             => 'Ви впевнені, що хочете видалити квитанцію з назвою ":name"?',
     'rule_areYouSure'             => 'Ви дійсно бажаєте видалити правило ":title"?',
     'object_group_areYouSure'     => 'Ви дійсно бажаєте видалити групу з назвою ":title"?',
     'ruleGroup_areYouSure'        => 'Ви дійсно бажаєте видалити групу правил ":title"?',
     'budget_areYouSure'           => 'Ви впевнені, що хочете видалити бюджет ":name"?',
-    'webhook_areYouSure'          => 'Are you sure you want to delete the webhook named ":title"?',
+    'webhook_areYouSure'          => 'Ви впевнені, що хочете видалити вебхук з назвою ":title"?',
     'category_areYouSure'         => 'Ви впевнені, що хочете видалити категорію ":name"?',
     'recurring_areYouSure'        => 'Ви впевнені, що хочете видалити регулфрну трансакцію ":title"?',
     'currency_areYouSure'         => 'Ви впевнені, що хочете видалити валюту":name"?',
@@ -200,11 +200,11 @@ return [
     'delete_all_permanently'      => 'Видалити обране назавжди',
     'update_all_journals'         => 'Оновити ці транзакції',
     'also_delete_transactions'    => 'Єдина транзакція, що пов\'язана з цим рахунком, буде видалена.|Усі :count транзакції, пов\'язані з цим рахунком, також будуть видалені.',
-    'also_delete_transactions_js' => 'No transactions|The only transaction connected to this account will be deleted as well.|All {count} transactions connected to this account will be deleted as well.',
+    'also_delete_transactions_js' => 'Немає операцій|Єдина операція, що повʼязана з цим рахунком, буде також видалена.|Всі операції {count}, повʼязані з цим рахунком, будуть також видалені.',
     'also_delete_connections'     => 'Єдина транзакція, пов\'язана з цим типом посилання, втратить це з\'єднання. | Всі :count транзакції, пов\'язані з цим типом посилання втратять з\'єднання.',
     'also_delete_rules'           => 'Єдине правило, що пов\'язане з цією групою правил, буде видалено.|Усі :count правила, пов\'язані з цією групою правил, також будуть видалені.',
     'also_delete_piggyBanks'      => 'Єдина скарбничка, що пов\'язана з цим рахунком, буде видалена.|Усі :count скарбнички, пов\'язані з цим рахунком, також будуть видалені.',
-    'also_delete_piggyBanks_js'   => 'No piggy banks|The only piggy bank connected to this account will be deleted as well.|All {count} piggy banks connected to this account will be deleted as well.',
+    'also_delete_piggyBanks_js'   => 'Немає скарбничок|Єдина скарбничка, що пов\'язана з цим рахунком, буде видалена.|Всі скарбнички {count}, що пов\'язані з цим рахунком, також будуть видалені.',
     'not_delete_piggy_banks'      => 'Скарбничка, що пов\'язана з цією групою не буде видалена.| Усі :count скарбнички, що пов\'язані з цією групою не будуть видалені.',
     'bill_keep_transactions'      => 'Єдина транзакція, що пов\'язана з цією квитанцією, не буде видалена.|Усі :count транзакції, пов\'язані з цією квитанцією, уникнуть видалення.',
     'budget_keep_transactions'    => 'Єдина транзакція, що пов\'язана з цим бюджетом, не буде видалена.|Усі :count транзакції, пов\'язані з цим бюджетом, також уникнуть видалення.',
@@ -221,8 +221,8 @@ return [
     'blocked_code'                => 'Причина блокування',
     'login_name'                  => 'Логін',
     'is_owner'                    => 'Адміністратор?',
-    'url'                         => 'URL',
+    'url'                         => 'URL-адреса',
-    'bill_end_date'               => 'End date',
+    'bill_end_date'               => 'Кінцева дата',
 
     // import
     'apply_rules'                 => 'Застосувати правила',

resources/lang/uk_UA/rules.php

@@ -50,6 +50,8 @@ return [
     'already_has_destination'                     => 'This transaction already has ":name" as the destination account',
     'already_has_source'                          => 'This transaction already has ":name" as the source account',
     'already_linked_to_subscription'              => 'The transaction is already linked to subscription ":name"',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
     'cannot_find_subscription'                    => 'Firefly III can\'t find subscription ":name"',
     'no_notes_to_move'                            => 'The transaction has no notes to move to the description field',
     'no_tags_to_remove'                           => 'The transaction has no tags to remove',

resources/lang/vi_VN/rules.php

@@ -50,6 +50,8 @@ return [
     'already_has_destination'                     => 'This transaction already has ":name" as the destination account',
     'already_has_source'                          => 'This transaction already has ":name" as the source account',
     'already_linked_to_subscription'              => 'The transaction is already linked to subscription ":name"',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
     'cannot_find_subscription'                    => 'Firefly III can\'t find subscription ":name"',
     'no_notes_to_move'                            => 'The transaction has no notes to move to the description field',
     'no_tags_to_remove'                           => 'The transaction has no tags to remove',

resources/lang/zh_CN/rules.php

@@ -50,6 +50,8 @@ return [
     'already_has_destination'                     => 'This transaction already has ":name" as the destination account',
     'already_has_source'                          => 'This transaction already has ":name" as the source account',
     'already_linked_to_subscription'              => 'The transaction is already linked to subscription ":name"',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
     'cannot_find_subscription'                    => 'Firefly III can\'t find subscription ":name"',
     'no_notes_to_move'                            => 'The transaction has no notes to move to the description field',
     'no_tags_to_remove'                           => 'The transaction has no tags to remove',

resources/lang/zh_TW/rules.php

@@ -50,6 +50,8 @@ return [
     'already_has_destination'                     => 'This transaction already has ":name" as the destination account',
     'already_has_source'                          => 'This transaction already has ":name" as the source account',
     'already_linked_to_subscription'              => 'The transaction is already linked to subscription ":name"',
+    'already_linked_to_category'                  => 'The transaction is already linked to category ":name"',
+    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
     'cannot_find_subscription'                    => 'Firefly III can\'t find subscription ":name"',
     'no_notes_to_move'                            => 'The transaction has no notes to move to the description field',
     'no_tags_to_remove'                           => 'The transaction has no tags to remove',