Update meta files for new release.

.ci/php-cs-fixer/composer.lock

@@ -226,16 +226,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.27.0",
+            "version": "v3.28.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "e73ccaae1208f017bb7860986eebb3da48bd25d6"
+                "reference": "113e09fea3d2306319ffaa2423fe3de768b28cff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/e73ccaae1208f017bb7860986eebb3da48bd25d6",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/113e09fea3d2306319ffaa2423fe3de768b28cff",
-                "reference": "e73ccaae1208f017bb7860986eebb3da48bd25d6",
+                "reference": "113e09fea3d2306319ffaa2423fe3de768b28cff",
                 "shasum": ""
             },
             "require": {
@@ -309,7 +309,7 @@
             ],
             "support": {
                 "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.27.0"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.28.0"
             },
             "funding": [
                 {
@@ -317,7 +317,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-09-17T14:37:54+00:00"
+            "time": "2023-09-22T20:43:40+00:00"
         },
         {
             "name": "psr/container",

app/Api/V2/Request/Autocomplete/AutocompleteRequest.php

@@ -36,9 +36,9 @@ use Illuminate\Validation\Validator;
  */
 class AutocompleteRequest extends FormRequest
 {
-    protected array $acceptedRoles = [UserRoleEnum::MANAGE_TRANSACTIONS];
     use ConvertsDataTypes;
     use ChecksLogin;
+    protected array $acceptedRoles = [UserRoleEnum::MANAGE_TRANSACTIONS];
 
     /**
      * @return array

app/Api/V2/Request/Model/Transaction/StoreRequest.php

@@ -50,7 +50,6 @@ use Illuminate\Validation\Validator;
  */
 class StoreRequest extends FormRequest
 {
-    protected array $acceptedRoles = [UserRoleEnum::MANAGE_TRANSACTIONS];
     use ChecksLogin;
     use ConvertsDataTypes;
 
@@ -58,6 +57,7 @@ class StoreRequest extends FormRequest
     use GroupValidation;
     use CurrencyValidation;
     use AppendsLocationData;
+    protected array $acceptedRoles = [UserRoleEnum::MANAGE_TRANSACTIONS];
 
     /**
      * Get all data.

app/Http/Controllers/Recurring/TriggerController.php

@@ -22,25 +22,6 @@
  */
 
 declare(strict_types=1);
-/*
- * TriggerController.php
- * Copyright (c) 2022 james@firefly-iii.org
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
 
 namespace FireflyIII\Http\Controllers\Recurring;
 

app/Http/Requests/AccountFormRequest.php

@@ -37,10 +37,10 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class AccountFormRequest extends FormRequest
 {
-    protected array $acceptedRoles = [UserRoleEnum::MANAGE_TRANSACTIONS];
     use ConvertsDataTypes;
     use AppendsLocationData;
     use ChecksLogin;
+    protected array $acceptedRoles = [UserRoleEnum::MANAGE_TRANSACTIONS];
 
     /**
      * Get all data.

app/Providers/AccountServiceProvider.php

@@ -42,7 +42,9 @@ class AccountServiceProvider extends ServiceProvider
     /**
      * Bootstrap the application services.
      */
-    public function boot(): void {}
+    public function boot(): void
+    {
+    }
 
     /**
      * Register the application services.

app/Providers/BillServiceProvider.php

@@ -38,7 +38,9 @@ class BillServiceProvider extends ServiceProvider
     /**
      * Bootstrap the application services.
      */
-    public function boot(): void {}
+    public function boot(): void
+    {
+    }
 
     /**
      * Register the application services.

app/Providers/BudgetServiceProvider.php

@@ -50,7 +50,9 @@ class BudgetServiceProvider extends ServiceProvider
     /**
      * Bootstrap the application services.
      */
-    public function boot(): void {}
+    public function boot(): void
+    {
+    }
 
     /**
      * Register the application services.

app/Providers/PiggyBankServiceProvider.php

@@ -40,7 +40,9 @@ class PiggyBankServiceProvider extends ServiceProvider
     /**
      * Bootstrap the application services.
      */
-    public function boot(): void {}
+    public function boot(): void
+    {
+    }
 
     /**
      * Register the application services.

app/Validation/FireflyValidator.php

@@ -47,6 +47,7 @@ use PragmaRX\Google2FA\Exceptions\IncompatibleWithGoogleAuthenticatorException;
 use PragmaRX\Google2FA\Exceptions\InvalidCharactersException;
 use PragmaRX\Google2FA\Exceptions\SecretKeyTooShortException;
 use ValueError;
+
 use function is_string;
 
 /**

app/Validation/TransactionValidation.php

@@ -218,8 +218,7 @@ trait TransactionValidation
         array            $transaction,
         string           $transactionType,
         int              $index
-    ): void
+    ): void {
-    {
         Log::debug('Now in sanityCheckForeignCurrency()');
         if (0 !== $validator->errors()->count()) {
             Log::debug('Already have errors, return');

changelog.md

@@ -3,6 +3,35 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 6.0.25 - 2023-09-24
+
+### Changed
+
+- v2 index has better overview of bills (now called subscriptions)
+
+### Deprecated
+
+- My attempt to build the `v3`-layout is now officially deprecated and removed. To see the new layout (in beta), use `FIREFLY_III_LAYOUT=v2`.
+
+### Fixed
+
+- [Issue 7970](https://github.com/firefly-iii/firefly-iii/issues/7970) Bad redirect for mass edit/delete forms.
+- [Issue 7983](https://github.com/firefly-iii/firefly-iii/issues/7983) Bad math in the calculation of liabilities
+- [Issue 7973](https://github.com/firefly-iii/firefly-iii/issues/7973) Bad account validation broke certain imports
+- [Issue 7981](https://github.com/firefly-iii/firefly-iii/issues/7981) Menu had a bad link, thanks @Maxco10!
+- Slack alerts now use the correct URL
+- Better htaccess files thanks to Softaculous.
+
+### Security
+
+- Change htaccess rules so certain files can't be accessed.
+
+### API
+
+- [Issue 7972](https://github.com/firefly-iii/firefly-iii/issues/7972) The API needed start
+  *and* end parameters for transactions, this is no longer the case.
+- New APIs for user group and rights management. Not yet documented.
+
 ## 6.0.24 - 2023-09-16
 
 ### Fixed

config/firefly.php

@@ -112,7 +112,7 @@ return [
         'handle_debts' => true,
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => '6.0.24',
+    'version'                      => '6.0.25',
     'api_version'                  => '2.0.9',
     'db_version'                   => 20,
 

package-lock.json

@@ -655,9 +655,9 @@
             }
         },
         "node_modules/follow-redirects": {
-            "version": "1.15.2",
+            "version": "1.15.3",
-            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
-            "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+            "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
             "dev": true,
             "funding": [
                 {
@@ -865,9 +865,9 @@
             }
         },
         "node_modules/postcss": {
-            "version": "8.4.29",
+            "version": "8.4.30",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.29.tgz",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.30.tgz",
-            "integrity": "sha512-cbI+jaqIeu/VGqXEarWkRCCffhjgXc0qjBtXpqJhTBohMUjUQnbBr0xqX3vEKudc4iviTewcJo5ajcec5+wdJw==",
+            "integrity": "sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==",
             "dev": true,
             "funding": [
                 {
@@ -916,9 +916,9 @@
             "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
         },
         "node_modules/rollup": {
-            "version": "3.29.1",
+            "version": "3.29.2",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.1.tgz",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.2.tgz",
-            "integrity": "sha512-c+ebvQz0VIH4KhhCpDsI+Bik0eT8ZFEVZEYw0cGMVqIP8zc+gnwl7iXCamTw7vzv2MeuZFZfdx5JJIq+ehzDlg==",
+            "integrity": "sha512-CJouHoZ27v6siztc21eEQGo0kIcE5D1gVPA571ez0mMYb25LGYGKnVNXpEj5MGlepmDWGXNjDB5q7uNiPHC11A==",
             "dev": true,
             "bin": {
                 "rollup": "dist/bin/rollup"
@@ -932,9 +932,9 @@
             }
         },
         "node_modules/sass": {
-            "version": "1.67.0",
+            "version": "1.68.0",
-            "resolved": "https://registry.npmjs.org/sass/-/sass-1.67.0.tgz",
+            "resolved": "https://registry.npmjs.org/sass/-/sass-1.68.0.tgz",
-            "integrity": "sha512-SVrO9ZeX/QQyEGtuZYCVxoeAL5vGlYjJ9p4i4HFuekWl8y/LtJ7tJc10Z+ck1c8xOuoBm2MYzcLfTAffD0pl/A==",
+            "integrity": "sha512-Lmj9lM/fef0nQswm1J2HJcEsBUba4wgNx2fea6yJHODREoMFnwRpZydBnX/RjyXw2REIwdkbqE4hrTo4qfDBUA==",
             "dev": true,
             "dependencies": {
                 "chokidar": ">=3.0.0 <4.0.0",

public/build/manifest.json

@@ -30,10 +30,10 @@
     "integrity": "sha384-B73JAwYNSgI4rwb14zwxigHgAkg1Ms+j6+9sJoDpiL11+VW5RjQCLfIh0RVoi0h6"
   },
   "resources/assets/v2/pages/dashboard/dashboard.js": {
-    "file": "assets/dashboard-4ff29763.js",
+    "file": "assets/dashboard-b749bce8.js",
     "isEntry": true,
     "src": "resources/assets/v2/pages/dashboard/dashboard.js",
-    "integrity": "sha384-fYlKWCspBoR7oMXyULGBltY8pcSYJPXrzKzz0Kt99RueUdYoyAa78+kMftyKdoLd"
+    "integrity": "sha384-TvAKEMJR8ONhKUtSgHwMgfm3VeK89DxeTTgj9L9CLSaYYbwX5sZZVM+U672RgNDU"
   },
   "resources/assets/v2/sass/app.scss": {
     "file": "assets/app-28a195fd.css",

public/v2/i18n/bg_BG.json

@@ -9,8 +9,8 @@
             "paid": "\u041f\u043b\u0430\u0442\u0435\u043d\u0438",
             "unpaid": "\u041d\u0435\u043f\u043b\u0430\u0442\u0435\u043d\u0438",
             "default_group_title_name_plain": "ungrouped",
-            "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
+            "subscriptions_in_group": "Suscripciones en el grupo \"%{title}\"",
-            "subscr_expected_x_times": "Expect to pay %{amount} %{times} times this period",
+            "subscr_expected_x_times": "Se debe pagar %{amount} %{times} veces este periodo",
             "overspent": "\u041f\u0440\u0435\u0440\u0430\u0437\u0445\u043e\u0434",
             "money_flowing_in": "\u0412\u0445\u043e\u0434\u044f\u0449\u0438",
             "money_flowing_out": "\u0418\u0437\u0445\u043e\u0434\u044f\u0449\u0438",

public/v2/i18n/de_DE.json

@@ -9,8 +9,8 @@
             "paid": "Bezahlt",
             "unpaid": "Unbezahlt",
             "default_group_title_name_plain": "ungruppiert",
-            "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
+            "subscriptions_in_group": "Abonnements in Gruppe \"%{title}\"",
-            "subscr_expected_x_times": "Expect to pay %{amount} %{times} times this period",
+            "subscr_expected_x_times": "Die Zahlung von %{amount} wird in diesem Zeitraum %{times}-mal erwartet",
             "overspent": "Zuviel ausgegeben",
             "money_flowing_in": "Eingehend",
             "money_flowing_out": "Ausgehend",

public/v2/i18n/es_ES.json

@@ -9,8 +9,8 @@
             "paid": "Pagado",
             "unpaid": "No pagado",
             "default_group_title_name_plain": "sin agrupar",
-            "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
+            "subscriptions_in_group": "Suscripciones en el grupo \"%{title}\"",
-            "subscr_expected_x_times": "Expect to pay %{amount} %{times} times this period",
+            "subscr_expected_x_times": "Se espera pagar %{amount} %{times} veces este periodo",
             "overspent": "Sobrepasadas",
             "money_flowing_in": "Entrada",
             "money_flowing_out": "Salida",

public/v2/i18n/fr_FR.json

@@ -9,8 +9,8 @@
             "paid": "Pay\u00e9",
             "unpaid": "Impay\u00e9",
             "default_group_title_name_plain": "non group\u00e9",
-            "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
+            "subscriptions_in_group": "Abonnements dans le groupe \"%{title}\"",
-            "subscr_expected_x_times": "Expect to pay %{amount} %{times} times this period",
+            "subscr_expected_x_times": "%{amount} \u00e0 payer %{times} fois cette p\u00e9riode",
             "overspent": "Trop d\u00e9pens\u00e9",
             "money_flowing_in": "Entr\u00e9e",
             "money_flowing_out": "Sortie",

public/v2/i18n/ja_JP.json

@@ -9,7 +9,7 @@
             "paid": "\u652f\u6255\u3044\u6e08\u307f",
             "unpaid": "\u672a\u6255\u3044",
             "default_group_title_name_plain": "\u30b0\u30eb\u30fc\u30d7\u89e3\u9664",
-            "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
+            "subscriptions_in_group": "\u30b0\u30eb\u30fc\u30d7\u300c%{title}\u300d\u306e\u30b5\u30d6\u30b9\u30af\u30ea\u30d7\u30b7\u30e7\u30f3",
             "subscr_expected_x_times": "Expect to pay %{amount} %{times} times this period",
             "overspent": "\u4f7f\u3044\u3059\u304e",
             "money_flowing_in": "\u5165",

public/v2/i18n/nl_NL.json

@@ -9,8 +9,8 @@
             "paid": "Betaald",
             "unpaid": "Niet betaald",
             "default_group_title_name_plain": "ongegroepeerd",
-            "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
+            "subscriptions_in_group": "Abonnementen in groep \"%{title}\"",
-            "subscr_expected_x_times": "Expect to pay %{amount} %{times} times this period",
+            "subscr_expected_x_times": "Verwacht %{amount} %{times} keer te betalen in deze periode",
             "overspent": "Teveel uitgegeven",
             "money_flowing_in": "In",
             "money_flowing_out": "Uit",

public/v2/i18n/ru_RU.json

@@ -9,8 +9,8 @@
             "paid": "\u041e\u043f\u043b\u0430\u0447\u0435\u043d\u043e",
             "unpaid": "\u041d\u0435 \u043e\u043f\u043b\u0430\u0447\u0435\u043d\u043e",
             "default_group_title_name_plain": "ungrouped",
-            "subscriptions_in_group": "Subscriptions in group \"%{title}\"",
+            "subscriptions_in_group": "\u041f\u043e\u0434\u043f\u0438\u0441\u043a\u0438 \u0432 \u0433\u0440\u0443\u043f\u043f\u0435 \"%{title}\"",
-            "subscr_expected_x_times": "Expect to pay %{amount} %{times} times this period",
+            "subscr_expected_x_times": "\u041e\u0436\u0438\u0434\u0430\u0435\u0442\u0441\u044f \u043e\u043f\u043b\u0430\u0442\u0430 %{amount} %{times} \u0440\u0430\u0437 \u0437\u0430 \u044d\u0442\u043e\u0442 \u043f\u0435\u0440\u0438\u043e\u0434",
             "overspent": "\u041f\u0435\u0440\u0435\u0440\u0430\u0441\u0445\u043e\u0434",
             "money_flowing_in": "\u0412",
             "money_flowing_out": "\u0418\u0437",

resources/assets/js/locales/nn.json

@@ -68,16 +68,16 @@
         "profile_oauth_edit_client": "Rediger Klient",
         "profile_oauth_name_help": "Noe brukarane dine vil gjenkjenne og stole p\u00e5.",
         "profile_oauth_redirect_url": "Videresendings-URL",
-        "profile_oauth_clients_external_auth": "Om du brukar ein ekstern autentiseringsleverand\u00f8r, som Authelia, vil ikkje OAuth klienter fungera. Du kan berre bruka personlige tilgangstokener.",
+        "profile_oauth_clients_external_auth": "Om du brukar ein ekstern autentiseringsleverand\u00f8r, som Authelia, vil ikkje OAuth klientar fungera. Du kan berre bruka personlege tilgangsn\u00f8klar.",
         "profile_oauth_redirect_url_help": "Programmets tilbakekallingslenkje for autorisering.",
         "profile_authorized_apps": "Dine autoriserte applikasjoner",
         "profile_authorized_clients": "Autoriserte klienter",
         "profile_scopes": "Omfang",
         "profile_revoke": "Tilbakekall",
-        "profile_personal_access_tokens": "Personlig tilgangsn\u00f8kkel (Tokens)",
+        "profile_personal_access_tokens": "Personleg tilgangsn\u00f8kkel",
-        "profile_personal_access_token": "Personlig tilgangsn\u00f8kkel (Token)",
+        "profile_personal_access_token": "Personleg tilgangsn\u00f8kkel",
         "profile_personal_access_token_explanation": "Her er din nye klient \"secret\". Dette er den eneste tiden det blir vist s\u00e5 ikkje mister den! Du kan no bruka denne token til \u00e5 laga API-foresp\u00f8rsler.",
-        "profile_no_personal_access_token": "Du har ikkje oppretta nokon personlig tilgangsn\u00f8kkel (tokens).",
+        "profile_no_personal_access_token": "Du har ikkje oppretta personlege tilgangsn\u00f8klar.",
         "profile_create_new_token": "Opprette nytt token",
         "profile_create_token": "Opprett token",
         "profile_create": "Opprett",

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

@@ -23,7 +23,7 @@ import dates from '../../pages/shared/dates.js';
 import {createEmptySplit} from "./shared/create-empty-split.js";
 import {parseFromEntries} from "./shared/parse-from-entries.js";
 import formatMoney from "../../util/format-money.js";
-//import Autocomplete from "bootstrap5-autocomplete";
+import Autocomplete from "bootstrap5-autocomplete";
 import Post from "../../api/v2/model/transaction/post.js";
 
 let transactions = function () {
@@ -38,9 +38,59 @@ let transactions = function () {
         showError: false,
         showSuccess: false,
 
+        addedSplit() {
+            console.log('addedSplit');
+            const opts = {
+                onSelectItem: console.log,
+            };
+            var src = [];
+            for (let i = 0; i < 50; i++) {
+                src.push({
+                    title: "Option " + i,
+                    id: "opt" + i,
+                    data: {
+                        key: i,
+                    },
+                });
+            }
+
+            Autocomplete.init("input.autocomplete", {
+                items: src,
+                valueField: "id",
+                labelField: "title",
+                highlightTyped: true,
+                onSelectItem: console.log,
+            });
+
+
+            // setTimeout(() => {
+            //     console.log('timed out');
+            //     console.log(document.querySelector('input.autocomplete'));
+
+            // }, 1500);
+
+        },
+
         init() {
             console.log('init()');
             this.addSplit();
+
+            // // We can use regular objects as source and customize label
+            // new Autocomplete(document.getElementById("autocompleteRegularInput"), {
+            //     items: {
+            //         opt_some: "Some",
+            //         opt_value: "Value",
+            //         opt_here: "Here is a very long element that should be truncated",
+            //         opt_dia: "çaça"
+            //     },
+            //     onRenderItem: (item, label) => {
+            //         return label + " (" + item.value + ")";
+            //     },
+            // });
+            // new Autocomplete(document.getElementById("autocompleteDatalist"), opts);
+            //new Autocomplete(document.getElementById("autocompleteRemote"), opts);
+            // new Autocomplete(document.getElementById("autocompleteLiveRemote"), opts);
+
         },
         submitTransaction() {
             // todo disable buttons
@@ -53,14 +103,21 @@ let transactions = function () {
                 apply_rules: false,
                 transactions: transactions
             };
+            if (transactions.length > 1) {
+                // todo improve me
+                submission.group_title = transactions[0].description;
+            }
             let poster = new Post();
             console.log(submission);
             poster.post(submission).then((response) => {
                 // todo create success banner
                 this.showSuccessMessage = true;
-                // todo or redirect to transaction.
                 // todo release form
                 console.log(response);
+
+                // todo or redirect to transaction.
+                window.location = 'transactions/show/' + response.data.data.id + '?transaction_group_id=' + response.data.data.id + '&message=created';
+
             }).catch((error) => {
                 this.showErrorMessage = true;
                 // todo create error banner.

resources/lang/bg_BG/firefly.php

@@ -1731,10 +1731,10 @@ return [
     'remove_budgeted_amount'                    => 'Премахнете сумата на бюджета в :currency',
 
     // bills:
-    'subscription'                              => 'Subscription',
+    'subscription'                              => 'Suscripción',
     'not_expected_period'                       => 'Не се очаква този период',
-    'subscriptions_in_group'                    => 'Subscriptions in group "%{title}"',
+    'subscriptions_in_group'                    => 'Suscripciones en el grupo "%{title}"',
-    'subscr_expected_x_times'                   => 'Expect to pay %{amount} %{times} times this period',
+    'subscr_expected_x_times'                   => 'Se debe pagar %{amount} %{times} veces este periodo',
     'not_or_not_yet'                            => '(Все още) не',
     'visit_bill'                                => 'Visit bill ":name" at Firefly III',
     'match_between_amounts'                     => 'Сметката "търси" транзакции между :low и :high.',
@@ -1771,7 +1771,7 @@ return [
     'bill_edit_rules'                           => 'Firefly III ще се опита да редактира и правилото, свързано с тази сметка. Ако сами сте редактирали това правило, Firefly III няма да промени нищо.|Firefly III също ще се опита да редактира и :count правила, свързани с тази сметка. Ако сами сте редактирали тези правила, Firefly III няма да промени нищо.',
     'bill_expected_date'                        => 'Очаквано :date',
     'bill_expected_date_js'                     => 'Expected {date}',
-    'expected_amount'                           => '(Expected) amount',
+    'expected_amount'                           => 'Importe (Previsto)',
     'bill_paid_on'                              => 'Paid on {date}',
     'bill_repeats_weekly'                       => 'Повтаря се седмично',
     'bill_repeats_monthly'                      => 'Повтаря се месечно',

resources/lang/bg_BG/validation.php

@@ -59,7 +59,8 @@ return [
     'transaction_types_equal'        => 'Всички разделяния трябва да са от един и същи тип.',
     'invalid_transaction_type'       => 'Невалиден тип транзакция.',
     'invalid_selection'              => 'Изборът ви е невалиден.',
-    'belongs_user'                   => 'Тази стойност е невалидна за това поле.',
+    'belongs_user'                   => 'This value is linked to an object that does not belong to you.',
+    'belongs_user_or_user_group'     => 'This value is linked to an object that does not belong to your current financial administration.',
     'at_least_one_transaction'       => 'Нужна е поне една транзакция.',
     'recurring_transaction_id'       => 'Need at least one transaction.',
     'need_id_to_match'               => 'You need to submit this entry with an ID for the API to be able to match it.',

resources/lang/ca_ES/validation.php

@@ -59,7 +59,8 @@ return [
     'transaction_types_equal'        => 'Totes les divisions han de ser del mateix tipus.',
     'invalid_transaction_type'       => 'Tipus de transacció invàlid.',
     'invalid_selection'              => 'La selecció és invàlida.',
-    'belongs_user'                   => 'Aquest valor no és vàlid per aquest camp.',
+    'belongs_user'                   => 'This value is linked to an object that does not belong to you.',
+    'belongs_user_or_user_group'     => 'This value is linked to an object that does not belong to your current financial administration.',
     'at_least_one_transaction'       => 'Necessites almenys una transacció.',
     'recurring_transaction_id'       => 'Necessites almenys una transacció.',
     'need_id_to_match'               => 'Has d\'enviar aquesta entrada amb un ID perquè l\'API sigui capaç de comparar-lo.',

resources/lang/cs_CZ/validation.php

@@ -59,7 +59,8 @@ return [
     'transaction_types_equal'        => 'Je třeba, aby všechna rozdělení byla stejného typu.',
     'invalid_transaction_type'       => 'Neplatný typ transakce.',
     'invalid_selection'              => 'Váš výběr je neplatný.',
-    'belongs_user'                   => 'Tato hodnota není platná pro toto pole.',
+    'belongs_user'                   => 'This value is linked to an object that does not belong to you.',
+    'belongs_user_or_user_group'     => 'This value is linked to an object that does not belong to your current financial administration.',
     'at_least_one_transaction'       => 'Potřebujete alespoň jednu transakci.',
     'recurring_transaction_id'       => 'Need at least one transaction.',
     'need_id_to_match'               => 'You need to submit this entry with an ID for the API to be able to match it.',

resources/lang/da_DK/validation.php

@@ -59,7 +59,8 @@ return [
     'transaction_types_equal'        => 'Alle opsplitninger skal være af samme type.',
     'invalid_transaction_type'       => 'Ugyldig overførelsestype.',
     'invalid_selection'              => 'Din markering er ikke gyldig.',
-    'belongs_user'                   => 'Denne værdi er ikke gyldig for dette felt.',
+    'belongs_user'                   => 'This value is linked to an object that does not belong to you.',
+    'belongs_user_or_user_group'     => 'This value is linked to an object that does not belong to your current financial administration.',
     'at_least_one_transaction'       => 'Kræver mindst en overførsel.',
     'recurring_transaction_id'       => 'Need at least one transaction.',
     'need_id_to_match'               => 'You need to submit this entry with an ID for the API to be able to match it.',

resources/lang/de_DE/firefly.php

@@ -1731,10 +1731,10 @@ return [
     'remove_budgeted_amount'                    => 'Budgetbetrag in :currency entfernen',
 
     // bills:
-    'subscription'                              => 'Subscription',
+    'subscription'                              => 'Abonnement',
     'not_expected_period'                       => 'In diesem Zeitraum nicht erwartet',
-    'subscriptions_in_group'                    => 'Subscriptions in group "%{title}"',
+    'subscriptions_in_group'                    => 'Abonnements in Gruppe "%{title}"',
-    'subscr_expected_x_times'                   => 'Expect to pay %{amount} %{times} times this period',
+    'subscr_expected_x_times'                   => 'Die Zahlung von %{amount} wird in diesem Zeitraum %{times}-mal erwartet',
     'not_or_not_yet'                            => '(Noch) nicht',
     'visit_bill'                                => 'Rechnung ":name" in Firefly III aufrufen',
     'match_between_amounts'                     => 'Rechnung passt zu Transaktionen zwischen :low und :high.',
@@ -1771,7 +1771,7 @@ return [
     'bill_edit_rules'                           => 'Firefly III wird versuchen, auch die mit dieser Rechnung zusammenhängende Regel zu ändern. Wenn Sie diese Regel jedoch selbst bearbeitet haben, wird Firefly III nichts ändern.|Firefly III wird versuchen, die :count mit dieser Rechnung zusammenhängenden Regeln ebenfalls zu bearbeiten. Wenn Sie diese Regeln jedoch selbst bearbeitet haben, wird Firefly III nichts ändern.',
     'bill_expected_date'                        => 'Voraussichtlich :date',
     'bill_expected_date_js'                     => 'Erwartet {date}',
-    'expected_amount'                           => '(Expected) amount',
+    'expected_amount'                           => '(Erwarteter) Betrag',
     'bill_paid_on'                              => 'Bezahlt am {date}',
     'bill_repeats_weekly'                       => 'Wiederholt sich wöchentlich',
     'bill_repeats_monthly'                      => 'Wiederholt sich monatlich',

resources/lang/de_DE/rules.php

@@ -46,11 +46,11 @@ return [
     'unsupported_transaction_type_withdrawal'     => 'Firefly III kann eine ":type" nicht in eine Auszahlung konvertieren',
     'unsupported_transaction_type_deposit'        => 'Firefly III kann ein ":type" nicht in eine Einzahlung umwandeln',
     '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_source_asset'                    => 'Diese Transaktion hat bereits ":name" als Quellkonto',
-    'already_has_destination_asset'               => 'This transaction already has ":name" as the destination asset account',
+    'already_has_destination_asset'               => 'Diese Transaktion hat bereits ":name" als Zielkonto',
     'already_has_destination'                     => 'Diese Transaktion hat bereits ":name" als Zielkonto',
     '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_subscription'              => 'Die Transaktion ist bereits mit dem Abonnement ":name " verknüpft',
     'already_linked_to_category'                  => 'Die Transaktion ist bereits mit der Kategorie ":name" verknüpft',
     'already_linked_to_budget'                    => 'Die Transaktion ist bereits mit Budget ":name" verknüpft',
     'cannot_find_subscription'                    => 'Firefly III kann das Abonnement ":name" nicht finden',

resources/lang/de_DE/validation.php

@@ -59,7 +59,8 @@ return [
     'transaction_types_equal'        => 'Alle Aufteilungen müssen vom gleichen Typ sein.',
     'invalid_transaction_type'       => 'Ungültige Transaktionstyp',
     'invalid_selection'              => 'Ihre Auswahl ist ungültig.',
-    'belongs_user'                   => 'Dieser Wert ist für dieses Feld ungültig.',
+    'belongs_user'                   => 'This value is linked to an object that does not belong to you.',
+    'belongs_user_or_user_group'     => 'This value is linked to an object that does not belong to your current financial administration.',
     'at_least_one_transaction'       => 'Sie brauchen mindestens eine Transaktion.',
     'recurring_transaction_id'       => 'Sie benötigen mindestens eine Buchung.',
     'need_id_to_match'               => 'Sie müssen diesen Eintrag mit einer ID übermitteln, damit die API ihn zuordnen kann.',

resources/lang/el_GR/validation.php

@@ -59,7 +59,8 @@ return [
     'transaction_types_equal'        => 'Όλοι οι διαχωρισμοί πρέπει να είναι ίδιου τύπου.',
     'invalid_transaction_type'       => 'Μη έγκυρος τύπος συναλλαγής.',
     'invalid_selection'              => 'Η επιλογή σας δεν είναι έγκυρη.',
-    'belongs_user'                   => 'Αυτή η τιμή δεν είναι έγκυρη για αυτό το πεδίο.',
+    'belongs_user'                   => 'This value is linked to an object that does not belong to you.',
+    'belongs_user_or_user_group'     => 'This value is linked to an object that does not belong to your current financial administration.',
     'at_least_one_transaction'       => 'Απαιτείται τουλάχιστο μία συναλλαγή.',
     'recurring_transaction_id'       => 'Need at least one transaction.',
     'need_id_to_match'               => 'You need to submit this entry with an ID for the API to be able to match it.',

resources/lang/en_GB/validation.php

@@ -59,7 +59,8 @@ return [
     'transaction_types_equal'        => 'All splits must be of the same type.',
     'invalid_transaction_type'       => 'Invalid transaction type.',
     'invalid_selection'              => 'Your selection is invalid.',
-    'belongs_user'                   => 'This value is invalid for this field.',
+    'belongs_user'                   => 'This value is linked to an object that does not belong to you.',
+    'belongs_user_or_user_group'     => 'This value is linked to an object that does not belong to your current financial administration.',
     'at_least_one_transaction'       => 'Need at least one transaction.',
     'recurring_transaction_id'       => 'Need at least one transaction.',
     'need_id_to_match'               => 'You need to submit this entry with an ID for the API to be able to match it.',

resources/lang/es_ES/firefly.php

@@ -1731,10 +1731,10 @@ return [
     'remove_budgeted_amount'                    => 'Eliminar la cantidad presupuestada en :currency',
 
     // bills:
-    'subscription'                              => 'Subscription',
+    'subscription'                              => 'Subscripción',
     'not_expected_period'                       => 'No se espera en este período',
-    'subscriptions_in_group'                    => 'Subscriptions in group "%{title}"',
+    'subscriptions_in_group'                    => 'Suscripciones en el grupo "%{title}"',
-    'subscr_expected_x_times'                   => 'Expect to pay %{amount} %{times} times this period',
+    'subscr_expected_x_times'                   => 'Se espera pagar %{amount} %{times} veces este periodo',
     'not_or_not_yet'                            => 'No (todavía)',
     'visit_bill'                                => 'Ver factura ":name" en Firefly III',
     'match_between_amounts'                     => 'La cuenta iguala transacciones entre :low y :high.',
@@ -1771,7 +1771,7 @@ return [
     'bill_edit_rules'                           => 'Firefly III también intentará editar la regla relacionada con esta factura. Sin embargo, si ha editado esta regla usted mismo, Firefly III no cambiará nada.|Firefly III intentará editar también las :count reglas relacionadas con esta factura. Sin embargo, si ha editado estas reglas usted mismo, Firefly III no cambiará nada.',
     'bill_expected_date'                        => 'Se espera :date',
     'bill_expected_date_js'                     => 'Fecha prevista {date}',
-    'expected_amount'                           => '(Expected) amount',
+    'expected_amount'                           => 'Cantidad (esperada)',
     'bill_paid_on'                              => 'Pagado el {date}',
     'bill_repeats_weekly'                       => 'Repetir semanalmente',
     'bill_repeats_monthly'                      => 'Repetir mensualmente',

resources/lang/es_ES/validation.php

@@ -59,7 +59,8 @@ return [
     'transaction_types_equal'        => 'Todas las divisiones deben ser del mismo tipo.',
     'invalid_transaction_type'       => 'Tipo de transacción inválido.',
     'invalid_selection'              => 'Tu selección no es válida.',
-    'belongs_user'                   => 'Este valor no es válido para este campo.',
+    'belongs_user'                   => 'This value is linked to an object that does not belong to you.',
+    'belongs_user_or_user_group'     => 'This value is linked to an object that does not belong to your current financial administration.',
     'at_least_one_transaction'       => 'Se necesita al menos una transacción.',
     'recurring_transaction_id'       => 'Se necesita al menos una transacción.',
     'need_id_to_match'               => 'Necesitas registrar esta entrada con un ID para que la API pueda hacerla coincidir.',

resources/lang/fi_FI/validation.php

@@ -59,7 +59,8 @@ return [
     'transaction_types_equal'        => 'Kaikkien jaettujen osien täytyy olla samaa tyyppiä.',
     'invalid_transaction_type'       => 'Virheellinen tapahtuman tyyppi.',
     'invalid_selection'              => 'Valintasi on virheellinen.',
-    'belongs_user'                   => 'Arvo ei kelpaa tähän kenttään.',
+    'belongs_user'                   => 'This value is linked to an object that does not belong to you.',
+    'belongs_user_or_user_group'     => 'This value is linked to an object that does not belong to your current financial administration.',
     'at_least_one_transaction'       => 'Tarvitaan vähintään yksi tapahtuma.',
     'recurring_transaction_id'       => 'Need at least one transaction.',
     'need_id_to_match'               => 'You need to submit this entry with an ID for the API to be able to match it.',

resources/lang/fr_FR/firefly.php

@@ -1731,10 +1731,10 @@ return [
     'remove_budgeted_amount'                    => 'Supprimer le montant budgétisé en :currency',
 
     // bills:
-    'subscription'                              => 'Subscription',
+    'subscription'                              => 'Abonnement',
     'not_expected_period'                       => 'Pas attendu cette période',
-    'subscriptions_in_group'                    => 'Subscriptions in group "%{title}"',
+    'subscriptions_in_group'                    => 'Abonnements dans le groupe "%{title}"',
-    'subscr_expected_x_times'                   => 'Expect to pay %{amount} %{times} times this period',
+    'subscr_expected_x_times'                   => '%{amount} à payer %{times} fois cette période',
     'not_or_not_yet'                            => 'Non (pas encore)',
     'visit_bill'                                => 'Consultez la facture ":name" sur Firefly III',
     'match_between_amounts'                     => 'La facture correspond à des opérations entre :low et :high.',
@@ -1771,7 +1771,7 @@ return [
     'bill_edit_rules'                           => 'Firefly III tentera également de modifier la règle relative à cette facture. Si vous avez modifié cette règle vous-même, Firefly III ne changera rien. Firefly III tentera également de modifier les :count règles relatives à cette facture. Si vous avez modifié ces règles vous-même, Firefly III ne changera rien.',
     'bill_expected_date'                        => 'Prévu :date',
     'bill_expected_date_js'                     => 'Attendu le {date}',
-    'expected_amount'                           => '(Expected) amount',
+    'expected_amount'                           => 'Montant (attendu)',
     'bill_paid_on'                              => 'Payé le {date}',
     'bill_repeats_weekly'                       => 'Se répète toutes les semaines',
     'bill_repeats_monthly'                      => 'Se répète tous les mois',

resources/lang/fr_FR/validation.php

@@ -59,7 +59,8 @@ return [
     'transaction_types_equal'        => 'Toutes les ventilations doivent être de même type.',
     'invalid_transaction_type'       => 'Type d\'opération non valide.',
     'invalid_selection'              => 'Votre sélection est invalide.',
-    'belongs_user'                   => 'Cette valeur n\'est pas valide pour ce champ.',
+    'belongs_user'                   => 'This value is linked to an object that does not belong to you.',
+    'belongs_user_or_user_group'     => 'This value is linked to an object that does not belong to your current financial administration.',
     'at_least_one_transaction'       => 'Besoin d\'au moins une opération.',
     'recurring_transaction_id'       => 'Au moins une opération est nécessaire.',
     'need_id_to_match'               => 'Vous devez saisir cette entrée avec un identifiant pour que l\'API puisse la faire correspondre.',

resources/lang/hu_HU/validation.php

@@ -59,7 +59,8 @@ return [
     'transaction_types_equal'        => 'Minden felosztásnak ugyanolyan típusúnak kell lennie.',
     'invalid_transaction_type'       => 'Érvénytelen tranzakciótípus.',
     'invalid_selection'              => 'Érvénytelen kiválasztás.',
-    'belongs_user'                   => 'Az érték nem érvényes erre a mezőre.',
+    'belongs_user'                   => 'This value is linked to an object that does not belong to you.',
+    'belongs_user_or_user_group'     => 'This value is linked to an object that does not belong to your current financial administration.',
     'at_least_one_transaction'       => 'Legalább egy tranzakció szükséges.',
     'recurring_transaction_id'       => 'Need at least one transaction.',
     'need_id_to_match'               => 'You need to submit this entry with an ID for the API to be able to match it.',

resources/lang/id_ID/validation.php

@@ -59,7 +59,8 @@ return [
     'transaction_types_equal'        => 'Semua pisahan harus mempunyai jenis yang sama.',
     'invalid_transaction_type'       => 'Jenis transaksi tidak valid.',
     'invalid_selection'              => 'Pilihan Anda tidak valid.',
-    'belongs_user'                   => 'Nilai ini tidak sah untuk bidang ini.',
+    'belongs_user'                   => 'This value is linked to an object that does not belong to you.',
+    'belongs_user_or_user_group'     => 'This value is linked to an object that does not belong to your current financial administration.',
     'at_least_one_transaction'       => 'Minimal harus ada satu transaksi.',
     'recurring_transaction_id'       => 'Need at least one transaction.',
     'need_id_to_match'               => 'You need to submit this entry with an ID for the API to be able to match it.',

resources/lang/it_IT/validation.php

@@ -59,7 +59,8 @@ return [
     'transaction_types_equal'        => 'Tutte le suddivisioni devono essere dello stesso tipo.',
     'invalid_transaction_type'       => 'Tipo della transazione non valido.',
     'invalid_selection'              => 'La tua selezione non è valida.',
-    'belongs_user'                   => 'Questo valore non è valido per questo campo.',
+    'belongs_user'                   => 'This value is linked to an object that does not belong to you.',
+    'belongs_user_or_user_group'     => 'This value is linked to an object that does not belong to your current financial administration.',
     'at_least_one_transaction'       => 'Hai bisogno di almeno una transazione.',
     'recurring_transaction_id'       => 'Need at least one transaction.',
     'need_id_to_match'               => 'You need to submit this entry with an ID for the API to be able to match it.',

resources/lang/ja_JP/firefly.php

@@ -1731,9 +1731,9 @@ return [
     'remove_budgeted_amount'                    => ':currency で予算を削除する',
 
     // bills:
-    'subscription'                              => 'Subscription',
+    'subscription'                              => 'サブスクリプション',
     'not_expected_period'                       => 'この期間には予定なし',
-    'subscriptions_in_group'                    => 'Subscriptions in group "%{title}"',
+    'subscriptions_in_group'                    => 'グループ「%{title}」のサブスクリプション',
     'subscr_expected_x_times'                   => 'Expect to pay %{amount} %{times} times this period',
     'not_or_not_yet'                            => '(まだ) なし',
     'visit_bill'                                => 'Firefly IIIの請求「:name」を開く',
@@ -1771,7 +1771,7 @@ return [
     'bill_edit_rules'                           => 'Firefly III は、この請求に関連するルールの編集を試みます。 ただし、このルールをあなたが編集している場合、Firefly III は何も変更しません。 Firefly III は、この請求に関連する :count 件のルールも編集します。 ただし、これらのルールをあなたが編集している場合、Firefly III は何も変更しません。',
     'bill_expected_date'                        => '予定日 :date',
     'bill_expected_date_js'                     => '予定日 {date}',
-    'expected_amount'                           => '(Expected) amount',
+    'expected_amount'                           => '(予想される) 金額',
     'bill_paid_on'                              => '{date} に支払い済み',
     'bill_repeats_weekly'                       => '毎週の繰り返し',
     'bill_repeats_monthly'                      => '毎月の繰り返し',

resources/lang/ja_JP/validation.php

@@ -59,7 +59,8 @@ return [
     'transaction_types_equal'        => 'すべての分割は同じ種別である必要があります。',
     'invalid_transaction_type'       => '無効な取引種別です。',
     'invalid_selection'              => 'あなたの選択は無効です。',
-    'belongs_user'                   => 'この欄ではその値は無効です。',
+    'belongs_user'                   => 'This value is linked to an object that does not belong to you.',
+    'belongs_user_or_user_group'     => 'This value is linked to an object that does not belong to your current financial administration.',
     'at_least_one_transaction'       => '最低でも一つの取引が必要です。',
     'recurring_transaction_id'       => '少なくとも 1 つの取引が必要です。',
     'need_id_to_match'               => 'APIを一致させるためにこのエントリをIDで送信する必要があります。',

resources/lang/ko_KR/validation.php

@@ -59,7 +59,8 @@ return [
     'transaction_types_equal'        => '모든 분할은 동일한 유형이어야 합니다.',
     'invalid_transaction_type'       => '잘못된 거래 유형입니다.',
     'invalid_selection'              => '선택이 잘못되었습니다.',
-    'belongs_user'                   => '이 값은 이 필드에 유효하지 않습니다.',
+    'belongs_user'                   => 'This value is linked to an object that does not belong to you.',
+    'belongs_user_or_user_group'     => 'This value is linked to an object that does not belong to your current financial administration.',
     'at_least_one_transaction'       => '하나 이상의 거래가 필요합니다.',
     'recurring_transaction_id'       => '하나 이상의 거래가 필요합니다.',
     'need_id_to_match'               => 'API가 일치시킬수 있도록 이 엔트리를 ID와 함께 제출해야 합니다.',

resources/lang/nb_NO/validation.php

@@ -59,7 +59,8 @@ return [
     'transaction_types_equal'        => 'Alle deler må være av samme type.',
     'invalid_transaction_type'       => 'Ugyldig transaksjonstype.',
     'invalid_selection'              => 'Dine valg er ugyldig.',
-    'belongs_user'                   => 'Denne verdien er ugyldig for dette feltet.',
+    'belongs_user'                   => 'This value is linked to an object that does not belong to you.',
+    'belongs_user_or_user_group'     => 'This value is linked to an object that does not belong to your current financial administration.',
     'at_least_one_transaction'       => 'Trenger minst én transaksjon.',
     'recurring_transaction_id'       => 'Need at least one transaction.',
     'need_id_to_match'               => 'You need to submit this entry with an ID for the API to be able to match it.',

resources/lang/nl_NL/firefly.php

@@ -1731,10 +1731,10 @@ return [
     'remove_budgeted_amount'                    => 'Verwijder gebudgetteerd bedrag in :currency',
 
     // bills:
-    'subscription'                              => 'Subscription',
+    'subscription'                              => 'Abonnement',
     'not_expected_period'                       => 'Niet verwacht deze periode',
-    'subscriptions_in_group'                    => 'Subscriptions in group "%{title}"',
+    'subscriptions_in_group'                    => 'Abonnementen in groep "%{title}"',
-    'subscr_expected_x_times'                   => 'Expect to pay %{amount} %{times} times this period',
+    'subscr_expected_x_times'                   => 'Verwacht %{amount} %{times} keer te betalen in deze periode',
     'not_or_not_yet'                            => '(nog) niet',
     'visit_bill'                                => 'Bezoek contract ":name" bij Firefly III',
     'match_between_amounts'                     => 'Contract past bij transacties tussen :low en :high.',
@@ -1771,7 +1771,7 @@ return [
     'bill_edit_rules'                           => 'Firefly III gaat proberen de gerelateerde regel ook aan te passen. Als je deze zelf al hebt gewijzigd echter, zal dit niet gebeuren.|Firefly III gaat proberen de :count gerelateerde regels ook aan te passen. Als je deze zelf al hebt gewijzigd echter, zal dit niet gebeuren.',
     'bill_expected_date'                        => 'Verwacht :date',
     'bill_expected_date_js'                     => 'Verwacht op {date}',
-    'expected_amount'                           => '(Expected) amount',
+    'expected_amount'                           => '(Verwacht) bedrag',
     'bill_paid_on'                              => 'Betaald op {date}',
     'bill_repeats_weekly'                       => 'Herhaalt wekelijks',
     'bill_repeats_monthly'                      => 'Herhaalt maandelijks',

resources/lang/nl_NL/validation.php

@@ -59,7 +59,8 @@ return [
     'transaction_types_equal'        => 'Alle splits moeten van hetzelfde type zijn.',
     'invalid_transaction_type'       => 'Ongeldig transactietype.',
     'invalid_selection'              => 'Ongeldige selectie.',
-    'belongs_user'                   => 'Deze waarde is ongeldig voor dit veld.',
+    'belongs_user'                   => 'Deze waarde hoort bij een object dat niet van jou is.',
+    'belongs_user_or_user_group'     => 'Deze waarde hoort bij een object dat niet bij deze financiële administratie hoort.',
     '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, zodat de API het kan matchen.',

resources/lang/nn_NO/demo.php

@@ -38,7 +38,7 @@ return [
     'no_demo_text'           => 'Beklager, det eksisterar ingen ekstra demoforklaring for <abbr title=":route">denne sida</abbr>.',
     'see_help_icon'          => 'Imidlertid kan <i class="fa fa-question-circle"></i>-ikonet øvst i høgre hjørne fortelle deg meir.',
     'index'                  => 'Velkomen til <strong>Firefly III</strong>! På denne sida får du ein rask oversikt over økonomien din. For meir informasjon, sjekk ut Kontoar &rarr; <a href=":asset">Eiendelskontoar</a> og sjølvsagt <a href=":budgets">Budsjett</a> og <a href=":reports">Rapportar</a>. Eller berre ta ein kikk rundt og sjå kvar du ender opp.',
-    'accounts-index'         => 'Brukskontoar er dine personlige bankkontoar. Kostnadskontoar er kontoane du brukar pengar på, for eksempel butikker og venner. Inntektskontoar er kontoar du mottek pengar frå, for eksempel jobben din, det offentlige eller andre inntektskjelder. På denne sida kan du redigera eller fjerna dei.',
+    'accounts-index'         => 'Brukskontoar er dine personlege bankkontoar. Kostnadskontoar er kontoane du brukar pengar på, for eksempel butikkar og vener. Inntektskontoar er kontoar du mottek pengar frå, for eksempel jobben din, det offentlege eller andre inntektskjelder. På denne sida kan du redigera eller fjerna dei.',
     'budgets-index'          => 'Denne sida visar ei oversikt over budsjetta dine. Den øvste linja visar beløpet som er tilgjengelag for budsjettering. Dette kan tilpassast for kvar periode ved å klikka på beløpet til høgre. Beløpet du faktisk har brukt, vert vist på linja under. Under det er kostnadane per budsjett og kva du har budsjettert for dei.',
     'reports-index-start'    => 'Firefly III støttar ein rekke typer rapportar. Les om dei ved å klikka på <i class="fa fa-question-circle"></i>-ikonet øvst i høgre hjørne.',
     'reports-index-examples' => 'Husk å sjekke ut desse eksemplene: <a href=":one">månedlig finansiell oversikt</a>, <a href=":two">årlig finansiell oversikt</a> og <a href=":three">budsjettoversikt</a>.',

resources/lang/nn_NO/email.php

@@ -38,12 +38,12 @@ return [
     // common items
     'greeting'                                => 'Hei der,',
     'closing'                                 => 'Biip Boop,',
-    'signature'                               => 'Fra din vennlige Firefly III epost robot',
+    'signature'                               => 'Firefly III epost roboten',
     'footer_ps'                               => 'PS: Denne meldingen vart sendt fordi ein forespørsel frå IP :ipAddress utløste den.',
 
     // admin test
-    'admin_test_subject'                      => 'Ein testmelding frå Firefly III-installasjonen',
+    'admin_test_subject'                      => 'Ei testmelding frå Firefly III-installasjonen din',
-    'admin_test_body'                         => 'Dette er ein testmelding frå din Firefly III-instans. Den vart sendt til :email.',
+    'admin_test_body'                         => 'Dette er ei testmelding frå Firefly III-installasjonen din. Meldinga vart sendt til :email.',
 
 /*
  * PLEASE DO NOT EDIT THIS FILE DIRECTLY.
@@ -58,12 +58,12 @@ return [
 
 
     // invite
-    'invitation_created_subject'              => 'Ein invitasjon har vorte opprettet',
+    'invitation_created_subject'              => 'Ein invitasjon har vorte oppretta',
     'invitation_created_body'                 => 'Admin brukar ":email" oppretta ein brukarinvitasjon til ":invitee. Invitasjonen vil vera gyldig i 48 timer.',
     'invite_user_subject'                     => 'Du har vorte invitert til å laga ein Firefly III-konto.',
-    'invitation_introduction'                 => 'Du har vorte invitert til å laga ein Firefly III konto på **:host**. Firefly III er ein personlig, "self-hosted" privat finansforvalter. Alle dei kule barna brukar den.',
+    'invitation_introduction'                 => 'Du har vorte invitert til å laga ein Firefly III konto på **:host**. Firefly III er ein personleg økonomiverkty. Alle dei kule brukar han.',
     'invitation_invited_by'                   => 'Du har vorte invitert av ":admin" og denne invitasjonen vart sendt til ":invitee. Det er deg, ikkje sant?',
-    'invitation_url'                          => 'Invitasjonen er gyldig i 48 timer og kan løses inn ved å gå til [Firefly III](:url. Nyt!',
+    'invitation_url'                          => 'Invitasjonen er gyldig i 48 timer og kan løysast inn ved å gå til [Firefly III](:url). Kos deg!',
 
     // new IP
     'login_from_new_ip'                       => 'Ny pålogging på Firefly III',

resources/lang/nn_NO/firefly.php

@@ -1495,7 +1495,7 @@ return [
     'oauth'                                     => 'OAuth',
     'profile_oauth_clients'                     => 'OAuth klienter',
     'profile_oauth_no_clients'                  => 'Du har ikkje oppretta nokon OAuth klienter.',
-    'profile_oauth_clients_external_auth'       => 'Om du brukar ein ekstern autentiseringsleverandør, som Authelia, vil ikkje OAuth klienter fungera. Du kan berre bruka personlige tilgangstokener.',
+    'profile_oauth_clients_external_auth'       => 'Om du brukar ein ekstern autentiseringsleverandør, som Authelia, vil ikkje OAuth klientar fungera. Du kan berre bruka personlege tilgangsnøklar.',
     'profile_oauth_clients_header'              => 'Klienter',
     'profile_oauth_client_id'                   => 'Klient-ID',
     'profile_oauth_client_name'                 => 'Namn',
@@ -1512,12 +1512,12 @@ return [
     'profile_revoke'                            => 'Tilbakekall',
     'profile_oauth_client_secret_title'         => 'Klient hemmilghet',
     'profile_oauth_client_secret_expl'          => 'Her er din nye klient hemmelighet. Dette er den eneste tiden det blir vist så ikkje mister den! Du kan no bruka denne hemmeligheten til å laga API-forespørsler.',
-    'profile_personal_access_tokens'            => 'Personlig tilgangsnøkkel (Tokens)',
+    'profile_personal_access_tokens'            => 'Personleg tilgangsnøkkel',
-    'profile_personal_access_token'             => 'Personlig tilgangsnøkkel (Token)',
+    'profile_personal_access_token'             => 'Personleg tilgangsnøkkel',
     'profile_oauth_confidential'                => 'Konfidensiell',
     'profile_oauth_confidential_help'           => 'Krev at klienten godkjenner med ein "secret". Konfidensielle klienter kan holde legitimasjon på ein sikker måte uten å utsette dei for uautoriserte parter. Offentlige programmer, som skrivebord eller JavaScript SPA-programmer, kan ikkje holde secret "sikret".',
     'profile_personal_access_token_explanation' => 'Her er din nye klient "secret". Dette er den eneste tiden det blir vist så ikkje mister den! Du kan no bruka denne token til å laga API-forespørsler.',
-    'profile_no_personal_access_token'          => 'Du har ikkje oppretta nokon personlig tilgangsnøkkel (tokens).',
+    'profile_no_personal_access_token'          => 'Du har ikkje oppretta personlege tilgangsnøklar.',
     'profile_create_new_token'                  => 'Opprette nytt token',
     'profile_create_token'                      => 'Opprett token',
     'profile_create'                            => 'Opprett',
@@ -2399,7 +2399,7 @@ return [
 
     // administration
     'invite_is_already_redeemed'               => 'Invitasjonen til «:address» har allerede vorte innløyst.',
-    'invite_is_deleted'                        => 'Invitasjonen til «:address» har blitt sletta.',
+    'invite_is_deleted'                        => 'Invitasjonen til «:address» vart sletta.',
     'invite_new_user_title'                    => 'Inviter ny brukar',
     'invite_new_user_text'                     => 'As an administrator, you can invite users to register on your Firefly III administration. Using the direct link you can share with them, they will be able to register an account. The invited user and their invite link will appear in the table below. You are free to share the invitation link with them.',
     'invited_user_mail'                        => 'E-postadresse',

resources/lang/nn_NO/list.php

@@ -56,7 +56,7 @@ return [
     'balanceDiff'           => 'Saldodifferanse',
     'other_meta_data'       => 'Andre meta-data',
     'invited_at'            => 'Invitert',
-    'expires'               => 'Invitasjonen utløper',
+    'expires'               => 'Invitasjonen går ut på dato',
     'invited_by'            => 'Invitert av',
     'invite_link'           => 'Invitasjonslenkje',
     'account_type'          => 'Kontotype',

resources/lang/nn_NO/validation.php

@@ -59,7 +59,8 @@ return [
     'transaction_types_equal'        => 'Alle deler må vera av samme type.',
     'invalid_transaction_type'       => 'Ugyldig transaksjonstype.',
     'invalid_selection'              => 'Dine val er ugyldig.',
-    'belongs_user'                   => 'Denne verdien er ugyldig for dette feltet.',
+    'belongs_user'                   => 'This value is linked to an object that does not belong to you.',
+    'belongs_user_or_user_group'     => 'This value is linked to an object that does not belong to your current financial administration.',
     'at_least_one_transaction'       => 'Trenger minst ein transaksjon.',
     'recurring_transaction_id'       => 'Need at least one transaction.',
     'need_id_to_match'               => 'You need to submit this entry with an ID for the API to be able to match it.',

resources/lang/pl_PL/validation.php

@@ -59,7 +59,8 @@ return [
     'transaction_types_equal'        => 'Wszystkie podziały muszą być tego samego typu.',
     'invalid_transaction_type'       => 'Nieprawidłowy typ transakcji.',
     'invalid_selection'              => 'Twój wybór jest nieprawidłowy.',
-    'belongs_user'                   => 'Ta wartość jest nieprawidłowa dla tego pola.',
+    'belongs_user'                   => 'This value is linked to an object that does not belong to you.',
+    'belongs_user_or_user_group'     => 'This value is linked to an object that does not belong to your current financial administration.',
     'at_least_one_transaction'       => 'Wymaga co najmniej jednej transakcji.',
     'recurring_transaction_id'       => 'Wymaga co najmniej jednej transakcji.',
     'need_id_to_match'               => 'Musisz przesłać ten wpis z ID dla API, aby móc go dopasować.',

resources/lang/pt_BR/validation.php

@@ -59,7 +59,8 @@ return [
     'transaction_types_equal'        => 'Todas as divisões devem ser do mesmo tipo.',
     'invalid_transaction_type'       => 'Tipo de transação inválido.',
     'invalid_selection'              => 'Sua seleção é inválida.',
-    'belongs_user'                   => 'Esse valor é inválido para este campo.',
+    'belongs_user'                   => 'This value is linked to an object that does not belong to you.',
+    'belongs_user_or_user_group'     => 'This value is linked to an object that does not belong to your current financial administration.',
     'at_least_one_transaction'       => 'Precisa de ao menos uma transação.',
     'recurring_transaction_id'       => 'Precisa de ao menos uma transação.',
     'need_id_to_match'               => 'Você precisa enviar esta entrada com um ID para a API poder identificá-la.',

resources/lang/pt_PT/validation.php

@@ -59,7 +59,8 @@ return [
     'transaction_types_equal'        => 'Todas as divisões devem ser do mesmo tipo.',
     'invalid_transaction_type'       => 'Tipo de transação inválido.',
     'invalid_selection'              => 'A sua seleção é invalida.',
-    'belongs_user'                   => 'Este valor é inválido para este campo.',
+    'belongs_user'                   => 'This value is linked to an object that does not belong to you.',
+    'belongs_user_or_user_group'     => 'This value is linked to an object that does not belong to your current financial administration.',
     'at_least_one_transaction'       => 'Necessita pelo menos de uma transação.',
     'recurring_transaction_id'       => 'Precisa de pelo menos uma transação.',
     'need_id_to_match'               => 'Precisa de enviar esta entrada com um ID para corresponder com a API.',

resources/lang/ro_RO/validation.php

@@ -59,7 +59,8 @@ return [
     'transaction_types_equal'        => 'Toate împărțirile trebuie să fie de același tip.',
     'invalid_transaction_type'       => 'Tip tranzacție nevalidă.',
     'invalid_selection'              => 'Selecția dvs. este nevalidă.',
-    'belongs_user'                   => 'Această valoare este nevalidă pentru acest câmp.',
+    'belongs_user'                   => 'This value is linked to an object that does not belong to you.',
+    'belongs_user_or_user_group'     => 'This value is linked to an object that does not belong to your current financial administration.',
     'at_least_one_transaction'       => 'Aveți nevoie de cel puțin o tranzacție.',
     'recurring_transaction_id'       => 'Need at least one transaction.',
     'need_id_to_match'               => 'You need to submit this entry with an ID for the API to be able to match it.',

resources/lang/ru_RU/firefly.php

@@ -1731,10 +1731,10 @@ return [
     'remove_budgeted_amount'                    => 'Удалить запланированную в бюджете сумму в :currency',
 
     // bills:
-    'subscription'                              => 'Subscription',
+    'subscription'                              => 'Подписка',
     'not_expected_period'                       => 'Не ожидается в данном периоде',
-    'subscriptions_in_group'                    => 'Subscriptions in group "%{title}"',
+    'subscriptions_in_group'                    => 'Подписки в группе "%{title}"',
-    'subscr_expected_x_times'                   => 'Expect to pay %{amount} %{times} times this period',
+    'subscr_expected_x_times'                   => 'Ожидается оплата %{amount} %{times} раз за этот период',
     'not_or_not_yet'                            => 'Нет (пока)',
     'visit_bill'                                => 'Visit bill ":name" at Firefly III',
     'match_between_amounts'                     => 'Сравнение транзакций по счетам к оплате между :low и :high.',
@@ -1771,7 +1771,7 @@ return [
     'bill_edit_rules'                           => 'Firefly III также попытается отредактировать правило, связанное с этим счётом на оплату. Однако, если вы сами отредактировали это правило, Firefly III ничего не изменит.|Firefly III также попытается отредактировать :count правил, связанных с этим счётом на оплату. Однако, если вы сами отредактировали эти правила, Firefly III ничего не изменит.',
     'bill_expected_date'                        => 'Истекает :date',
     'bill_expected_date_js'                     => 'Ожидаемая дата {date}',
-    'expected_amount'                           => '(Expected) amount',
+    'expected_amount'                           => '(Ожидаемая) сумма',
     'bill_paid_on'                              => 'Оплачено {date}',
     'bill_repeats_weekly'                       => 'Повторяет еженедельно',
     'bill_repeats_monthly'                      => 'Повторять ежемесячно',

resources/lang/ru_RU/rules.php

@@ -51,8 +51,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_category'                  => 'Транзакция уже связана с категорией ":name"',
-    'already_linked_to_budget'                    => 'The transaction is already linked to budget ":name"',
+    '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/validation.php

@@ -59,7 +59,8 @@ return [
     'transaction_types_equal'        => 'Все части транзакции должны быть одного типа.',
     'invalid_transaction_type'       => 'Недопустимый тип транзакции.',
     'invalid_selection'              => 'Вы сделали неправильный выбор.',
-    'belongs_user'                   => 'Данное значение недопустимо для этого поля.',
+    'belongs_user'                   => 'This value is linked to an object that does not belong to you.',
+    'belongs_user_or_user_group'     => 'This value is linked to an object that does not belong to your current financial administration.',
     'at_least_one_transaction'       => 'Необходима как минимум одна транзакция.',
     'recurring_transaction_id'       => 'Необходима минимум одна транзакция.',
     'need_id_to_match'               => 'Вы должны отправить эту запись с ID для того, чтобы API мог сопоставить её.',

resources/lang/sk_SK/validation.php

@@ -59,7 +59,8 @@ return [
     'transaction_types_equal'        => 'Všetky rozdelenia musia mať zhodný typ.',
     'invalid_transaction_type'       => 'Neplatný typ transakcie.',
     'invalid_selection'              => 'Váš výber je neplatný.',
-    'belongs_user'                   => 'Táto hodnota nie je pre toto pole platná.',
+    'belongs_user'                   => 'This value is linked to an object that does not belong to you.',
+    'belongs_user_or_user_group'     => 'This value is linked to an object that does not belong to your current financial administration.',
     'at_least_one_transaction'       => 'Potrebujete aspoň jednu transakciu.',
     'recurring_transaction_id'       => 'Need at least one transaction.',
     'need_id_to_match'               => 'You need to submit this entry with an ID for the API to be able to match it.',

resources/lang/sl_SI/firefly.php

@@ -1731,7 +1731,7 @@ return [
     'remove_budgeted_amount'                    => 'Remove budgeted amount in :currency',
 
     // bills:
-    'subscription'                              => 'Subscription',
+    'subscription'                              => 'Naročnina',
     'not_expected_period'                       => 'Not expected this period',
     'subscriptions_in_group'                    => 'Subscriptions in group "%{title}"',
     'subscr_expected_x_times'                   => 'Expect to pay %{amount} %{times} times this period',

resources/lang/sl_SI/validation.php

@@ -59,7 +59,8 @@ return [
     'transaction_types_equal'        => 'All splits must be of the same type.',
     'invalid_transaction_type'       => 'Invalid transaction type.',
     'invalid_selection'              => 'Your selection is invalid.',
-    'belongs_user'                   => 'This value is invalid for this field.',
+    'belongs_user'                   => 'This value is linked to an object that does not belong to you.',
+    'belongs_user_or_user_group'     => 'This value is linked to an object that does not belong to your current financial administration.',
     'at_least_one_transaction'       => 'Need at least one transaction.',
     'recurring_transaction_id'       => 'Need at least one transaction.',
     'need_id_to_match'               => 'You need to submit this entry with an ID for the API to be able to match it.',

resources/lang/sv_SE/validation.php

@@ -59,7 +59,8 @@ return [
     'transaction_types_equal'        => 'All delade transaktioner måste vara av samma typ.',
     'invalid_transaction_type'       => 'Ogiltig transaktionstyp.',
     'invalid_selection'              => 'Ditt val är ogiltigt.',
-    'belongs_user'                   => 'Detta värde är ogiltigt för det här fältet.',
+    'belongs_user'                   => 'This value is linked to an object that does not belong to you.',
+    'belongs_user_or_user_group'     => 'This value is linked to an object that does not belong to your current financial administration.',
     'at_least_one_transaction'       => 'Krävs minst en transaktion.',
     'recurring_transaction_id'       => 'Need at least one transaction.',
     'need_id_to_match'               => 'You need to submit this entry with an ID for the API to be able to match it.',

resources/lang/th_TH/validation.php

@@ -59,7 +59,8 @@ return [
     'transaction_types_equal'        => 'All splits must be of the same type.',
     'invalid_transaction_type'       => 'Invalid transaction type.',
     'invalid_selection'              => 'Your selection is invalid.',
-    'belongs_user'                   => 'This value is invalid for this field.',
+    'belongs_user'                   => 'This value is linked to an object that does not belong to you.',
+    'belongs_user_or_user_group'     => 'This value is linked to an object that does not belong to your current financial administration.',
     'at_least_one_transaction'       => 'Need at least one transaction.',
     'recurring_transaction_id'       => 'Need at least one transaction.',
     'need_id_to_match'               => 'You need to submit this entry with an ID for the API to be able to match it.',

resources/lang/tr_TR/validation.php

@@ -59,7 +59,8 @@ return [
     'transaction_types_equal'        => 'Tüm bölümlemeler aynı türde olmalıdır.',
     'invalid_transaction_type'       => 'Geçersiz işlem türü.',
     'invalid_selection'              => 'Seçiminiz geçersiz.',
-    'belongs_user'                   => 'Bu değer bu alan için geçerli değil.',
+    'belongs_user'                   => 'This value is linked to an object that does not belong to you.',
+    'belongs_user_or_user_group'     => 'This value is linked to an object that does not belong to your current financial administration.',
     'at_least_one_transaction'       => 'En az bir işlem gerekir.',
     'recurring_transaction_id'       => 'Need at least one transaction.',
     'need_id_to_match'               => 'You need to submit this entry with an ID for the API to be able to match it.',

resources/lang/uk_UA/validation.php

@@ -59,7 +59,8 @@ return [
     'transaction_types_equal'        => 'Всі розділи повинні мати однаковий тип.',
     'invalid_transaction_type'       => 'Некоректний тип транзакції.',
     'invalid_selection'              => 'Ваш вибір є неприпустимим.',
-    'belongs_user'                   => 'Це значення є неприпустимим для цього поля.',
+    'belongs_user'                   => 'This value is linked to an object that does not belong to you.',
+    'belongs_user_or_user_group'     => 'This value is linked to an object that does not belong to your current financial administration.',
     'at_least_one_transaction'       => 'Потрібна хоча б одна транзакція.',
     'recurring_transaction_id'       => 'Need at least one transaction.',
     'need_id_to_match'               => 'You need to submit this entry with an ID for the API to be able to match it.',

resources/lang/vi_VN/validation.php

@@ -59,7 +59,8 @@ return [
     'transaction_types_equal'        => 'Tất cả các phần tách phải cùng loại.',
     'invalid_transaction_type'       => 'Loại giao dịch không hợp lệ.',
     'invalid_selection'              => 'Lựa chọn của bạn không hợp lệ.',
-    'belongs_user'                   => 'Giá trị này không hợp lệ cho trường này.',
+    'belongs_user'                   => 'This value is linked to an object that does not belong to you.',
+    'belongs_user_or_user_group'     => 'This value is linked to an object that does not belong to your current financial administration.',
     'at_least_one_transaction'       => 'Cần ít nhất một giao dịch.',
     'recurring_transaction_id'       => 'Need at least one transaction.',
     'need_id_to_match'               => 'You need to submit this entry with an ID for the API to be able to match it.',

resources/lang/zh_CN/validation.php

@@ -59,7 +59,8 @@ return [
     'transaction_types_equal'        => '所有拆分的类型必须相同',
     'invalid_transaction_type'       => '无效的交易类型',
     'invalid_selection'              => '您的选择无效',
-    'belongs_user'                   => '此值不能用于此字段',
+    'belongs_user'                   => 'This value is linked to an object that does not belong to you.',
+    'belongs_user_or_user_group'     => 'This value is linked to an object that does not belong to your current financial administration.',
     'at_least_one_transaction'       => '至少需要一笔交易',
     'recurring_transaction_id'       => '至少需要一笔交易。',
     'need_id_to_match'               => 'You need to submit this entry with an ID for the API to be able to match it.',

resources/lang/zh_TW/validation.php

@@ -59,7 +59,8 @@ return [
     'transaction_types_equal'        => '所有拆分須為同一類型。',
     'invalid_transaction_type'       => '交易類型無效。',
     'invalid_selection'              => '您的選擇無效。',
-    'belongs_user'                   => '此欄位不接受此值。',
+    'belongs_user'                   => 'This value is linked to an object that does not belong to you.',
+    'belongs_user_or_user_group'     => 'This value is linked to an object that does not belong to your current financial administration.',
     'at_least_one_transaction'       => '至少需要一個交易。',
     'recurring_transaction_id'       => 'Need at least one transaction.',
     'need_id_to_match'               => 'You need to submit this entry with an ID for the API to be able to match it.',