Merge branch 'release/5.7.5'

app/Api/V1/Requests/Models/Account/UpdateRequest.php

@@ -50,28 +50,28 @@ class UpdateRequest extends FormRequest
     public function getUpdateData(): array
     {
         $fields = [
-            'name'                    => ['name', 'string'],
+            'name'                    => ['name', 'convertString'],
             'active'                  => ['active', 'boolean'],
             'include_net_worth'       => ['include_net_worth', 'boolean'],
-            'account_type_name'       => ['type', 'string'],
+            'account_type_name'       => ['type', 'convertString'],
-            'virtual_balance'         => ['virtual_balance', 'string'],
+            'virtual_balance'         => ['virtual_balance', 'convertString'],
-            'iban'                    => ['iban', 'string'],
+            'iban'                    => ['iban', 'convertString'],
-            'BIC'                     => ['bic', 'string'],
+            'BIC'                     => ['bic', 'convertString'],
-            'account_number'          => ['account_number', 'string'],
+            'account_number'          => ['account_number', 'convertString'],
-            'account_role'            => ['account_role', 'string'],
+            'account_role'            => ['account_role', 'convertString'],
-            'liability_type'          => ['liability_type', 'string'],
+            'liability_type'          => ['liability_type', 'convertString'],
-            'opening_balance'         => ['opening_balance', 'string'],
+            'opening_balance'         => ['opening_balance', 'convertString'],
             'opening_balance_date'    => ['opening_balance_date', 'date'],
-            'cc_type'                 => ['credit_card_type', 'string'],
+            'cc_type'                 => ['credit_card_type', 'convertString'],
-            'cc_monthly_payment_date' => ['monthly_payment_date', 'string'],
+            'cc_monthly_payment_date' => ['monthly_payment_date', 'convertString'],
             'notes'                   => ['notes', 'stringWithNewlines'],
-            'interest'                => ['interest', 'string'],
+            'interest'                => ['interest', 'convertString'],
-            'interest_period'         => ['interest_period', 'string'],
+            'interest_period'         => ['interest_period', 'convertString'],
             'order'                   => ['order', 'integer'],
             'currency_id'             => ['currency_id', 'integer'],
-            'currency_code'           => ['currency_code', 'string'],
+            'currency_code'           => ['currency_code', 'convertString'],
-            'liability_direction'     => ['liability_direction', 'string'],
+            'liability_direction'     => ['liability_direction', 'convertString'],
-            'liability_amount'        => ['liability_amount', 'string'],
+            'liability_amount'        => ['liability_amount', 'convertString'],
             'liability_start_date'    => ['liability_start_date', 'date'],
         ];
         /** @var Account $account */

app/Api/V1/Requests/Models/Attachment/UpdateRequest.php

@@ -45,10 +45,10 @@ class UpdateRequest extends FormRequest
     public function getAll(): array
     {
         $fields = [
-            'filename'        => ['filename', 'string'],
+            'filename'        => ['filename', 'convertString'],
-            'title'           => ['title', 'string'],
+            'title'           => ['title', 'convertString'],
             'notes'           => ['notes', 'stringWithNewlines'],
-            'attachable_type' => ['attachable_type', 'string'],
+            'attachable_type' => ['attachable_type', 'convertString'],
             'attachable_id'   => ['attachable_id', 'integer'],
         ];
 

app/Api/V1/Requests/Models/AvailableBudget/Request.php

@@ -48,8 +48,8 @@ class Request extends FormRequest
         // this is the way:
         $fields = [
             'currency_id'   => ['currency_id', 'integer'],
-            'currency_code' => ['currency_code', 'string'],
+            'currency_code' => ['currency_code', 'convertString'],
-            'amount'        => ['amount', 'string'],
+            'amount'        => ['amount', 'convertString'],
             'start'         => ['start', 'date'],
             'end'           => ['end', 'date'],
         ];

app/Api/V1/Requests/Models/Bill/StoreRequest.php

@@ -49,21 +49,21 @@ class StoreRequest extends FormRequest
     {
         Log::debug('Raw fields in Bill StoreRequest', $this->all());
         $fields = [
-            'name'               => ['name', 'string'],
+            'name'               => ['name', 'convertString'],
-            'amount_min'         => ['amount_min', 'string'],
+            'amount_min'         => ['amount_min', 'convertString'],
-            'amount_max'         => ['amount_max', 'string'],
+            'amount_max'         => ['amount_max', 'convertString'],
             'currency_id'        => ['currency_id', 'integer'],
-            'currency_code'      => ['currency_code', 'string'],
+            'currency_code'      => ['currency_code', 'convertString'],
             'date'               => ['date', 'date'],
             'end_date'           => ['end_date', 'date'],
             'extension_date'     => ['extension_date', 'date'],
-            'repeat_freq'        => ['repeat_freq', 'string'],
+            'repeat_freq'        => ['repeat_freq', 'convertString'],
             'skip'               => ['skip', 'integer'],
             'active'             => ['active', 'boolean'],
             'order'              => ['order', 'integer'],
             'notes'              => ['notes', 'stringWithNewlines'],
             'object_group_id'    => ['object_group_id', 'integer'],
-            'object_group_title' => ['object_group_title', 'string'],
+            'object_group_title' => ['object_group_title', 'convertString'],
         ];
 
         return $this->getAllData($fields);

app/Api/V1/Requests/Models/Bill/UpdateRequest.php

@@ -47,21 +47,21 @@ class UpdateRequest extends FormRequest
     public function getAll(): array
     {
         $fields = [
-            'name'               => ['name', 'string'],
+            'name'               => ['name', 'convertString'],
-            'amount_min'         => ['amount_min', 'string'],
+            'amount_min'         => ['amount_min', 'convertString'],
-            'amount_max'         => ['amount_max', 'string'],
+            'amount_max'         => ['amount_max', 'convertString'],
             'currency_id'        => ['currency_id', 'integer'],
-            'currency_code'      => ['currency_code', 'string'],
+            'currency_code'      => ['currency_code', 'convertString'],
             'date'               => ['date', 'date'],
             'end_date'           => ['end_date', 'date'],
             'extension_date'     => ['extension_date', 'date'],
-            'repeat_freq'        => ['repeat_freq', 'string'],
+            'repeat_freq'        => ['repeat_freq', 'convertString'],
             'skip'               => ['skip', 'integer'],
             'active'             => ['active', 'boolean'],
             'order'              => ['order', 'integer'],
             'notes'              => ['notes', 'stringWithNewlines'],
             'object_group_id'    => ['object_group_id', 'integer'],
-            'object_group_title' => ['object_group_title', 'string'],
+            'object_group_title' => ['object_group_title', 'convertString'],
         ];
 
         return $this->getAllData($fields);

app/Api/V1/Requests/Models/Budget/StoreRequest.php

@@ -47,17 +47,17 @@ class StoreRequest extends FormRequest
     public function getAll(): array
     {
         $fields = [
-            'name'               => ['name', 'string'],
+            'name'               => ['name', 'convertString'],
             'active'             => ['active', 'boolean'],
             'order'              => ['active', 'integer'],
-            'notes'              => ['notes', 'string'],
+            'notes'              => ['notes', 'convertString'],
 
             // auto budget currency:
             'currency_id'        => ['auto_budget_currency_id', 'integer'],
-            'currency_code'      => ['auto_budget_currency_code', 'string'],
+            'currency_code'      => ['auto_budget_currency_code', 'convertString'],
-            'auto_budget_type'   => ['auto_budget_type', 'string'],
+            'auto_budget_type'   => ['auto_budget_type', 'convertString'],
-            'auto_budget_amount' => ['auto_budget_amount', 'string'],
+            'auto_budget_amount' => ['auto_budget_amount', 'convertString'],
-            'auto_budget_period' => ['auto_budget_period', 'string'],
+            'auto_budget_period' => ['auto_budget_period', 'convertString'],
         ];
 
         return $this->getAllData($fields);

app/Api/V1/Requests/Models/Budget/UpdateRequest.php

@@ -48,15 +48,15 @@ class UpdateRequest extends FormRequest
     {
         // this is the way:
         $fields  = [
-            'name'               => ['name', 'string'],
+            'name'               => ['name', 'convertString'],
             'active'             => ['active', 'boolean'],
             'order'              => ['order', 'integer'],
-            'notes'              => ['notes', 'string'],
+            'notes'              => ['notes', 'convertString'],
             'currency_id'        => ['auto_budget_currency_id', 'integer'],
-            'currency_code'      => ['auto_budget_currency_code', 'string'],
+            'currency_code'      => ['auto_budget_currency_code', 'convertString'],
-            'auto_budget_type'   => ['auto_budget_type', 'string'],
+            'auto_budget_type'   => ['auto_budget_type', 'convertString'],
-            'auto_budget_amount' => ['auto_budget_amount', 'string'],
+            'auto_budget_amount' => ['auto_budget_amount', 'convertString'],
-            'auto_budget_period' => ['auto_budget_period', 'string'],
+            'auto_budget_period' => ['auto_budget_period', 'convertString'],
         ];
         $allData = $this->getAllData($fields);
         if (array_key_exists('auto_budget_type', $allData)) {

app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php

@@ -48,9 +48,9 @@ class UpdateRequest extends FormRequest
         $fields = [
             'start'         => ['start', 'date'],
             'end'           => ['end', 'date'],
-            'amount'        => ['amount', 'string'],
+            'amount'        => ['amount', 'convertString'],
             'currency_id'   => ['currency_id', 'integer'],
-            'currency_code' => ['currency_code', 'string'],
+            'currency_code' => ['currency_code', 'convertString'],
         ];
 
         return $this->getAllData($fields);

app/Api/V1/Requests/Models/Category/UpdateRequest.php

@@ -44,7 +44,7 @@ class UpdateRequest extends FormRequest
     public function getAll(): array
     {
         $fields = [
-            'name'  => ['name', 'string'],
+            'name'  => ['name', 'convertString'],
             'notes' => ['notes', 'stringWithNewlines'],
         ];
 

app/Api/V1/Requests/Models/ObjectGroup/UpdateRequest.php

@@ -43,7 +43,7 @@ class UpdateRequest extends FormRequest
     public function getUpdateData(): array
     {
         $fields = [
-            'title' => ['title', 'string'],
+            'title' => ['title', 'convertString'],
             'order' => ['order', 'integer'],
         ];
 

app/Api/V1/Requests/Models/PiggyBank/UpdateRequest.php

@@ -46,15 +46,15 @@ class UpdateRequest extends FormRequest
     public function getAll(): array
     {
         $fields = [
-            'name'               => ['name', 'string'],
+            'name'               => ['name', 'convertString'],
             'account_id'         => ['account_id', 'integer'],
-            'targetamount'       => ['target_amount', 'string'],
+            'targetamount'       => ['target_amount', 'convertString'],
-            'current_amount'     => ['current_amount', 'string'],
+            'current_amount'     => ['current_amount', 'convertString'],
             'startdate'          => ['start_date', 'date'],
-            'targetdate'         => ['target_date', 'string'],
+            'targetdate'         => ['target_date', 'convertString'],
             'notes'              => ['notes', 'stringWithNewlines'],
             'order'              => ['order', 'integer'],
-            'object_group_title' => ['object_group_title', 'string'],
+            'object_group_title' => ['object_group_title', 'convertString'],
             'object_group_id'    => ['object_group_id', 'integer'],
         ];
 

app/Api/V1/Requests/Models/Recurrence/StoreRequest.php

@@ -49,9 +49,9 @@ class StoreRequest extends FormRequest
     public function getAll(): array
     {
         $fields     = [
-            'type'              => ['type', 'string'],
+            'type'              => ['type', 'convertString'],
-            'title'             => ['title', 'string'],
+            'title'             => ['title', 'convertString'],
-            'description'       => ['description', 'string'],
+            'description'       => ['description', 'convertString'],
             'first_date'        => ['first_date', 'date'],
             'repeat_until'      => ['repeat_until', 'date'],
             'nr_of_repetitions' => ['nr_of_repetitions', 'integer'],

app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php

@@ -51,14 +51,14 @@ class UpdateRequest extends FormRequest
     {
         // this is the way:
         $fields       = [
-            'title'             => ['title', 'string'],
+            'title'             => ['title', 'convertString'],
-            'description'       => ['description', 'string'],
+            'description'       => ['description', 'convertString'],
             'first_date'        => ['first_date', 'date'],
             'repeat_until'      => ['repeat_until', 'date'],
             'nr_of_repetitions' => ['nr_of_repetitions', 'integer'],
             'apply_rules'       => ['apply_rules', 'boolean'],
             'active'            => ['active', 'boolean'],
-            'notes'             => ['notes', 'string'],
+            'notes'             => ['notes', 'convertString'],
         ];
         $reps         = $this->getRepetitionData();
         $transactions = $this->getTransactionData();

app/Api/V1/Requests/Models/Rule/StoreRequest.php

@@ -46,12 +46,12 @@ class StoreRequest extends FormRequest
     public function getAll(): array
     {
         $fields = [
-            'title'            => ['title', 'string'],
+            'title'            => ['title', 'convertString'],
-            'description'      => ['description', 'string'],
+            'description'      => ['description', 'convertString'],
             'rule_group_id'    => ['rule_group_id', 'integer'],
             'order'            => ['order', 'integer'],
-            'rule_group_title' => ['rule_group_title', 'string'],
+            'rule_group_title' => ['rule_group_title', 'convertString'],
-            'trigger'          => ['trigger', 'string'],
+            'trigger'          => ['trigger', 'convertString'],
             'strict'           => ['strict', 'boolean'],
             'stop_processing'  => ['stop_processing', 'boolean'],
             'active'           => ['active', 'boolean'],

app/Api/V1/Requests/Models/Rule/UpdateRequest.php

@@ -46,10 +46,10 @@ class UpdateRequest extends FormRequest
     public function getAll(): array
     {
         $fields = [
-            'title'           => ['title', 'string'],
+            'title'           => ['title', 'convertString'],
             'description'     => ['description', 'stringWithNewlines'],
             'rule_group_id'   => ['rule_group_id', 'integer'],
-            'trigger'         => ['trigger', 'string'],
+            'trigger'         => ['trigger', 'convertString'],
             'strict'          => ['strict', 'boolean'],
             'stop_processing' => ['stop_processing', 'boolean'],
             'active'          => ['active', 'boolean'],

app/Api/V1/Requests/Models/RuleGroup/UpdateRequest.php

@@ -45,7 +45,7 @@ class UpdateRequest extends FormRequest
     {
         // This is the way.
         $fields = [
-            'title'       => ['title', 'string'],
+            'title'       => ['title', 'convertString'],
             'description' => ['description', 'stringWithNewlines'],
             'active'      => ['active', 'boolean'],
             'order'       => ['order', 'integer'],

app/Api/V1/Requests/Models/Tag/UpdateRequest.php

@@ -48,9 +48,9 @@ class UpdateRequest extends FormRequest
     {
         // This is the way.
         $fields = [
-            'tag'         => ['tag', 'string'],
+            'tag'         => ['tag', 'convertString'],
             'date'        => ['date', 'date'],
-            'description' => ['description', 'string'],
+            'description' => ['description', 'convertString'],
         ];
         $data   = $this->getAllData($fields);
 

app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php

@@ -46,9 +46,9 @@ class UpdateRequest extends FormRequest
     {
         // return nothing that isn't explicitely in the array:
         $fields = [
-            'name'           => ['name', 'string'],
+            'name'           => ['name', 'convertString'],
-            'code'           => ['code', 'string'],
+            'code'           => ['code', 'convertString'],
-            'symbol'         => ['symbol', 'string'],
+            'symbol'         => ['symbol', 'convertString'],
             'decimal_places' => ['decimal_places', 'integer'],
             'default'        => ['default', 'boolean'],
             'enabled'        => ['enabled', 'boolean'],

app/Api/V1/Requests/Models/Webhook/CreateRequest.php

@@ -45,12 +45,12 @@ class CreateRequest extends FormRequest
         $deliveries = array_flip(config('firefly.webhooks.deliveries'));
 
         $fields = [
-            'title'    => ['title', 'string'],
+            'title'    => ['title', 'convertString'],
             'active'   => ['active', 'boolean'],
-            'trigger'  => ['trigger', 'string'],
+            'trigger'  => ['trigger', 'convertString'],
-            'response' => ['response', 'string'],
+            'response' => ['response', 'convertString'],
-            'delivery' => ['delivery', 'string'],
+            'delivery' => ['delivery', 'convertString'],
-            'url'      => ['url', 'string'],
+            'url'      => ['url', 'convertString'],
         ];
 
         // this is the way.

app/Api/V1/Requests/Models/Webhook/UpdateRequest.php

@@ -45,12 +45,12 @@ class UpdateRequest extends FormRequest
         $deliveries = array_flip(config('firefly.webhooks.deliveries'));
 
         $fields = [
-            'title'    => ['title', 'string'],
+            'title'    => ['title', 'convertString'],
             'active'   => ['active', 'boolean'],
-            'trigger'  => ['trigger', 'string'],
+            'trigger'  => ['trigger', 'convertString'],
-            'response' => ['response', 'string'],
+            'response' => ['response', 'convertString'],
-            'delivery' => ['delivery', 'string'],
+            'delivery' => ['delivery', 'convertString'],
-            'url'      => ['url', 'string'],
+            'url'      => ['url', 'convertString'],
         ];
 
         // this is the way.

app/Factory/TransactionGroupFactory.php

@@ -36,10 +36,8 @@ use Log;
  */
 class TransactionGroupFactory
 {
-    /** @var TransactionJournalFactory */
+    private TransactionJournalFactory $journalFactory;
-    private $journalFactory;
+    private User $user;
-    /** @var User The user */
-    private $user;
 
     /**
      * TransactionGroupFactory constructor.

app/Helpers/Collector/Extensions/AttachmentCollection.php

@@ -27,6 +27,7 @@ namespace FireflyIII\Helpers\Collector\Extensions;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Attachment;
 use FireflyIII\Models\TransactionJournal;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Log;
 
@@ -299,7 +300,19 @@ trait AttachmentCollection
     {
         Log::debug('Add filter on no attachments.');
         $this->joinAttachmentTables();
-        $this->query->whereNull('attachments.attachable_id');
+
+        $this->query->where(function (Builder $q1) {
+            $q1
+                ->whereNull('attachments.attachable_id')
+                ->orWhere(function (Builder $q2) {
+                    $q2
+                        ->whereNotNull('attachments.attachable_id')
+                        ->whereNotNull('attachments.deleted_at');
+                    // id is not null
+                    // deleted at is not null.
+                });
+        });
+
 
         return $this;
     }

app/Repositories/PiggyBank/PiggyBankRepository.php

@@ -238,6 +238,13 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
         Log::debug(sprintf('The currency is %s and the amount is %s', $currency->code, $amount));
         $room    = bcsub((string) $piggyBank->targetamount, (string) $repetition->currentamount);
         $compare = bcmul($repetition->currentamount, '-1');
+
+        if(bccomp((string) $piggyBank->targetamount,'0') === 0) {
+            // amount is zero? then the "room" is positive amount of we wish to add or remove.
+            $room = app('steam')->positive($amount);
+            Log::debug(sprintf('Room is now %s', $room));
+        }
+
         Log::debug(sprintf('Will add/remove %f to piggy bank #%d ("%s")', $amount, $piggyBank->id, $piggyBank->name));
 
         // if the amount is positive, make sure it fits in piggy bank:

app/Support/Search/OperatorQuerySearch.php

@@ -614,10 +614,9 @@ class OperatorQuerySearch implements SearchInterface
             // amount
             //
             case 'amount_is':
-
                 // strip comma's, make dots.
+                Log::debug(sprintf('Original value "%s"', $value));
                 $value = str_replace(',', '.', (string) $value);
-
                 $amount = app('steam')->positive($value);
                 Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $amount));
                 $this->collector->amountIs($amount);

app/Support/Steam.php

@@ -34,6 +34,7 @@ use JsonException;
 use Log;
 use stdClass;
 use Str;
+use ValueError;
 
 /**
  * Class Steam.
@@ -627,9 +628,15 @@ class Steam
         if ('' === $amount) {
             return '0';
         }
+        try {
             if (bccomp($amount, '0') === -1) {
                 $amount = bcmul($amount, '-1');
             }
+        } catch (ValueError $e) {
+            Log::error(sprintf('ValueError in Steam::positive("%s"): %s', $amount, $e->getMessage()));
+            Log::error($e->getTraceAsString());
+            return '0';
+        }
 
         return $amount;
     }

changelog.md

@@ -2,6 +2,14 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 5.7.5 - 2022-05-06
+
+### Fixed
+- Fixed an issue where missing method names would break the API.
+- [Issue 6040](https://github.com/firefly-iii/firefly-iii/issues/6040) Could not add or remove money from piggy banks without a target.
+- [Issue 6009](https://github.com/firefly-iii/firefly-iii/issues/6009) `has_no_attachments:true` would not return transactions with *deleted* transactions.
+- [Issue 6050](https://github.com/firefly-iii/firefly-iii/issues/6050) ja_JP is part of the Docker image
+
 ## 5.7.4 - 2022-05-03
 
 ### Fixed

composer.lock

@@ -310,16 +310,16 @@
         },
         {
             "name": "diglactic/laravel-breadcrumbs",
-            "version": "v7.1.1",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/diglactic/laravel-breadcrumbs.git",
-                "reference": "0bed6e928023c7d0228e9404661bab5470dfb778"
+                "reference": "309ec597d047b763d1df3c5113a3932cc771500f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/diglactic/laravel-breadcrumbs/zipball/0bed6e928023c7d0228e9404661bab5470dfb778",
+                "url": "https://api.github.com/repos/diglactic/laravel-breadcrumbs/zipball/309ec597d047b763d1df3c5113a3932cc771500f",
-                "reference": "0bed6e928023c7d0228e9404661bab5470dfb778",
+                "reference": "309ec597d047b763d1df3c5113a3932cc771500f",
                 "shasum": ""
             },
             "require": {
@@ -375,9 +375,9 @@
             ],
             "support": {
                 "issues": "https://github.com/diglactic/laravel-breadcrumbs/issues",
-                "source": "https://github.com/diglactic/laravel-breadcrumbs/tree/v7.1.1"
+                "source": "https://github.com/diglactic/laravel-breadcrumbs/tree/v7.2.0"
             },
-            "time": "2022-01-12T18:19:26+00:00"
+            "time": "2022-05-03T05:40:37+00:00"
         },
         {
             "name": "doctrine/cache",
@@ -480,22 +480,22 @@
         },
         {
             "name": "doctrine/dbal",
-            "version": "3.3.5",
+            "version": "3.3.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "719663b15983278227669c8595151586a2ff3327"
+                "reference": "9e7f76dd1cde81c62574fdffa5a9c655c847ad21"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/719663b15983278227669c8595151586a2ff3327",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/9e7f76dd1cde81c62574fdffa5a9c655c847ad21",
-                "reference": "719663b15983278227669c8595151586a2ff3327",
+                "reference": "9e7f76dd1cde81c62574fdffa5a9c655c847ad21",
                 "shasum": ""
             },
             "require": {
                 "composer-runtime-api": "^2",
                 "doctrine/cache": "^1.11|^2.0",
-                "doctrine/deprecations": "^0.5.3",
+                "doctrine/deprecations": "^0.5.3|^1",
                 "doctrine/event-manager": "^1.0",
                 "php": "^7.3 || ^8.0",
                 "psr/cache": "^1|^2|^3",
@@ -503,15 +503,15 @@
             },
             "require-dev": {
                 "doctrine/coding-standard": "9.0.0",
-                "jetbrains/phpstorm-stubs": "2021.1",
+                "jetbrains/phpstorm-stubs": "2022.1",
-                "phpstan/phpstan": "1.5.3",
+                "phpstan/phpstan": "1.6.3",
-                "phpstan/phpstan-strict-rules": "^1.1",
+                "phpstan/phpstan-strict-rules": "^1.2",
-                "phpunit/phpunit": "9.5.16",
+                "phpunit/phpunit": "9.5.20",
                 "psalm/plugin-phpunit": "0.16.1",
                 "squizlabs/php_codesniffer": "3.6.2",
                 "symfony/cache": "^5.2|^6.0",
                 "symfony/console": "^2.7|^3.0|^4.0|^5.0|^6.0",
-                "vimeo/psalm": "4.22.0"
+                "vimeo/psalm": "4.23.0"
             },
             "suggest": {
                 "symfony/console": "For helpful console commands such as SQL execution and import of files."
@@ -571,7 +571,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/3.3.5"
+                "source": "https://github.com/doctrine/dbal/tree/3.3.6"
             },
             "funding": [
                 {
@@ -587,29 +587,29 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-05T09:50:18+00:00"
+            "time": "2022-05-02T17:21:01+00:00"
         },
         {
             "name": "doctrine/deprecations",
-            "version": "v0.5.3",
+            "version": "v1.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/deprecations.git",
-                "reference": "9504165960a1f83cc1480e2be1dd0a0478561314"
+                "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/9504165960a1f83cc1480e2be1dd0a0478561314",
+                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
-                "reference": "9504165960a1f83cc1480e2be1dd0a0478561314",
+                "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1|^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^6.0|^7.0|^8.0",
+                "doctrine/coding-standard": "^9",
-                "phpunit/phpunit": "^7.0|^8.0|^9.0",
+                "phpunit/phpunit": "^7.5|^8.5|^9.5",
-                "psr/log": "^1.0"
+                "psr/log": "^1|^2|^3"
             },
             "suggest": {
                 "psr/log": "Allows logging deprecations via PSR-3 logger implementation"
@@ -628,9 +628,9 @@
             "homepage": "https://www.doctrine-project.org/",
             "support": {
                 "issues": "https://github.com/doctrine/deprecations/issues",
-                "source": "https://github.com/doctrine/deprecations/tree/v0.5.3"
+                "source": "https://github.com/doctrine/deprecations/tree/v1.0.0"
             },
-            "time": "2021-03-21T12:59:47+00:00"
+            "time": "2022-05-02T15:47:09+00:00"
         },
         {
             "name": "doctrine/event-manager",
@@ -1855,16 +1855,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v9.10.1",
+            "version": "v9.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "93414b1c7c0a56081d96c060bb850ac192d3d323"
+                "reference": "598a8c84d452a66b90a3213b1d67189cc726c728"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/93414b1c7c0a56081d96c060bb850ac192d3d323",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/598a8c84d452a66b90a3213b1d67189cc726c728",
-                "reference": "93414b1c7c0a56081d96c060bb850ac192d3d323",
+                "reference": "598a8c84d452a66b90a3213b1d67189cc726c728",
                 "shasum": ""
             },
             "require": {
@@ -2030,7 +2030,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2022-04-28T13:18:25+00:00"
+            "time": "2022-05-03T14:47:20+00:00"
         },
         {
             "name": "laravel/passport",
@@ -2829,16 +2829,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "3.0.18",
+            "version": "3.0.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "c8e137e594948240b03372e012344b07c61b9193"
+                "reference": "670df21225d68d165a8df38587ac3f41caf608f8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/c8e137e594948240b03372e012344b07c61b9193",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/670df21225d68d165a8df38587ac3f41caf608f8",
-                "reference": "c8e137e594948240b03372e012344b07c61b9193",
+                "reference": "670df21225d68d165a8df38587ac3f41caf608f8",
                 "shasum": ""
             },
             "require": {
@@ -2899,7 +2899,7 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/3.0.18"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.0.19"
             },
             "funding": [
                 {
@@ -2915,7 +2915,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-25T18:55:04+00:00"
+            "time": "2022-05-03T21:19:02+00:00"
         },
         {
             "name": "league/fractal",
@@ -3399,16 +3399,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "2.57.0",
+            "version": "2.58.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "4a54375c21eea4811dbd1149fe6b246517554e78"
+                "reference": "97a34af22bde8d0ac20ab34b29d7bfe360902055"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4a54375c21eea4811dbd1149fe6b246517554e78",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/97a34af22bde8d0ac20ab34b29d7bfe360902055",
-                "reference": "4a54375c21eea4811dbd1149fe6b246517554e78",
+                "reference": "97a34af22bde8d0ac20ab34b29d7bfe360902055",
                 "shasum": ""
             },
             "require": {
@@ -3426,7 +3426,8 @@
                 "phpmd/phpmd": "^2.9",
                 "phpstan/extension-installer": "^1.0",
                 "phpstan/phpstan": "^0.12.54 || ^1.0",
-                "phpunit/phpunit": "^7.5.20 || ^8.5.14",
+                "phpunit/php-file-iterator": "^2.0.5",
+                "phpunit/phpunit": "^7.5.20 || ^8.5.23",
                 "squizlabs/php_codesniffer": "^3.4"
             },
             "bin": [
@@ -3491,7 +3492,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-13T18:13:33+00:00"
+            "time": "2022-04-25T19:31:17+00:00"
         },
         {
             "name": "nette/schema",

config/firefly.php

@@ -101,7 +101,7 @@ return [
         'webhooks'     => false,
         'handle_debts' => true,
     ],
-    'version'                      => '5.7.4',
+    'version'                      => '5.7.5',
     'api_version'                  => '1.5.6',
     'db_version'                   => 18,
 

frontend/src/i18n/ja_JP/index.js

@@ -4,12 +4,12 @@ export default {
         "month_and_day_fns": "y\u5e74 MMMM d\u65e5"
     },
     "form": {
-        "name": "\u540d\u524d",
+        "name": "\u540d\u79f0",
         "amount_min": "\u6700\u4f4e\u984d",
         "amount_max": "\u4e0a\u9650\u984d",
         "url": "URL",
         "title": "\u30bf\u30a4\u30c8\u30eb",
-        "first_date": "\u958b\u59cb\u65e5",
+        "first_date": "\u6700\u521d\u306e\u65e5\u4ed8",
         "repetitions": "\u30ea\u30d4\u30fc\u30c8",
         "description": "\u8aac\u660e",
         "iban": "IBAN",
@@ -17,11 +17,11 @@ export default {
         "date": "\u65e5\u4ed8"
     },
     "list": {
-        "name": "\u540d\u524d",
+        "name": "\u540d\u79f0",
         "account_number": "\u53e3\u5ea7\u756a\u53f7",
         "currentBalance": "\u73fe\u5728\u306e\u6b8b\u9ad8",
         "lastActivity": "\u6700\u7d42\u30a2\u30af\u30c6\u30a3\u30d3\u30c6\u30a3",
-        "active": "\u6709\u52b9?"
+        "active": "\u6709\u52b9"
     },
     "breadcrumbs": {
         "placeholder": "[Placeholder]",
@@ -30,8 +30,8 @@ export default {
         "transactions": "\u53d6\u5f15",
         "title_expenses": "\u652f\u51fa",
         "title_withdrawal": "\u652f\u51fa",
-        "title_revenue": "\u53ce\u76ca\/\u53ce\u5165",
+        "title_revenue": "\u53ce\u76ca \/ \u53ce\u5165",
-        "title_deposit": "\u53ce\u76ca\/\u53ce\u5165",
+        "title_deposit": "\u53ce\u76ca \/ \u53ce\u5165",
         "title_transfer": "\u9001\u91d1",
         "title_transfers": "\u9001\u91d1",
         "asset_accounts": "\u8cc7\u7523\u53e3\u5ea7",
@@ -47,94 +47,94 @@ export default {
         "create_new_asset": "\u65b0\u3057\u3044\u8cc7\u7523\u53e3\u5ea7\u3092\u4f5c\u6210",
         "confirm_action": "\u64cd\u4f5c\u3092\u78ba\u8a8d",
         "rule_trigger_source_account_starts_choice": "\u51fa\u91d1\u5143\u53e3\u5ea7\u540d\u304c...\u3067\u59cb\u307e\u308b",
-        "rule_trigger_source_account_ends_choice": "\u51fa\u91d1\u5143\u53e3\u5ea7\u540d\u304c\u6b21\u3067\u7d42\u308f\u308b",
+        "rule_trigger_source_account_ends_choice": "\u51fa\u91d1\u5143\u53e3\u5ea7\u540d\u304c\u2026\u3067\u7d42\u308f\u308b",
         "rule_trigger_source_account_is_choice": "\u51fa\u91d1\u5143\u53e3\u5ea7\u540d\u304c...",
-        "rule_trigger_source_account_contains_choice": "\u51fa\u91d1\u5143\u53e3\u5ea7\u540d\u304c\u6b21\u3092\u542b\u3080",
+        "rule_trigger_source_account_contains_choice": "\u51fa\u91d1\u5143\u53e3\u5ea7\u540d\u304c\u2026\u3092\u542b\u3080",
-        "rule_trigger_account_id_choice": "Either account ID is exactly..",
+        "rule_trigger_account_id_choice": "\u3069\u3061\u3089\u304b\u306e\u53e3\u5ea7ID\u304c\u2026",
-        "rule_trigger_source_account_id_choice": "\u51fa\u91d1\u5143\u53e3\u5ea7ID\u304c\u6b21\u3068\u4e00\u81f4\u3059\u308b",
+        "rule_trigger_source_account_id_choice": "\u51fa\u91d1\u5143\u53e3\u5ea7ID\u304c\u2026",
-        "rule_trigger_destination_account_id_choice": "\u9001\u91d1\u5148\u53e3\u5ea7ID\u304c\u6b21\u3068\u4e00\u81f4\u3059\u308b",
+        "rule_trigger_destination_account_id_choice": "\u9001\u91d1\u5148\u53e3\u5ea7ID\u304c\u2026",
-        "rule_trigger_account_is_cash_choice": "Either account is cash",
+        "rule_trigger_account_is_cash_choice": "\u3069\u3061\u3089\u304b\u306e\u53e3\u5ea7\u304c\u73fe\u91d1",
         "rule_trigger_source_is_cash_choice": "\u51fa\u91d1\u5143\u53e3\u5ea7\u304c\u73fe\u91d1\u53e3\u5ea7",
         "rule_trigger_destination_is_cash_choice": "\u9001\u91d1\u5148\u53e3\u5ea7\u304c\u73fe\u91d1\u53e3\u5ea7",
-        "rule_trigger_source_account_nr_starts_choice": "\u51fa\u91d1\u5143\u53e3\u5ea7\u756a\u53f7\/IBAN\u304c\u6b21\u3067\u59cb\u307e\u308b",
+        "rule_trigger_source_account_nr_starts_choice": "\u51fa\u91d1\u5143\u53e3\u5ea7\u756a\u53f7\/IBAN\u304c\u2026\u3067\u59cb\u307e\u308b",
-        "rule_trigger_source_account_nr_ends_choice": "\u51fa\u91d1\u5143\u53e3\u5ea7\u756a\u53f7\/IBAN\u304c\u6b21\u3067\u7d42\u308f\u308b",
+        "rule_trigger_source_account_nr_ends_choice": "\u51fa\u91d1\u5143\u53e3\u5ea7\u756a\u53f7\/IBAN\u304c\u2026\u3067\u7d42\u308f\u308b",
-        "rule_trigger_source_account_nr_is_choice": "\u51fa\u91d1\u5143\u53e3\u5ea7\u756a\u53f7\/IBAN\u304c\u6b21\u3068\u4e00\u81f4\u3059\u308b",
+        "rule_trigger_source_account_nr_is_choice": "\u51fa\u91d1\u5143\u53e3\u5ea7\u756a\u53f7\/IBAN\u304c\u2026",
-        "rule_trigger_source_account_nr_contains_choice": "\u51fa\u91d1\u5143\u53e3\u5ea7\u756a\u53f7\/IBAN\u304c\u6b21\u3092\u542b\u3080",
+        "rule_trigger_source_account_nr_contains_choice": "\u51fa\u91d1\u5143\u53e3\u5ea7\u756a\u53f7\/IBAN\u304c\u2026\u3092\u542b\u3080",
         "rule_trigger_destination_account_starts_choice": "\u9001\u91d1\u5148\u53e3\u5ea7\u540d\u304c\u6b21\u3067\u59cb\u307e\u308b",
         "rule_trigger_destination_account_ends_choice": "\u9001\u91d1\u5148\u53e3\u5ea7\u540d\u304c\u6b21\u3067\u7d42\u308f\u308b",
-        "rule_trigger_destination_account_is_choice": "\u9001\u91d1\u5148\u53e3\u5ea7\u540d\u304c\u6b21\u3068\u4e00\u81f4\u3059\u308b",
+        "rule_trigger_destination_account_is_choice": "\u9001\u91d1\u5148\u53e3\u5ea7\u540d\u304c\u2026",
         "rule_trigger_destination_account_contains_choice": "\u9001\u91d1\u5148\u53e3\u5ea7\u540d\u304c\u6b21\u3092\u542b\u3080",
         "rule_trigger_destination_account_nr_starts_choice": "\u9001\u91d1\u5148\u53e3\u5ea7\u756a\u53f7\/IBAN\u304c\u6b21\u3067\u59cb\u307e\u308b",
         "rule_trigger_destination_account_nr_ends_choice": "\u9001\u91d1\u5148\u53e3\u5ea7\u756a\u53f7\uff08IBAN\uff09\u304c\u6b21\u3067\u7d42\u308f\u308b",
-        "rule_trigger_destination_account_nr_is_choice": "\u9001\u91d1\u5148\u53e3\u5ea7\u756a\u53f7\/IBAN\u304c\u6b21\u3068\u4e00\u81f4\u3059\u308b",
+        "rule_trigger_destination_account_nr_is_choice": "\u9001\u91d1\u5148\u53e3\u5ea7\u756a\u53f7\/IBAN\u304c\u2026",
         "rule_trigger_destination_account_nr_contains_choice": "\u9001\u91d1\u5148\u53e3\u5ea7\u756a\u53f7\/IBAN\u304c\u6b21\u3092\u542b\u3080",
-        "rule_trigger_transaction_type_choice": "\u7121\u52b9\u306a\u30c8\u30e9\u30f3\u30b6\u30af\u30b7\u30e7\u30f3\u5f62\u5f0f\u3067\u3059\u3002",
+        "rule_trigger_transaction_type_choice": "\u53d6\u5f15\u7a2e\u5225\u304c\u2026",
-        "rule_trigger_category_is_choice": "\u30ab\u30c6\u30b4\u30ea",
+        "rule_trigger_category_is_choice": "\u30ab\u30c6\u30b4\u30ea\u304c\u2026",
-        "rule_trigger_amount_less_choice": "\u91d1\u984d\u304c\u6b21\u3088\u308a\u5c0f\u3055\u3044",
+        "rule_trigger_amount_less_choice": "\u91d1\u984d\u304c\u2026\u3088\u308a\u5c0f\u3055\u3044",
-        "rule_trigger_amount_is_choice": "\u91d1\u984d\u304c...",
+        "rule_trigger_amount_is_choice": "\u91d1\u984d\u304c\u2026",
-        "rule_trigger_amount_more_choice": "\u91d1\u984d\u304c\u6b21\u3088\u308a\u5927\u304d\u3044",
+        "rule_trigger_amount_more_choice": "\u91d1\u984d\u304c\u2026\u3088\u308a\u5927\u304d\u3044",
-        "rule_trigger_description_starts_choice": "\u8aac\u660e",
+        "rule_trigger_description_starts_choice": "\u8aac\u660e\u304c\u2026\u3067\u59cb\u307e\u308b",
-        "rule_trigger_description_ends_choice": "\u8aac\u660e",
+        "rule_trigger_description_ends_choice": "\u8aac\u660e\u304c\u2026\u3067\u7d42\u308f\u308b",
-        "rule_trigger_description_contains_choice": "\u8aac\u660e",
+        "rule_trigger_description_contains_choice": "\u8aac\u660e\u306b\u2026\u3092\u542b\u3080",
-        "rule_trigger_description_is_choice": "\u8aac\u660e\u304c...",
+        "rule_trigger_description_is_choice": "\u8aac\u660e\u304c\u2026",
-        "rule_trigger_date_on_choice": "\u53d6\u5f15\u65e5\u304c...",
+        "rule_trigger_date_on_choice": "\u53d6\u5f15\u65e5\u304c\u2026",
-        "rule_trigger_date_before_choice": "\u53d6\u5f15\u65e5\u304c\u6b21\u3088\u308a\u524d",
+        "rule_trigger_date_before_choice": "\u53d6\u5f15\u65e5\u304c\u2026\u3088\u308a\u524d",
-        "rule_trigger_date_after_choice": "\u53d6\u5f15\u65e5\u304c\u6b21\u3088\u308a\u5f8c",
+        "rule_trigger_date_after_choice": "\u53d6\u5f15\u65e5\u304c\u2026\u3088\u308a\u5f8c",
-        "rule_trigger_created_at_on_choice": "Transaction was made on..",
+        "rule_trigger_created_at_on_choice": "\u53d6\u5f15\u304c\u4f5c\u6210\u65e5\u304c",
-        "rule_trigger_updated_at_on_choice": "Transaction was last edited on..",
+        "rule_trigger_updated_at_on_choice": "\u53d6\u5f15\u306e\u6700\u7d42\u7de8\u96c6\u65e5\u304c",
-        "rule_trigger_budget_is_choice": "\u4e88\u7b97",
+        "rule_trigger_budget_is_choice": "\u4e88\u7b97\u304c\u2026",
-        "rule_trigger_tag_is_choice": "Any tag is..",
+        "rule_trigger_tag_is_choice": "\u30bf\u30b0\u304c",
-        "rule_trigger_currency_is_choice": "\u53d6\u5f15",
+        "rule_trigger_currency_is_choice": "\u53d6\u5f15\u901a\u8ca8\u304c\u2026",
-        "rule_trigger_foreign_currency_is_choice": "\u53d6\u5f15\u5916\u56fd\u901a\u8ca8\u304c\u6b21\u3068\u4e00\u81f4\u3059\u308b",
+        "rule_trigger_foreign_currency_is_choice": "\u53d6\u5f15\u5916\u56fd\u901a\u8ca8\u304c\u2026",
         "rule_trigger_has_attachments_choice": "\u6b21\u306e\u500b\u6570\u4ee5\u4e0a\u306e\u6dfb\u4ed8\u30d5\u30a1\u30a4\u30eb\u304c\u3042\u308b",
         "rule_trigger_has_no_category_choice": "\u30ab\u30c6\u30b4\u30ea\u306a\u3057",
         "rule_trigger_has_any_category_choice": "(\u4efb\u610f\u306e) \u30ab\u30c6\u30b4\u30ea\u304c\u3042\u308b",
         "rule_trigger_has_no_budget_choice": "\u4e88\u7b97\u304c\u306a\u3044",
-        "rule_trigger_has_any_budget_choice": "\u3053\u306e\u8acb\u6c42\u66f8\u306f\u3069\u306e\u30eb\u30fc\u30eb\u306b\u3082\u95a2\u9023\u4ed8\u3051\u3089\u308c\u3066\u3044\u307e\u305b\u3093\u3002",
+        "rule_trigger_has_any_budget_choice": "\u4e88\u7b97\u304c\u3042\u308b\u53d6\u5f15",
         "rule_trigger_has_no_bill_choice": "\u8acb\u6c42\u304c\u306a\u3044",
         "rule_trigger_has_any_bill_choice": "\u8acb\u6c42\u304c\u3042\u308b",
         "rule_trigger_has_no_tag_choice": "\u30bf\u30b0\u304c\u306a\u3044",
         "rule_trigger_has_any_tag_choice": "\u4e00\u3064\u4ee5\u4e0a\u306e\u30bf\u30b0\u304c\u3042\u308b",
-        "rule_trigger_any_notes_choice": "\u5099\u8003",
+        "rule_trigger_any_notes_choice": "\u5099\u8003\u304c\u3042\u308b",
-        "rule_trigger_no_notes_choice": "\u5099\u8003",
+        "rule_trigger_no_notes_choice": "\u5099\u8003\u304c\u306a\u3044",
-        "rule_trigger_notes_is_choice": "Notes are..",
+        "rule_trigger_notes_is_choice": "\u5099\u8003\u304c",
-        "rule_trigger_notes_contains_choice": "Notes contain..",
+        "rule_trigger_notes_contains_choice": "\u5099\u8003\u304c\u6b21\u3092\u542b\u3080",
-        "rule_trigger_notes_starts_choice": "Notes start with..",
+        "rule_trigger_notes_starts_choice": "\u5099\u8003\u304c\u6b21\u3067\u59cb\u307e\u308b",
-        "rule_trigger_notes_ends_choice": "Notes end with..",
+        "rule_trigger_notes_ends_choice": "\u5099\u8003\u304c\u6b21\u3067\u7d42\u308f\u308b",
-        "rule_trigger_bill_is_choice": "\u8acb\u6c42\u304c\u6b21\u3068\u4e00\u81f4\u3059\u308b",
+        "rule_trigger_bill_is_choice": "\u8acb\u6c42\u304c\u2026",
-        "rule_trigger_external_id_is_choice": "External ID is..",
+        "rule_trigger_external_id_is_choice": "\u5916\u90e8 ID \u304c\u2026",
-        "rule_trigger_internal_reference_is_choice": "Internal reference is..",
+        "rule_trigger_internal_reference_is_choice": "\u5185\u90e8\u53c2\u7167\u304c\u2026",
-        "rule_trigger_journal_id_choice": "\u53d6\u5f15ID\u304c\u6b21\u3068\u4e00\u81f4\u3059\u308b",
+        "rule_trigger_journal_id_choice": "\u53d6\u5f15ID\u304c\u2026",
-        "rule_trigger_any_external_url_choice": "Transaction has an external URL",
+        "rule_trigger_any_external_url_choice": "\u53d6\u5f15\u306b\u5916\u90e8 URL \u304c\u3042\u308b",
-        "rule_trigger_no_external_url_choice": "Transaction has no external URL",
+        "rule_trigger_no_external_url_choice": "\u53d6\u5f15\u306b\u5916\u90e8 URL \u304c\u306a\u3044",
-        "rule_trigger_id_choice": "Transaction ID is..",
+        "rule_trigger_id_choice": "\u53d6\u5f15 ID \u304c\u2026",
         "rule_action_delete_transaction_choice": "\u53d6\u5f15\u3092\u524a\u9664 (!)",
         "rule_action_set_category_choice": "\u30ab\u30c6\u30b4\u30ea\u3092\u8a2d\u5b9a",
         "rule_action_clear_category_choice": "\u30ab\u30c6\u30b4\u30ea\u3092\u30af\u30ea\u30a2",
-        "rule_action_set_budget_choice": "\u4e88\u7b97",
+        "rule_action_set_budget_choice": "\u4e88\u7b97\u3092\u2026\u306b\u8a2d\u5b9a",
-        "rule_action_clear_budget_choice": "\u4e88\u7b97",
+        "rule_action_clear_budget_choice": "\u4e88\u7b97\u3092\u30af\u30ea\u30a2",
-        "rule_action_add_tag_choice": "\u30bf\u30b0\u30e2\u30fc\u30c9",
+        "rule_action_add_tag_choice": "\u30bf\u30b0\u2026\u3092\u8ffd\u52a0",
-        "rule_action_remove_tag_choice": "\u30bf\u30b0\u30e2\u30fc\u30c9",
+        "rule_action_remove_tag_choice": "\u30bf\u30b0\u2026\u3092\u524a\u9664",
-        "rule_action_remove_all_tags_choice": "\u30bf\u30b0",
+        "rule_action_remove_all_tags_choice": "\u3059\u3079\u3066\u306e\u30bf\u30b0\u3092\u524a\u9664",
-        "rule_action_set_description_choice": "\u8aac\u660e",
+        "rule_action_set_description_choice": "\u8aac\u660e\u3092\u2026\u306b\u8a2d\u5b9a",
         "rule_action_update_piggy_choice": "\u53d6\u5f15\u91d1\u984d\u3092\u6b21\u306e\u8caf\u91d1\u7bb1\u306b\u52a0\u7b97\/\u6e1b\u7b97\u3059\u308b",
-        "rule_action_append_description_choice": "\u8aac\u660e",
+        "rule_action_append_description_choice": "\u8aac\u660e\u306e\u59cb\u3081\u306b\u2026\u3092\u8ffd\u52a0",
-        "rule_action_prepend_description_choice": "\u8aac\u660e",
+        "rule_action_prepend_description_choice": "\u8aac\u660e\u306e\u7d42\u308f\u308a\u306b\u2026\u3092\u8ffd\u52a0",
         "rule_action_set_source_account_choice": "\u652f\u6255\u5143\u53e3\u5ea7\u3092\u6b21\u306b\u3059\u308b",
         "rule_action_set_destination_account_choice": "\u9001\u91d1\u5148\u53e3\u5ea7\u3092\u6b21\u306b\u3059\u308b",
-        "rule_action_append_notes_choice": "\u5099\u8003",
+        "rule_action_append_notes_choice": "\u5099\u8003\u306e\u59cb\u3081\u306b\u2026\u3092\u8ffd\u52a0",
-        "rule_action_prepend_notes_choice": "\u5099\u8003",
+        "rule_action_prepend_notes_choice": "\u5099\u8003\u306e\u7d42\u308f\u308a\u306b\u2026\u3092\u8ffd\u52a0",
-        "rule_action_clear_notes_choice": "\u5099\u8003",
+        "rule_action_clear_notes_choice": "\u5099\u8003\u3092\u524a\u9664",
-        "rule_action_set_notes_choice": "\u5099\u8003",
+        "rule_action_set_notes_choice": "\u5099\u8003\u306b\u2026\u3092\u8a2d\u5b9a",
-        "rule_action_link_to_bill_choice": "\u6b21\u306e\u8acb\u6c42\u306b\u30ea\u30f3\u30af\u3059\u308b",
+        "rule_action_link_to_bill_choice": "\u8acb\u6c42\u2026\u306b\u30ea\u30f3\u30af",
-        "rule_action_convert_deposit_choice": "\u9810\u91d1\u3092\u5909\u63db",
+        "rule_action_convert_deposit_choice": "\u53d6\u5f15\u3092\u5165\u91d1\u306b\u5909\u63db",
-        "rule_action_convert_withdrawal_choice": "\u51fa\u91d1\u3092\u5909\u63db",
+        "rule_action_convert_withdrawal_choice": "\u53d6\u5f15\u3092\u51fa\u91d1\u306b\u5909\u63db",
-        "rule_action_convert_transfer_choice": "\u9001\u91d1\u3092\u5909\u63db",
+        "rule_action_convert_transfer_choice": "\u53d6\u5f15\u3092\u9001\u91d1\u306b\u5909\u63db",
         "placeholder": "[Placeholder]",
         "recurrences": "\u5b9a\u671f\u7684\u306a\u53d6\u5f15",
         "title_expenses": "\u652f\u51fa",
         "title_withdrawal": "\u652f\u51fa",
-        "title_revenue": "\u53ce\u5165\u3001\u6240\u5f97\u3001\u5165\u91d1",
+        "title_revenue": "\u53ce\u76ca \/ \u53ce\u5165",
         "pref_1D": "1\u65e5",
         "pref_1W": "YYYY\u5e74w[\u9031\u76ee]",
         "pref_1M": "1\u30f5\u6708",
@@ -144,20 +144,20 @@ export default {
         "repeat_freq_yearly": "\u6bce\u5e74",
         "repeat_freq_half-year": "\u534a\u5e74\u3054\u3068",
         "repeat_freq_quarterly": "\u56db\u534a\u671f\u3054\u3068",
-        "repeat_freq_monthly": "\u30af\u30ec\u30b8\u30c3\u30c8\u30ab\u30fc\u30c9\u306e\u5f15\u304d\u843d\u3068\u3057\u65e5",
+        "repeat_freq_monthly": "\u6bce\u6708",
         "repeat_freq_weekly": "\u9031\u6bce",
         "single_split": "\u5206\u5272",
         "asset_accounts": "\u8cc7\u7523\u52d8\u5b9a",
         "expense_accounts": "\u652f\u51fa\u53e3\u5ea7",
-        "liabilities_accounts": "\u8ca0\u50b5",
+        "liabilities_accounts": "\u50b5\u52d9",
         "undefined_accounts": "\u53e3\u5ea7",
-        "name": "\u540d\u524d",
+        "name": "\u540d\u79f0",
         "revenue_accounts": "\u53ce\u5165\u53e3\u5ea7",
         "description": "\u8aac\u660e",
         "category": "\u30ab\u30c6\u30b4\u30ea",
-        "title_deposit": "\u53ce\u5165\u3001\u6240\u5f97\u3001\u5165\u91d1",
+        "title_deposit": "\u53ce\u76ca \/ \u53ce\u5165",
-        "title_transfer": "\u632f\u308a\u66ff\u3048",
+        "title_transfer": "\u9001\u91d1",
-        "title_transfers": "\u632f\u308a\u66ff\u3048",
+        "title_transfers": "\u9001\u91d1",
         "piggyBanks": "\u8caf\u91d1\u7bb1",
         "rules": "\u30eb\u30fc\u30eb",
         "accounts": "\u53e3\u5ea7",
@@ -170,7 +170,7 @@ export default {
         "administration": "\u7ba1\u7406",
         "profile": "\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb",
         "source_account": "\u652f\u51fa\u5143\u53e3\u5ea7",
-        "destination_account": "\u9001\u91d1\u5148\u306e\u30a2\u30ab\u30a6\u30f3\u30c8",
+        "destination_account": "\u9001\u91d1\u5148\u306e\u53e3\u5ea7",
         "amount": "\u91d1\u984d",
         "date": "\u65e5\u4ed8",
         "time": "\u6642\u523b",
@@ -180,7 +180,7 @@ export default {
         "budgets": "\u4e88\u7b97",
         "subscriptions": "\u8b1b\u8aad",
         "welcome_back": "\u6982\u8981",
-        "bills_to_pay": "\u8acb\u6c42\u66f8",
+        "bills_to_pay": "\u652f\u6255\u3046\u3079\u304d\u8acb\u6c42",
         "left_to_spend": "\u652f\u51fa\u3067\u304d\u308b\u6b8b\u308a",
         "net_worth": "\u7d14\u8cc7\u7523",
         "pref_last365": "\u6628\u5e74",

frontend/src/i18n/zh_CN/index.js

@@ -53,7 +53,7 @@ export default {
         "rule_trigger_account_id_choice": "\u4efb\u4f55\u4e00\u4e2a\u8d26\u6237ID\u4e3a",
         "rule_trigger_source_account_id_choice": "\u6765\u6e90\u8d26\u6237 ID \u4e3a...",
         "rule_trigger_destination_account_id_choice": "\u76ee\u6807\u8d26\u6237 ID \u4e3a...",
-        "rule_trigger_account_is_cash_choice": "\u4efb\u610f\u4e00\u4e2a\u8d26\u6237\u662f\u73b0\u91d1\u8d26\u6237",
+        "rule_trigger_account_is_cash_choice": "\u5176\u4e2d\u4e00\u4e2a\u8d26\u6237\u662f\u73b0\u91d1\u8d26\u6237",
         "rule_trigger_source_is_cash_choice": "\u6765\u6e90\u8d26\u6237\u4e3a (\u73b0\u91d1) \u8d26\u6237",
         "rule_trigger_destination_is_cash_choice": "\u76ee\u6807\u8d26\u6237\u4e3a (\u73b0\u91d1) \u8d26\u6237",
         "rule_trigger_source_account_nr_starts_choice": "\u6765\u6e90\u8d26\u6237\u7f16\u53f7 \/ IBAN \u5f00\u5934\u4e3a...",
@@ -83,7 +83,7 @@ export default {
         "rule_trigger_created_at_on_choice": "Transaction was made on..",
         "rule_trigger_updated_at_on_choice": "Transaction was last edited on..",
         "rule_trigger_budget_is_choice": "\u9884\u7b97\u4e3a\u2026",
-        "rule_trigger_tag_is_choice": "Any tag is..",
+        "rule_trigger_tag_is_choice": "\u5176\u4e2d\u4e00\u4e2a\u6807\u7b7e\u4e3a...",
         "rule_trigger_currency_is_choice": "\u4ea4\u6613\u8d27\u5e01\u4e3a\u2026",
         "rule_trigger_foreign_currency_is_choice": "\u4ea4\u6613\u5916\u5e01\u4e3a...",
         "rule_trigger_has_attachments_choice": "\u81f3\u5c11\u6709\u8fd9\u4e48\u591a\u9644\u4ef6",
@@ -97,17 +97,17 @@ export default {
         "rule_trigger_has_any_tag_choice": "\u6709\u4e00\u4e2a\u6216\u591a\u4e2a (\u4efb\u4f55) \u6807\u7b7e",
         "rule_trigger_any_notes_choice": "\u6709 (\u4efb\u610f) \u5907\u6ce8",
         "rule_trigger_no_notes_choice": "\u65e0\u5907\u6ce8",
-        "rule_trigger_notes_is_choice": "Notes are..",
+        "rule_trigger_notes_is_choice": "\u5907\u6ce8\u4e3a...",
-        "rule_trigger_notes_contains_choice": "Notes contain..",
+        "rule_trigger_notes_contains_choice": "\u5907\u6ce8\u5305\u542b...",
-        "rule_trigger_notes_starts_choice": "Notes start with..",
+        "rule_trigger_notes_starts_choice": "\u5907\u6ce8\u5f00\u5934\u4e3a...",
-        "rule_trigger_notes_ends_choice": "Notes end with..",
+        "rule_trigger_notes_ends_choice": "\u5907\u6ce8\u7ed3\u5c3e\u4e3a...",
         "rule_trigger_bill_is_choice": "\u8d26\u5355\u662f...",
-        "rule_trigger_external_id_is_choice": "External ID is..",
+        "rule_trigger_external_id_is_choice": "\u5916\u90e8ID\u4e3a...",
-        "rule_trigger_internal_reference_is_choice": "Internal reference is..",
+        "rule_trigger_internal_reference_is_choice": "\u5185\u90e8\u5f15\u7528\u4e3a...",
         "rule_trigger_journal_id_choice": "\u4ea4\u6613\u65e5\u5fd7 ID \u4e3a...",
         "rule_trigger_any_external_url_choice": "\u4ea4\u6613\u6709\u4e00\u4e2a\u5916\u90e8URL",
-        "rule_trigger_no_external_url_choice": "Transaction has no external URL",
+        "rule_trigger_no_external_url_choice": "\u4ea4\u6613\u6ca1\u6709\u5916\u90e8\u94fe\u63a5",
-        "rule_trigger_id_choice": "Transaction ID is..",
+        "rule_trigger_id_choice": "\u4ea4\u6613ID\u4e3a...",
         "rule_action_delete_transaction_choice": "\u5220\u9664\u4ea4\u6613 (!)",
         "rule_action_set_category_choice": "\u5c06\u5206\u7c7b\u8bbe\u4e3a\u2026",
         "rule_action_clear_category_choice": "\u6e05\u7a7a\u4efb\u4f55\u5206\u7c7b",

resources/assets/js/locales/ja.json

@@ -1,54 +1,54 @@
 {
     "firefly": {
         "welcome_back": "\u6982\u8981",
-        "flash_error": "\u30a8\u30e9\u30fc!",
+        "flash_error": "\u30a8\u30e9\u30fc\uff01",
         "flash_success": "\u6210\u529f\u3057\u307e\u3057\u305f\uff01",
         "close": "\u9589\u3058\u308b",
-        "split_transaction_title": "\u53d6\u308a\u5f15\u304d \":description\" \u3092\u7de8\u96c6\u3059\u308b",
+        "split_transaction_title": "\u5206\u5272\u53d6\u5f15\u306e\u8aac\u660e",
         "errors_submission": "\u9001\u4fe1\u306b\u554f\u984c\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u30a8\u30e9\u30fc\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002",
         "split": "\u5206\u5272",
         "single_split": "\u5206\u5272",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">\u53d6\u5f15 #{ID}\u300c{title}\u300d<\/a> \u304c\u4fdd\u5b58\u3055\u308c\u307e\u3057\u305f\u3002",
         "transaction_updated_link": "<a href=\"transactions\/show\/{ID}\">\u53d6\u5f15 #{ID}\u300c{title}\u300d<\/a> \u304c\u66f4\u65b0\u3055\u308c\u307e\u3057\u305f\u3002",
         "transaction_new_stored_link": "<a href=\"transactions\/show\/{ID}\">\u53d6\u5f15 #{ID}<\/a> \u304c\u4fdd\u5b58\u3055\u308c\u307e\u3057\u305f\u3002",
-        "transaction_journal_information": "\u53d6\u5f15",
+        "transaction_journal_information": "\u53d6\u5f15\u60c5\u5831",
         "no_budget_pointer": "\u307e\u3060\u4e88\u7b97\u3092\u7acb\u3066\u3066\u3044\u306a\u3044\u3088\u3046\u3067\u3059\u3002<a href=\"\/budgets\">\u4e88\u7b97<\/a>\u30da\u30fc\u30b8\u3067\u4f5c\u6210\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u4e88\u7b97\u306f\u652f\u51fa\u306e\u628a\u63e1\u306b\u5f79\u7acb\u3061\u307e\u3059\u3002",
         "no_bill_pointer": "\u307e\u3060\u8acb\u6c42\u304c\u306a\u3044\u3088\u3046\u3067\u3059\u3002<a href=\"\/budgets\">\u8acb\u6c42<\/a>\u30da\u30fc\u30b8\u3067\u4f5c\u6210\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u8acb\u6c42\u306f\u652f\u51fa\u306e\u628a\u63e1\u306b\u5f79\u7acb\u3061\u307e\u3059\u3002",
         "source_account": "\u652f\u51fa\u5143\u53e3\u5ea7",
         "hidden_fields_preferences": "<a href=\"preferences\">\u8a2d\u5b9a<\/a> \u3067\u8ffd\u52a0\u306e\u53d6\u5f15\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u6709\u52b9\u306b\u3067\u304d\u307e\u3059\u3002",
-        "destination_account": "\u9001\u91d1\u5148\u306e\u30a2\u30ab\u30a6\u30f3\u30c8",
+        "destination_account": "\u9001\u91d1\u5148\u306e\u53e3\u5ea7",
-        "add_another_split": "\u5206\u5272",
+        "add_another_split": "\u5225\u306e\u5206\u5272\u3092\u8ffd\u52a0",
         "submission": "\u9001\u4fe1",
-        "create_another": "\u4fdd\u5b58\u5f8c\u3001\u3053\u3053\u306b\u623b\u3063\u3066\u5225\u306e\u3082\u306e\u3092\u4f5c\u6210\u3059\u308b\u3002",
+        "create_another": "\u4fdd\u5b58\u5f8c\u306b\u3053\u3053\u306b\u623b\u308a\u3001\u3055\u3089\u306b\u4f5c\u6210\u3059\u308b\u3002",
         "reset_after": "\u9001\u4fe1\u5f8c\u306b\u30d5\u30a9\u30fc\u30e0\u3092\u30ea\u30bb\u30c3\u30c8",
         "submit": "\u9001\u4fe1",
         "amount": "\u91d1\u984d",
         "date": "\u65e5\u4ed8",
         "tags": "\u30bf\u30b0",
-        "no_budget": "\u4e88\u7b97",
+        "no_budget": "(\u4e88\u7b97\u306a\u3057)",
         "no_bill": "(\u8acb\u6c42\u306a\u3057)",
         "category": "\u30ab\u30c6\u30b4\u30ea",
         "attachments": "\u6dfb\u4ed8\u30d5\u30a1\u30a4\u30eb",
         "notes": "\u5099\u8003",
         "external_url": "\u5916\u90e8 URL",
-        "update_transaction": "\u30c1\u30e3\u30f3\u30cd\u30eb\u3092\u66f4\u65b0",
+        "update_transaction": "\u53d6\u5f15\u3092\u66f4\u65b0",
-        "after_update_create_another": "\u4fdd\u5b58\u5f8c\u3001\u3053\u3053\u3078\u623b\u3063\u3066\u304d\u3066\u304f\u3060\u3055\u3044\u3002",
+        "after_update_create_another": "\u4fdd\u5b58\u5f8c\u306b\u3053\u3053\u306b\u623b\u308a\u3001\u7de8\u96c6\u3092\u7d9a\u3051\u308b\u3002",
         "store_as_new": "\u66f4\u65b0\u3067\u306f\u306a\u304f\u3001\u65b0\u3057\u3044\u30c8\u30e9\u30f3\u30b6\u30af\u30b7\u30e7\u30f3\u3068\u3057\u3066\u4fdd\u5b58\u3059\u308b\u3002",
         "split_title_help": "\u5206\u5272\u53d6\u5f15\u3092\u4f5c\u6210\u3059\u308b\u5834\u5408\u3001\u53d6\u5f15\u306e\u3059\u3079\u3066\u306e\u5206\u5272\u306e\u5305\u62ec\u7684\u306a\u8aac\u660e\u304c\u5fc5\u8981\u3067\u3059\u3002",
         "none_in_select_list": "(\u306a\u3057)",
-        "no_piggy_bank": "\u8caf\u91d1\u7bb1",
+        "no_piggy_bank": "(\u8caf\u91d1\u7bb1\u304c\u3042\u308a\u307e\u305b\u3093)",
         "description": "\u8aac\u660e",
         "split_transaction_title_help": "\u5206\u5272\u53d6\u5f15\u3092\u4f5c\u6210\u3059\u308b\u5834\u5408\u3001\u53d6\u5f15\u306e\u3059\u3079\u3066\u306e\u5206\u5272\u306e\u5305\u62ec\u7684\u306a\u8aac\u660e\u304c\u5fc5\u8981\u3067\u3059\u3002",
-        "destination_account_reconciliation": "\u9001\u91d1\u5148\u306e\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u53d6\u5f15\u7167\u5408\u3092\u7de8\u96c6\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002",
+        "destination_account_reconciliation": "\u9001\u91d1\u5148\u53e3\u5ea7\u306e\u53d6\u5f15\u7167\u5408\u3092\u7de8\u96c6\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002",
         "source_account_reconciliation": "\u652f\u51fa\u5143\u53e3\u5ea7\u306e\u53d6\u5f15\u7167\u5408\u3092\u7de8\u96c6\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002",
         "budget": "\u4e88\u7b97",
         "bill": "\u8acb\u6c42",
-        "you_create_withdrawal": "\u51fa\u91d1",
+        "you_create_withdrawal": "\u51fa\u91d1\u3092\u4f5c\u6210\u3057\u3066\u3044\u307e\u3059\u3002",
-        "you_create_transfer": "\u65b0\u3057\u3044\u632f\u308a\u66ff\u3048\u3092\u4f5c\u6210\u3059\u308b",
+        "you_create_transfer": "\u9001\u91d1\u3092\u4f5c\u6210\u3057\u3066\u3044\u307e\u3059\u3002",
-        "you_create_deposit": "\u65b0\u3057\u3044\u9810\u91d1",
+        "you_create_deposit": "\u5165\u91d1\u3092\u4f5c\u6210\u3057\u3066\u3044\u307e\u3059\u3002",
         "edit": "\u7de8\u96c6",
         "delete": "\u524a\u9664",
-        "name": "\u540d\u524d",
+        "name": "\u540d\u79f0",
         "profile_whoops": "\u304a\u3063\u3068\uff01",
         "profile_something_wrong": "\u4f55\u304b\u554f\u984c\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff01",
         "profile_try_again": "\u554f\u984c\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u3082\u3046\u4e00\u5ea6\u3084\u308a\u76f4\u3057\u3066\u304f\u3060\u3055\u3044\u3002",
@@ -88,11 +88,11 @@
         "multi_account_warning_transfer": "\u7d9a\u304f\u5206\u5272\u306e\u9001\u91d1\u5148\u53e3\u5ea7\u3068\u51fa\u91d1\u5143\u53e3\u5ea7\u306f\u3001\u9001\u91d1\u306e\u6700\u521d\u306e\u5206\u5272\u306e\u5b9a\u7fa9\u306b\u3088\u3063\u3066\u8986\u3055\u308c\u308b\u3053\u3068\u306b\u6ce8\u610f\u3057\u3066\u304f\u3060\u3055\u3044\u3002"
     },
     "form": {
-        "interest_date": "\u5229\u606f",
+        "interest_date": "\u5229\u606f\u65e5",
-        "book_date": "\u4e88\u7d04\u65e5",
+        "book_date": "\u8a18\u5e33\u65e5",
         "process_date": "\u51e6\u7406\u65e5",
-        "due_date": "\u3000\u671f\u65e5",
+        "due_date": "\u671f\u65e5",
-        "foreign_amount": "\u5916\u8ca8\u91cf",
+        "foreign_amount": "\u5916\u8ca8\u91d1\u984d",
         "payment_date": "\u5f15\u304d\u843d\u3068\u3057\u65e5",
         "invoice_date": "\u9818\u53ce\u66f8\u767a\u884c\u65e5",
         "internal_reference": "\u5185\u90e8\u53c2\u7167"

resources/assets/js/locales/zh-cn.json

@@ -30,7 +30,7 @@
         "category": "\u5206\u7c7b",
         "attachments": "\u9644\u4ef6",
         "notes": "\u5907\u6ce8",
-        "external_url": "External URL",
+        "external_url": "\u5916\u90e8\u94fe\u63a5",
         "update_transaction": "\u66f4\u65b0\u4ea4\u6613",
         "after_update_create_another": "\u66f4\u65b0\u540e\uff0c\u8fd4\u56de\u6b64\u9875\u9762\u7ee7\u7eed\u7f16\u8f91\u3002",
         "store_as_new": "\u4fdd\u5b58\u4e3a\u65b0\u4ea4\u6613\u800c\u4e0d\u662f\u66f4\u65b0\u6b64\u4ea4\u6613\u3002",

resources/lang/ja_JP/breadcrumbs.php

@@ -29,8 +29,8 @@ return [
     'transactions'           => '取引',
     'title_expenses'         => '支出',
     'title_withdrawal'       => '支出',
-    'title_revenue'          => '収益/収入',
+    'title_revenue'          => '収益 / 収入',
-    'title_deposit'          => '収益/収入',
+    'title_deposit'          => '収益 / 収入',
     'title_transfer'         => '送金',
     'title_transfers'        => '送金',
     'edit_currency'          => '通貨 ":name" を編集する',

resources/lang/ja_JP/config.php

@@ -34,10 +34,10 @@ return [
     'month_and_day_js'         => 'YYYY年MM月DD日',
 
     //'month_and_date_day'      => '%A %B %e, %Y',
-    'month_and_date_day_js'    => 'dddd MMMM Do, YYYY',
+    'month_and_date_day_js'    => 'YYYY年M月D日 ddd',
 
     //'month_and_day_no_year'   => '%B %e',
-    'month_and_day_no_year_js' => 'MMMM Do',
+    'month_and_day_no_year_js' => 'M月D日',
 
     //'date_time'               => '%B %e, %Y, @ %T',
     'date_time_js'             => 'YYYY年MM月DD日 HH:mm:ss',

resources/lang/ja_JP/demo.php

@@ -26,12 +26,11 @@ return [
     'no_demo_text'           => '申し訳ありませんが、<abbr title=":route">このページ</abbr>のデモ説明文はもうありません。',
     'see_help_icon'          => '右上角にある<i class="fa fa-question-circle"></i>アイコンが更に多くの情報を教えてくれるかもしれません。',
     'index'                  => '<strong>Firefly III</strong>へようこそ！このページでは、あなたの収支に関しての基本的な情報が得られます。詳しくは、&rarr;<a href=":asset">Asset Accounts</a>アカウントを確認、あるいは<a href=":budgets">予算</a>や<a href=":reports">レポート</a>ページを見てください。或いは、気ままに見て回るのも良いでしょう。',
-    'accounts-index'         => '資産勘定はあなたの個人預金口座です。支出元アカウントはあなたがお金を支出する場所、店や友人などです。
+    'accounts-index'         => '資産口座はあなた個人の銀行口座です。支出口座はあなたがお金を支出するところ、店や友人などです。収入口座はお金を受け取る、仕事や政府、その他の収入源です。債務はあなたの負債や古いクレジットカードの借金、奨学金などのローンです。このページではそれらを編集、削除できます。',
-収入アカウントはお金を受け取る元、あなたの仕事や政府などの収入源です。債務はあなたの負債や古いクレジットカードの借金、奨学金などのローンです。このページではそれらを編集したり削除したりできます。',
+    'budgets-index'          => 'このページは予算の概要を表示します。一番上のバーは予算計上に利用可能な残高を表しています。これは右の残高をクリックすることによってどんな期間にも変更できます。',
-    'budgets-index'          => 'このページはあなたの支出の概要を表しています。一番上のバーは予算計上に利用可能な残高を表しています。これは右の残高をクリックすることによってどんな期間にも変更できます。',
     'reports-index-start'    => 'Firefly IIIは多くの形式のレポートに対応しています。右上角の<i class="fa fa-question-circle"></i>アイコンで見ることができます。',
     'reports-index-examples' => 'これらの例を必ず確認してください：<a href=":one">毎月の財務概要</a>、<a href=":two">年次財務概要</a>、<a href=":three">予算概要</a>。',
-    'currencies-index'       => 'Firefly IIIは多くの通貨に対応しています。デフォルトはユーロですが、米ドルや他の多くの通貨に変更することもできます。ご覧のように少しの種類の通貨しか含まれていませんが、あなたの好みで追加することも出来ます。デフォルトの通貨を変更しても既存の収支には影響ありません: Firefly IIIは同時に複数の通貨を扱うことができます。',
+    'currencies-index'       => 'Firefly III は多くの通貨に対応しています。デフォルトはユーロですが、米ドルや他の多くの通貨に変更することもできます。ご覧のように少しの種類の通貨しかありませんが、あなたの好みで追加できます。デフォルトの通貨を変更しても既存の収支には影響ありません: Firefly IIIは同時に複数の通貨を扱うことができます。',
     'transactions-index'     => 'これらの経費、預金、送金などに特に意味はありません。自動で生成されたものです。',
     'piggy-banks-index'      => 'ご覧のように、3つの貯金箱があります。プラスやマイナスのボタンでそれぞれの貯金箱のお金の量を調整することができます。貯金箱の名前をクリックするとそれぞれの貯金箱の管理ができます。',
     'profile-index'          => 'デモサイトは4時間毎にリセットされることに注意してください。あなたの変更はいつでも破棄される可能性があります。これは自動的に行われ、バグではありません。',

resources/lang/ja_JP/email.php

@@ -36,7 +36,7 @@ return [
     // new IP
     'login_from_new_ip'                       => 'Firefly III に新しいログイン',
     'new_ip_body'                             => 'Firefly III が未知のIPアドレスからあなたのアカウントへの新しいログインを検出しました。 以下のIPアドレスからログインしたことがないか、ログインから6ヶ月以上経過している場合、Firefly IIIは警告します。',
-    'new_ip_warning'                          => 'このIPアドレスまたはログインに覚えがある場合は、このメッセージを無視できます。 ログインしていないか、これが何であるかがわからない場合、 パスワードのセキュリティを確認、変更し、すべてのセッションをログアウトしてください。 これはあなたのプロフィールページから行えます。もちろん、あなたはすでに2FAが有効になっていますよね?',
+    'new_ip_warning'                          => 'この IP アドレスまたはログインに覚えがある場合は、このメッセージを無視してください。 ログインしていないか、これが何であるかがわからない場合、 パスワードの安全性を確認、変更し、すべてのセッションをログアウトしてください。 これはプロフィールページからできます。もちろん、すでに2要素認証は有効にしていますよね？ご安全に！',
     'ip_address'                              => 'IPアドレス',
     'host_name'                               => 'ホスト',
     'date_time'                               => '日付と時刻',

resources/lang/ja_JP/form.php

@@ -31,7 +31,7 @@ return [
     'automatch'                   => '自動的に一致',
     'skip'                        => 'スキップ',
     'enabled'                     => '有効',
-    'name'                        => '名前',
+    'name'                        => '名称',
     'active'                      => '有効',
     'amount_min'                  => '最低額',
     'amount_max'                  => '上限額',
@@ -47,57 +47,57 @@ return [
     'external_ip'                 => 'サーバーの外部IPアドレス',
     'attachments'                 => '添付ファイル',
     'BIC'                         => 'BIC',
-    'verify_password'             => 'パスワードのセキュリティを確認',
+    'verify_password'             => 'パスワードの安全性確認',
     'source_account'              => '支出元口座',
-    'destination_account'         => '送金先口座',
+    'destination_account'         => '送金先の口座',
-    'asset_destination_account'   => '送金先口座',
+    'asset_destination_account'   => '送金先の口座',
     'include_net_worth'           => '純資産に含める',
     'asset_source_account'        => '支出元口座',
     'journal_description'         => '説明',
     'note'                        => '備考',
     'currency'                    => '通貨',
-    'account_id'                  => '資産勘定',
+    'account_id'                  => '資産口座',
     'budget_id'                   => '予算',
     'bill_id'                     => '請求',
     'opening_balance'             => '開始残高',
     'tagMode'                     => 'タグモード',
     'virtual_balance'             => '仮想残高',
-    'targetamount'                => '入金先に入金される金額',
+    'targetamount'                => '目標金額',
     'account_role'                => '口座の役割',
     'opening_balance_date'        => '残高開始日',
-    'cc_type'                     => 'クレジットカードの決済方法',
+    'cc_type'                     => 'クレジットカードの支払い方法',
     'cc_monthly_payment_date'     => 'クレジットカードの引き落とし日',
     'piggy_bank_id'               => '貯金箱',
     'returnHere'                  => 'ここへ戻る',
     'returnHereExplanation'       => '保存後、ここに戻って別のものを作成する。',
-    'returnHereUpdateExplanation' => '保存後、ここへ戻ってきてください。',
+    'returnHereUpdateExplanation' => '保存後、ここへ戻る。',
     'description'                 => '説明',
-    'expense_account'             => '支出元アカウント',
+    'expense_account'             => '支出口座',
-    'revenue_account'             => '収入アカウント',
+    'revenue_account'             => '収入口座',
     'decimal_places'              => '小数点以下の桁',
-    'destination_amount'          => '金額（先）',
+    'destination_amount'          => '金額 (宛先)',
     'new_email_address'           => '新しいメールアドレス',
     'verification'                => '認証',
     'api_key'                     => 'APIキー',
     'remember_me'                 => 'ログインを維持',
-    'liability_type_id'           => '債務形式',
+    'liability_type_id'           => '債務種別',
     'liability_type'              => '債務種別',
     'interest'                    => '利息',
     'interest_period'             => '利息期間',
     'extension_date'              => '延長日',
-    'type'                        => 'タイプ',
+    'type'                        => '種別',
     'convert_Withdrawal'          => '出金を変換',
-    'convert_Deposit'             => '預金を変換',
+    'convert_Deposit'             => '出金を変換',
     'convert_Transfer'            => '送金を変換',
     'amount'                      => '金額',
-    'foreign_amount'              => '外貨量',
+    'foreign_amount'              => '外貨金額',
     'date'                        => '日付',
-    'interest_date'               => '利息',
+    'interest_date'               => '利息日',
-    'book_date'                   => '予約日',
+    'book_date'                   => '記帳日',
     'process_date'                => '処理日',
     'category'                    => 'カテゴリ',
     'tags'                        => 'タグ',
-    'deletePermanently'           => '永久に削除',
+    'deletePermanently'           => '完全に削除',
     'cancel'                      => 'キャンセル',
     'targetdate'                  => '目標日付',
     'startdate'                   => '開始日',
@@ -109,7 +109,7 @@ return [
     'account_number'              => '口座番号',
     'creditCardNumber'            => 'クレジットカード番号',
     'has_headers'                 => 'ヘッダー',
-    'date_format'                 => '日付書式',
+    'date_format'                 => '日付形式',
     'specifix'                    => '銀行またはファイル固有の修正',
     'attachments[]'               => '添付ファイル',
     'title'                       => 'タイトル',
@@ -124,18 +124,18 @@ return [
     'enddate'                     => '終了日',
     'start'                       => '期間の開始',
     'end'                         => '期間の終了',
-    'delete_account'              => '勘定":name" を削除する',
+    'delete_account'              => '口座「:name」を削除',
-    'delete_bill'                 => '請求書 ":name" を削除する',
+    'delete_bill'                 => '請求「:name」を削除',
-    'delete_budget'               => '予算":name" を削除する',
+    'delete_budget'               => '予算「:name」を削除',
-    'delete_category'             => 'カテゴリ":name" を削除する',
+    'delete_category'             => 'カテゴリ「:name」を削除',
-    'delete_currency'             => '通貨 ":name" を削除する',
+    'delete_currency'             => '通貨「:name」を削除',
-    'delete_journal'              => '取り引き ":description" を削除する',
+    'delete_journal'              => '説明「:description」がある取引を削除',
-    'delete_attachment'           => '添付',
+    'delete_attachment'           => '添付ファイル「:name」を削除',
-    'delete_rule'                 => '削除',
+    'delete_rule'                 => 'ルール「:title」を削除',
     'delete_rule_group'           => 'ルールグループ「:title」を削除',
     'delete_link_type'            => 'リンクタイプ「:name」を削除しました',
-    'delete_user'                 => '削除',
+    'delete_user'                 => 'ユーザー「:email」を削除',
-    'delete_recurring'            => '取り引き ":description" を削除する',
+    'delete_recurring'            => '定期的な取引「:title」を削除',
     'user_areYouSure'             => 'ユーザー 「:email」 を削除すると、すべてが消去されます。元に戻すことはできません。 あなたが自分自身を削除すると、この Firefly III へのアクセスができなくなります。',
     'attachment_areYouSure'       => '添付ファイル「:name」を削除してもよろしいですか？',
     'account_areYouSure'          => 'アカウント「:name」を削除してもよろしいですか？',
@@ -176,15 +176,15 @@ return [
     'email'                       => 'メールアドレス',
     'password'                    => 'パスワード',
     'password_confirmation'       => 'パスワード(確認)',
-    'blocked'                     => 'あなたはログアウトしました。ブロックされたアカウントはこのサイトを使うことが出来ません。有効なメールアドレスで登録しましたか？',
+    'blocked'                     => 'ブロック済み',
-    'blocked_code'                => 'ブロック',
+    'blocked_code'                => 'ブロック理由',
     'login_name'                  => 'ログイン',
     'is_owner'                    => '管理者は？',
     'url'                         => 'URL',
     'bill_end_date'               => '終了日',
 
     // import
-    'apply_rules'                 => '適用',
+    'apply_rules'                 => 'ルールを適用',
     'artist'                      => 'アーティスト',
     'album'                       => 'アルバム',
     'song'                        => '曲',
@@ -207,7 +207,7 @@ return [
     'public_key'                  => '公開鍵',
     'country_code'                => '国名コード',
     'provider_code'               => '銀行またはデータ提供会社',
-    'fints_url'                   => 'APIキー',
+    'fints_url'                   => 'FinTS API URL',
     'fints_port'                  => 'ポート',
     'fints_bank_code'             => '銀行コード',
     'fints_username'              => 'ユーザー名',
@@ -216,7 +216,7 @@ return [
     'local_account'               => 'Firefly III アカウント',
     'from_date'                   => '開始日',
     'to_date'                     => '終了日',
-    'due_date'                    => '　期日',
+    'due_date'                    => '期日',
     'payment_date'                => '引き落とし日',
     'invoice_date'                => '領収書発行日',
     'internal_reference'          => '内部参照',
@@ -224,10 +224,10 @@ return [
     'outward'                     => '外向きの説明',
     'rule_group_id'               => 'ルールグループ',
     'transaction_description'     => '取引の説明',
-    'first_date'                  => '開始日',
+    'first_date'                  => '最初の日付',
-    'transaction_type'            => '取引の種類',
+    'transaction_type'            => '取引種別',
-    'repeat_until'                => '繰り返し回数か、終了日(repeat_until) が必要です。両方は使えません。',
+    'repeat_until'                => '繰り返し期限',
-    'recurring_description'       => '取り引き ":description" を削除する',
+    'recurring_description'       => '定期的な取引の説明',
     'repetition_type'             => '繰り返しの種類',
     'foreign_currency_id'         => '外貨',
     'repetition_end'              => 'リピート終了',
@@ -235,9 +235,9 @@ return [
     'calendar'                    => 'カレンダー',
     'weekend'                     => '週末',
     'client_secret'               => 'クライアントシークレット',
-    'withdrawal_destination_id'   => '送信先口座',
+    'withdrawal_destination_id'   => '送信先の口座',
     'deposit_source_id'           => '支出元口座',
-    'expected_on'                 => '予期された',
+    'expected_on'                 => '予定日時',
     'paid'                        => '支払い済み',
     'auto_budget_type'            => '自動予算',
     'auto_budget_amount'          => '自動予算額',

resources/lang/ja_JP/intro.php

@@ -26,11 +26,11 @@ return [
     // index
     'index_intro'                           => 'Firefly IIIのインデックスページへようこそ。このイントロダクションでは、Firefly IIIがどのように機能するのかをご紹介します。',
     'index_accounts-chart'                  => 'このチャートは、お客様の資産口座の現在の残高を表示しています。お客様のご希望でここに表示するかどうか選択できます。',
-    'index_box_out_holder'                  => 'この小さな吹き出しとこの横にある吹き出しは収支状況の概要を表示しています。',
+    'index_box_out_holder'                  => 'この小さな吹き出しとこの横にある吹き出しは、財務状況の概要を表示しています。',
     'index_help'                            => 'ページや入力欄について助けが必要なら、このボタンを押して下さい。',
     'index_outro'                           => 'Firefly IIIの多くのページはこのような小さなツアーから始まります。もし質問やコメントがある場合は、私に連絡して下さい。楽しんで！',
     'index_sidebar-toggle'                  => '新しい取引やアカウントなどを作成するには、このアイコン下のメニューを使用して下さい。',
-    'index_cash_account'                    => 'これらは今までに作られたアカウントです。現金支出を管理するため現金アカウントを使うこともできますが、もちろん強制ではありません。',
+    'index_cash_account'                    => 'これらは今までに作られた口座です。現金支出を管理するため現金口座を使うこともできますが、もちろん強制ではありません。',
 
     // transactions
     'transactions_create_basic_info'        => '貸方、借方、日付、説明など、取引の基本情報を入力します。',
@@ -39,15 +39,15 @@ return [
     'transactions_create_split'             => '取引を分割する場合は、このボタンでさらに分割を追加します',
 
     // create account:
-    'accounts_create_iban'                  => 'あなたのアカウントには有効なIBANを設定してください。これは将来のデータインポートをとても簡単にします。',
+    'accounts_create_iban'                  => '口座の有効な IBAN を設定してください。これは将来のデータインポートをとても簡単にします。',
     'accounts_create_asset_opening_balance' => '資産口座には Firefly III のアカウントの履歴の開始を示す「開始残高」があります。',
-    'accounts_create_asset_currency'        => 'Firefly IIIは複数の通貨をサポートしています。経費勘定は一つの主通貨を持っており、あなたはここでそれを選択する必要があります。',
+    'accounts_create_asset_currency'        => 'Firefly IIIは複数の通貨をサポートしています。資産口座は一つのメイン通貨を持っており、ここで選択する必要があります。',
-    'accounts_create_asset_virtual'         => 'あなたのアカウントに仮想の残高を与えることはしばしば助けになるかもしれません: 余剰は常に実際の残高から差し引かれます。',
+    'accounts_create_asset_virtual'         => '口座に仮想の残高を与えることはしばしば助けになるかもしれません: 余剰は常に実際の残高から差し引かれます。',
 
     // budgets index
-    'budgets_index_intro'                   => '予算はあなたの財源を管理するために使用され、Firefly IIIの一つの主要機能を構成します。',
+    'budgets_index_intro'                   => '予算はあなたの財務を管理するために使用され、Firefly III の一つの主要機能を構成します。',
     'budgets_index_set_budget'              => 'Firefly IIIがあなたが割り当て可能なすべての金額を予算計上したかどうか伝えられるように。あなたの毎期間の合計予算を設定してください。',
-    'budgets_index_see_expenses_bar'        => '消費した金額が少しずつこのバーを埋めます。',
+    'budgets_index_see_expenses_bar'        => '支出金額が少しずつこのバーを満たします。',
     'budgets_index_navigate_periods'        => '期間を操作することで、予算を事前に簡単に設定できます。',
     'budgets_index_new_budget'              => 'あなたが妥当だと考える新しい予算を設定してください。',
     'budgets_index_list_of_budgets'         => '各予算の金額を設定したり自分の行っていることを確認するためにこの表を使ってください。',
@@ -80,7 +80,7 @@ return [
     // create transaction
     'transactions_create_switch_box'                          => 'これらのボタンを使用して、保存したい取引の種類をすばやく切り替えます。',
     'transactions_create_ffInput_category'                    => 'このフィールドでは自由に入力できます。以前に作成したカテゴリが推奨されます。',
-    'transactions_create_withdrawal_ffInput_budget'           => 'より良い財務管理のために、出金に予算を紐付けます。',
+    'transactions_create_withdrawal_ffInput_budget'           => 'より良い財務管理のために、出金を予算に紐付けます。',
     'transactions_create_withdrawal_currency_dropdown_amount' => '出金が別の通貨の場合は、このドロップダウンを使用してください。',
     'transactions_create_deposit_currency_dropdown_amount'    => '入金が別の通貨である場合は、このドロップダウンを使用してください。',
     'transactions_create_transfer_ffInput_piggy_bank_id'      => '貯金箱を選択し、この送金をその貯金とします。',
@@ -127,7 +127,7 @@ return [
     'rules_index_outro'                                       => '右上の (?) アイコンからヘルプページを確認してください。',
 
     // create rule:
-    'rules_create_mandatory'                                  => '説明的なタイトルを入力し、ルールが実行されるタイミングを設定します。',
+    'rules_create_mandatory'                                  => 'わかりやすいタイトルを入力し、ルールが実行されるタイミングを設定します。',
     'rules_create_ruletriggerholder'                          => '好きなだけトリガーを追加してください。アクションが実行されるには全てトリガーが一致しなければならないことを覚えておいてください。',
     'rules_create_test_rule_triggers'                         => 'ルールに一致する取引を確認するには、このボタンを使用します。',
     'rules_create_actions'                                    => '好きなだけアクションを設定します。',
@@ -137,8 +137,8 @@ return [
 
     // currencies
     'currencies_index_intro'                                  => 'Firefly III は複数の通貨をサポートしており、このページで変更できます。',
-    'currencies_index_default'                                => 'Firefly IIIにはデフォルト通貨が1つあります。',
+    'currencies_index_default'                                => 'Firefly III にはデフォルト通貨が1つあります。',
-    'currencies_index_buttons'                                => 'これらのボタンを使用して、デフォルトの通貨を変更したり、他の通貨を有効にします。',
+    'currencies_index_buttons'                                => 'これらのボタンで、デフォルト通貨を変更したり、他の通貨を有効にします。',
 
     // create currency
     'currencies_create_code'                                  => 'このコードはISOに準拠している必要があります(新しい通貨はググってください)。',

resources/lang/ja_JP/list.php

@@ -31,35 +31,35 @@ return [
     'updated_at'              => '更新日時',
     'balance_before'          => '前の残高',
     'balance_after'           => '後の残高',
-    'name'                    => '名前',
+    'name'                    => '名称',
     'role'                    => '役割',
     'currentBalance'          => '現在の残高',
     'linked_to_rules'         => '関連ルール',
-    'active'                  => '有効?',
+    'active'                  => '有効',
     'percentage'              => 'パーセント',
     'recurring_transaction'   => '繰り返しの収支',
     'next_due'                => '次の期限',
-    'transaction_type'        => 'タイプ',
+    'transaction_type'        => '種別',
     'lastActivity'            => '最終アクティビティ',
     'balanceDiff'             => '残高差',
     'other_meta_data'         => 'その他のメタデータ',
-    'account_type'            => '口座の種類',
+    'account_type'            => '口座種別',
     'created_at'              => '作成日時',
     'account'                 => '口座',
     'external_url'            => '外部 URL',
     'matchingAmount'          => '金額',
-    'destination'             => '資産勘定（支出先）',
+    'destination'             => '宛先',
-    'source'                  => '収入アカウント（収入源）',
+    'source'                  => '源泉',
-    'next_expected_match'     => '次の予期された一致',
+    'next_expected_match'     => '次の一致予測',
-    'automatch'               => '自動的に一致したか?',
+    'automatch'               => '自動一致',
     'repeat_freq'             => '繰り返し',
     'description'             => '説明',
     'amount'                  => '金額',
     'date'                    => '日付',
-    'interest_date'           => '利息',
+    'interest_date'           => '利息日',
     'book_date'               => '予約日',
     'process_date'            => '処理日',
-    'due_date'                => '締切日',
+    'due_date'                => '期限日',
     'payment_date'            => '引き落とし日',
     'invoice_date'            => '領収書発行日',
     'internal_reference'      => 'システム内参考品',
@@ -71,25 +71,25 @@ return [
     'category'                => 'カテゴリ',
     'bill'                    => '請求',
     'withdrawal'              => '出金',
-    'deposit'                 => '預金',
+    'deposit'                 => '入金',
     'transfer'                => '送金',
-    'type'                    => '種類',
+    'type'                    => '種別',
     'completed'               => '完了',
     'iban'                    => 'IBAN',
     'account_number'              => '口座番号',
-    'paid_current_period'     => '期間',
+    'paid_current_period'     => 'この期間の支払い済み',
-    'email'                   => '新しいメールアドレス',
+    'email'                   => 'Email',
-    'registered_at'           => '登録に成功しました！',
+    'registered_at'           => '登録日時',
     'is_blocked'              => 'ブロック済み',
-    'is_admin'                => '管理者か',
+    'is_admin'                => '管理者',
-    'has_two_factor'          => '2段階認証が有効か',
+    'has_two_factor'          => '2要素認証が有効か',
     'blocked_code'            => 'ブロックコード',
-    'source_account'          => '支出元口座',
+    'source_account'          => '源泉口座',
-    'destination_account'     => '送金先のアカウント',
+    'destination_account'     => '宛先口座',
     'accounts_count'          => '口座数',
     'journals_count'          => '取引数',
     'attachments_count'       => '添付ファイル数',
-    'bills_count'             => '請求書数',
+    'bills_count'             => '請求数',
     'categories_count'        => 'カテゴリ数',
     'budget_count'            => '予算数',
     'rule_and_groups_count'   => 'ルールとルールグループ数',
@@ -102,7 +102,7 @@ return [
     'sum'                     => '合計',
     'sum_excluding_transfers' => '合計 (送金を除く)',
     'sum_withdrawals'         => '合計出金額',
-    'sum_deposits'            => '預金合計額',
+    'sum_deposits'            => '入金合計額',
     'sum_transfers'           => '合計送金額',
     'sum_reconciliations'     => '調整の合計',
     'reconcile'               => '照合',
@@ -128,11 +128,11 @@ return [
     'repetitions'             => '繰り返し',
     'title'                   => 'タイトル',
     'transaction_s'           => '取引',
-    'field'                   => '入力欄',
+    'field'                   => '項目',
     'value'                   => '数値',
     'interest'                => '利息',
     'interest_period'         => '利息期間',
-    'liability_type'          => '債務形式',
+    'liability_type'          => '債務種別',
     'liability_direction'     => '債務の出入',
     'end_date'                => '終了日',
     'payment_info'            => '支払情報',

resources/lang/ja_JP/validation.php

@@ -34,23 +34,23 @@ return [
     'zero_or_more'                   => '数値はマイナスにできません。',
     'date_or_time'                   => '数値はISO 8601 準拠の有効な日付や時刻である必要があります。',
     'source_equals_destination'      => '支出元と支出先が同じです。',
-    'unique_account_number_for_user' => 'このアカウント番号は既に使われているようです。',
+    'unique_account_number_for_user' => 'この口座番号は既に使われているようです。',
     'unique_iban_for_user'           => 'このIBANは既に使われているようです。',
-    'deleted_user'                   => 'セキュリティー上の制約から、このメールアドレスでは登録できません。',
+    'deleted_user'                   => 'セキュリティ上の制約から、このメールアドレスでは登録できません。',
-    'rule_trigger_value'             => 'この数値は選択されたトリガーには無効です。',
+    'rule_trigger_value'             => 'この値は選択されたトリガーには無効です。',
-    'rule_action_value'              => 'この数値は選択された操作には無効です。',
+    'rule_action_value'              => 'この値は選択された操作には無効です。',
     'file_already_attached'          => 'アップロードされたファイル ":name"は既に対象に割り当てられています。',
     'file_attached'                  => 'ファイル ":name" のアップロードに成功しました。',
     'must_exist'                     => ':attribute のIDはデータベースに存在しません。',
-    'all_accounts_equal'             => 'この欄のすべてのアカウントは一致している必要があります。',
+    'all_accounts_equal'             => 'この欄のすべての口座は一致している必要があります。',
     'group_title_mandatory'          => '一つ以上の取引がある場合、グループ名は必須です。',
-    'transaction_types_equal'        => 'すべての分割先は同じ形式である必要があります。',
+    'transaction_types_equal'        => 'すべての分割は同じ種別である必要があります。',
-    'invalid_transaction_type'       => '無効なトランザクション形式です。',
+    'invalid_transaction_type'       => '無効な取引種別です。',
     'invalid_selection'              => 'あなたの選択は無効です。',
-    'belongs_user'                   => 'この欄ではその数値は無効です。',
+    'belongs_user'                   => 'この欄ではその値は無効です。',
     'at_least_one_transaction'       => '最低でも一つの取引が必要です。',
     'at_least_one_repetition'        => '最低でも一回の繰り返しが必要です。',
-    'require_repeat_until'           => '繰り返し回数か、終了日(repeat_until) が必要です。両方は使えません。',
+    'require_repeat_until'           => '繰り返し回数か、終了日 (繰り返し期限) が必要です。両方は使えません。',
     'require_currency_info'          => 'この項目の内容は通貨情報がなければ無効です。',
     'not_transfer_account'           => 'このアカウントは送金に使用できるアカウントではありません。',
     'require_currency_amount'        => 'この項目の内容は、外部金額情報がなければ無効です。',
@@ -74,16 +74,16 @@ return [
     'alpha_dash'                     => ':attributeには、英数字(\'A-Z\',\'a-z\',\'0-9\')とハイフン(-)が使用できます。',
     'alpha_num'                      => ':attributeには、英数字(\'A-Z\',\'a-z\',\'0-9\')が使用できます。',
     'array'                          => ':attributeには、配列を指定してください。',
-    'unique_for_user'                => 'このIBANは既に使われているようです。',
+    'unique_for_user'                => 'この :attribute のエントリがすでにあります。',
     'before'                         => ':attributeには、:dateより前の日付を指定してください。',
-    'unique_object_for_user'         => 'このIBANは既に使われているようです。',
+    'unique_object_for_user'         => 'この名称はすでに使われています。',
-    'unique_account_for_user'        => 'このアカウント番号は既に使われているようです。',
+    'unique_account_for_user'        => 'この口座番号は既に使われているようです。',
     'between.numeric'                => ':attributeには、:minから、:maxまでの数字を指定してください。',
     'between.file'                   => ':attributeには、:min KBから:max KBまでのサイズのファイルを指定してください。',
     'between.string'                 => ':attributeは、:min文字から:max文字にしてください。',
     'between.array'                  => ':attributeの項目は、:min個から:max個にしてください。',
     'boolean'                        => ':attributeには、\'true\'か\'false\'を指定してください。',
-    'confirmed'                      => ':attributeが一致しません。',
+    'confirmed'                      => ':attribute の確認が一致しません。',
     'date'                           => ':attributeは、正しい日付ではありません。',
     'date_format'                    => ':attribute は :format と一致しません。',
     'different'                      => ':attributeと:otherには、異なるものを指定してください。',
@@ -143,21 +143,21 @@ return [
     'starts_with'                    => '値は :values で始まる必要があります。',
     'unique_webhook'                 => 'すでにこれらの値の Webhook があります。',
     'unique_existing_webhook'        => 'これらの値を持つ別の Webhook が既にあります。',
-    'same_account_type'              => 'これらの口座は同じ口座タイプでなければなりません',
+    'same_account_type'              => 'これらの口座は同じ口座種別でなければなりません',
     'same_account_currency'          => 'これらの口座には同じ通貨設定でなければいけません',
 
     'secure_password'             => 'これは安全なパスワードではありません。もう一度やり直してください。詳細については、https://bit.ly/FF3-password-security を参照してください。',
     'valid_recurrence_rep_type'   => '繰り返し取引のタイプが無効です。',
     'valid_recurrence_rep_moment' => '無効な繰り返し設定があります。',
-    'invalid_account_info'        => 'あなたの選択は無効です。',
+    'invalid_account_info'        => 'アカウント情報が正しくありません。',
     'attributes'                  => [
-        'email'                   => '新しいメールアドレス',
+        'email'                   => 'メールアドレス',
         'description'             => '説明',
         'amount'                  => '金額',
         'transactions.*.amount'   => '取引金額',
-        'name'                    => '名前',
+        'name'                    => '名称',
-        'piggy_bank_id'           => '貯金箱',
+        'piggy_bank_id'           => '貯金箱 ID',
-        'targetamount'            => '入金先に入金される金額',
+        'targetamount'            => '目標金額',
         'opening_balance_date'    => '残高開始日',
         'opening_balance'         => '開始残高',
         'match'                   => '一致',

resources/lang/ru_RU/email.php

@@ -52,8 +52,8 @@ return [
     'registered_welcome'                      => 'Добро пожаловать в [Firefly III](:address). Подтверждаем вашу регистрацию этим e-mail. Ура!',
     'registered_pw'                           => 'Если вы забыли ваш пароль, пожалуйста, создайте его повторно используя [оснастку по сбросу пароля](:address/password/reset).',
     'registered_help'                         => 'В верхнем правом углу страницы есть иконка справки. Если вам нужна помощь, нажмите её!',
-    'registered_doc_html'                     => 'If you haven\'t already, please read the [grand theory](https://docs.firefly-iii.org/about-firefly-iii/personal-finances).',
+    'registered_doc_html'                     => 'Если вы еще этого не сделали, прочтите [великую теорию](https://docs.firefly-iii.org/about-firefly-iii/personal-finances).',
-    'registered_doc_text'                     => 'If you haven\'t already, please also read the first use guide and the full description.',
+    'registered_doc_text'                     => 'Если вы еще этого не сделали, прочтите краткое руководство по использованию и полное описание.',
     'registered_closing'                      => 'Наслаждайтесь!',
     'registered_firefly_iii_link'             => 'Firefly III:',
     'registered_pw_reset_link'                => 'Сбросить пароль:',
@@ -112,6 +112,6 @@ return [
     'bill_warning_extension_date'             => 'Your bill **":name"** is due to be extended or cancelled on :date. This moment will pass in about **:diff days**.',
     'bill_warning_end_date_zero'              => 'Your bill **":name"** is due to end on :date. This moment will pass **TODAY!**',
     'bill_warning_extension_date_zero'        => 'Your bill **":name"** is due to be extended or cancelled on :date. This moment will pass **TODAY!**',
-    'bill_warning_please_action'              => 'Please take the appropriate action.',
+    'bill_warning_please_action'              => 'Просим принять соответствующие меры.',
 
 ];

resources/lang/zh_CN/firefly.php

@@ -358,14 +358,14 @@ return [
     // new
     'search_modifier_tag_is_not'                      => 'No tag is ":value"',
 
-    'search_modifier_account_is'                          => '任意一个账户是":value"',
+    'search_modifier_account_is'                          => '其中一个账户为":value"',
-    'search_modifier_account_contains'                    => '任意一个账户包含":value"',
+    'search_modifier_account_contains'                    => '其中一个账户包含":value"',
-    'search_modifier_account_ends'                        => '任意一个账户结尾为":value"',
+    'search_modifier_account_ends'                        => '其中一个账户结尾为 ":value"',
-    'search_modifier_account_starts'                      => '任意一个账户开头为":value"',
+    'search_modifier_account_starts'                      => '其中一个账户开头为":value"',
-    'search_modifier_account_nr_is'                       => '任意一个账户编号/IBAN为":value"',
+    'search_modifier_account_nr_is'                       => '其中一个账户编号/IBAN为":value"',
-    'search_modifier_account_nr_contains'                 => '任意一个账户编号/IBAN包含":value"',
+    'search_modifier_account_nr_contains'                 => '其中一个账户编号/IBAN包含":value"',
-    'search_modifier_account_nr_ends'                     => '任意一个账户编号/IBAN结尾为":value"',
+    'search_modifier_account_nr_ends'                     => '其中一个账户编号/IBAN结尾为":value"',
-    'search_modifier_account_nr_starts'                   => '任意一个账户编号/IBAN开头为":value"',
+    'search_modifier_account_nr_starts'                   => '其中一个账户编号/IBAN开头为":value"',
     'search_modifier_category_contains'                   => '分类包含":value"',
     'search_modifier_category_ends'                       => '分类结尾为":value"',
     'search_modifier_category_starts'                     => '分类开头为":value"',
@@ -386,7 +386,7 @@ return [
     'search_modifier_external_url_ends'                   => 'External URL ends with ":value"',
     'search_modifier_external_url_starts'                 => 'External URL starts with ":value"',
     'search_modifier_has_no_attachments'                  => 'Transaction has no attachments',
-    'search_modifier_account_is_cash'                     => '任意一个账户是现金账户',
+    'search_modifier_account_is_cash'                     => '其中一个账户是现金账户',
     'search_modifier_journal_id'                          => 'The journal ID is ":value"',
     'search_modifier_recurrence_id'                       => 'The recurring transaction ID is ":value"',
     'search_modifier_foreign_amount_is'                   => 'The foreign amount is ":value"',
@@ -491,10 +491,10 @@ return [
     'search_modifier_updated_at_on'                       => 'Transaction was updated on ":value"',
     'search_modifier_updated_at_before'                   => 'Transaction was updated on or before ":value"',
     'search_modifier_updated_at_after'                    => 'Transaction was updated on or after ":value"',
-    'search_modifier_attachment_name_is'                  => '任意附件名称为":value"',
+    'search_modifier_attachment_name_is'                  => '任何一个附件名称为":value"',
-    'search_modifier_attachment_name_contains'            => 'Any attachment\'s name contains ":value"',
+    'search_modifier_attachment_name_contains'            => '任何附件的名称包含":value"',
-    'search_modifier_attachment_name_starts'              => 'Any attachment\'s name starts with ":value"',
+    'search_modifier_attachment_name_starts'              => '任何附件的名称开头为":value"',
-    'search_modifier_attachment_name_ends'                => 'Any attachment\'s name ends with ":value"',
+    'search_modifier_attachment_name_ends'                => '任何附件的名称结尾为":value"',
     'search_modifier_attachment_notes_are'                => 'Any attachment\'s notes are ":value"',
     'search_modifier_attachment_notes_contains'           => 'Any attachment\'s notes contain ":value"',
     'search_modifier_attachment_notes_starts'             => 'Any attachment\'s notes start with ":value"',
@@ -606,13 +606,13 @@ return [
     'rule_trigger_source_account_contains_choice'         => '来源账户名称包含...',
     'rule_trigger_source_account_contains'                => '来源账户名称包含“:trigger_value”',
     'rule_trigger_account_id_choice'                      => '任何一个账户ID为',
-    'rule_trigger_account_id'                             => '任意一个账户ID是:trigger_value',
+    'rule_trigger_account_id'                             => '其中一个账户ID是:trigger_value',
     'rule_trigger_source_account_id_choice'               => '来源账户 ID 为...',
     'rule_trigger_source_account_id'                      => '来源账户 ID 为 :trigger_value',
     'rule_trigger_destination_account_id_choice'          => '目标账户 ID 为...',
     'rule_trigger_destination_account_id'                 => '目标账户 ID 为 :trigger_value',
-    'rule_trigger_account_is_cash_choice'                 => '任意一个账户是现金账户',
+    'rule_trigger_account_is_cash_choice'                 => '其中一个账户是现金账户',
-    'rule_trigger_account_is_cash'                        => '任意一个账户是现金账户',
+    'rule_trigger_account_is_cash'                        => '其中一个账户是现金账户',
     'rule_trigger_source_is_cash_choice'                  => '来源账户为 (现金) 账户',
     'rule_trigger_source_is_cash'                         => '来源账户为 (现金) 账户',
     'rule_trigger_destination_is_cash_choice'             => '目标账户为 (现金) 账户',
@@ -671,8 +671,8 @@ return [
     'rule_trigger_updated_at_on'                          => 'Transaction was last edited on ":trigger_value"',
     'rule_trigger_budget_is_choice'                       => '预算为…',
     'rule_trigger_budget_is'                              => '预算为 ":trigger_value"',
-    'rule_trigger_tag_is_choice'                          => 'Any tag is..',
+    'rule_trigger_tag_is_choice'                          => '其中一个标签为...',
-    'rule_trigger_tag_is'                                 => 'Any tag is ":trigger_value"',
+    'rule_trigger_tag_is'                                 => '其中一个标签为":trigger_value"',
     'rule_trigger_currency_is_choice'                     => '交易货币为…',
     'rule_trigger_currency_is'                            => '交易货币为“:trigger_value”',
     'rule_trigger_foreign_currency_is_choice'             => '交易外币为...',
@@ -699,91 +699,91 @@ return [
     'rule_trigger_any_notes'                              => '交易有 (任意) 备注',
     'rule_trigger_no_notes_choice'                        => '无备注',
     'rule_trigger_no_notes'                               => '交易没有备注',
-    'rule_trigger_notes_is_choice'                        => 'Notes are..',
+    'rule_trigger_notes_is_choice'                        => '备注为...',
-    'rule_trigger_notes_is'                               => 'Notes are ":trigger_value"',
+    'rule_trigger_notes_is'                               => '备注为":trigger_value"',
-    'rule_trigger_notes_contains_choice'                  => 'Notes contain..',
+    'rule_trigger_notes_contains_choice'                  => '备注包含...',
-    'rule_trigger_notes_contains'                         => 'Notes contain ":trigger_value"',
+    'rule_trigger_notes_contains'                         => '备注包含":trigger_value"',
-    'rule_trigger_notes_starts_choice'                    => 'Notes start with..',
+    'rule_trigger_notes_starts_choice'                    => '备注开头为...',
-    'rule_trigger_notes_starts'                           => 'Notes start with ":trigger_value"',
+    'rule_trigger_notes_starts'                           => '备注开头为":trigger_value"',
-    'rule_trigger_notes_ends_choice'                      => 'Notes end with..',
+    'rule_trigger_notes_ends_choice'                      => '备注结尾为...',
-    'rule_trigger_notes_ends'                             => 'Notes end with ":trigger_value"',
+    'rule_trigger_notes_ends'                             => '备注结尾为":trigger_value"',
     'rule_trigger_bill_is_choice'                         => '账单是...',
     'rule_trigger_bill_is'                                => '账单是“:trigger_value”',
-    'rule_trigger_external_id_is_choice'                  => 'External ID is..',
+    'rule_trigger_external_id_is_choice'                  => '外部ID为...',
-    'rule_trigger_external_id_is'                         => 'External ID is ":trigger_value"',
+    'rule_trigger_external_id_is'                         => '外部ID为 ":trigger_value"',
-    'rule_trigger_internal_reference_is_choice'           => 'Internal reference is..',
+    'rule_trigger_internal_reference_is_choice'           => '内部引用为...',
-    'rule_trigger_internal_reference_is'                  => 'Internal reference is ":trigger_value"',
+    'rule_trigger_internal_reference_is'                  => '内部引用为":trigger_value"',
     'rule_trigger_journal_id_choice'                      => '交易日志 ID 为...',
     'rule_trigger_journal_id'                             => '交易日志 ID 为“:trigger_value”',
     'rule_trigger_no_external_url'                        => '交易没有外部URL',
     'rule_trigger_any_external_url'                       => '交易有一个外部URL',
     'rule_trigger_any_external_url_choice'                => '交易有一个外部URL',
-    'rule_trigger_no_external_url_choice'                 => 'Transaction has no external URL',
+    'rule_trigger_no_external_url_choice'                 => '交易没有外部链接',
-    'rule_trigger_id_choice'                              => 'Transaction ID is..',
+    'rule_trigger_id_choice'                              => '交易ID为...',
-    'rule_trigger_id'                                     => 'Transaction ID is ":trigger_value"',
+    'rule_trigger_id'                                     => '交易ID为":trigger_value"',
 
     // new values:
     'rule_trigger_user_action_choice'                     => 'User action is ":trigger_value"',
-    'rule_trigger_tag_is_not_choice'                      => 'No tag is ":trigger_value"',
+    'rule_trigger_tag_is_not_choice'                      => '标签不为":trigger_value"',
-    'rule_trigger_tag_is_not'                             => 'No tag is..',
+    'rule_trigger_tag_is_not'                             => '标签不为...',
     'rule_trigger_account_is_choice'                      => '任何一个账户为',
     'rule_trigger_account_is'                             => '任何一个账户为":trigger_value"',
     'rule_trigger_account_contains_choice'                => '任何一个账户包含',
     'rule_trigger_account_contains'                       => '任何一个账户包含":trigger_value"',
-    'rule_trigger_account_ends_choice'                    => '任意一个账户结尾为',
+    'rule_trigger_account_ends_choice'                    => '其中一个账户结尾为...',
-    'rule_trigger_account_ends'                           => '任意一个账户结尾为":trigger_value"',
+    'rule_trigger_account_ends'                           => '其中一个账户结尾为":trigger_value"',
-    'rule_trigger_account_starts_choice'                  => '任意一个账户开头为',
+    'rule_trigger_account_starts_choice'                  => '其中一个账户开头为...',
-    'rule_trigger_account_starts'                         => '任意一个账户开头为":trigger_value"',
+    'rule_trigger_account_starts'                         => '其中一个账户开头为":trigger_value"',
     'rule_trigger_account_nr_is_choice'                   => '任何一个账户编号/IBAN为',
     'rule_trigger_account_nr_is'                          => '任何一个账户编号/IBAN为":trigger_value"',
     'rule_trigger_account_nr_contains_choice'             => '任何一个账户编号/IBAN包含',
     'rule_trigger_account_nr_contains'                    => '任何一个账户编号/IBAN包含":trigger_value"',
-    'rule_trigger_account_nr_ends_choice'                 => '任意一个账户编号/IBAN结尾为',
+    'rule_trigger_account_nr_ends_choice'                 => '其中一个账户编号/IBAN结尾为...',
-    'rule_trigger_account_nr_ends'                        => '任意一个账户编号/IBAN结尾为":trigger_value"',
+    'rule_trigger_account_nr_ends'                        => '其中一个账户编号/IBAN结尾为":trigger_value"',
-    'rule_trigger_account_nr_starts_choice'               => '任意一个账户编号/IBAN开头为',
+    'rule_trigger_account_nr_starts_choice'               => '其中一个账户编号/IBAN开头为...',
-    'rule_trigger_account_nr_starts'                      => '任意一个账户编号/IBAN为":trigger_value"',
+    'rule_trigger_account_nr_starts'                      => '其中一个账户编号/IBAN为":trigger_value"',
-    'rule_trigger_category_contains_choice'               => 'Category contains..',
+    'rule_trigger_category_contains_choice'               => '分类包含...',
-    'rule_trigger_category_contains'                      => 'Category contains ":trigger_value"',
+    'rule_trigger_category_contains'                      => '分类包含":trigger_value"',
-    'rule_trigger_category_ends_choice'                   => 'Category ends with..',
+    'rule_trigger_category_ends_choice'                   => '分类结尾为...',
-    'rule_trigger_category_ends'                          => 'Category ends with ":trigger_value"',
+    'rule_trigger_category_ends'                          => '分类结尾为":trigger_value"',
-    'rule_trigger_category_starts_choice'                 => 'Category starts with..',
+    'rule_trigger_category_starts_choice'                 => '分类开头为...',
-    'rule_trigger_category_starts'                        => 'Category starts with ":trigger_value"',
+    'rule_trigger_category_starts'                        => '分类开头为":trigger_value"',
-    'rule_trigger_budget_contains_choice'                 => 'Budget contains..',
+    'rule_trigger_budget_contains_choice'                 => '预算包含...',
-    'rule_trigger_budget_contains'                        => 'Budget contains ":trigger_value"',
+    'rule_trigger_budget_contains'                        => '预算包含":trigger_value"',
-    'rule_trigger_budget_ends_choice'                     => 'Budget ends with..',
+    'rule_trigger_budget_ends_choice'                     => '预算结尾为',
-    'rule_trigger_budget_ends'                            => 'Budget ends with ":trigger_value"',
+    'rule_trigger_budget_ends'                            => '预算结尾为":trigger_value"',
-    'rule_trigger_budget_starts_choice'                   => 'Budget starts with..',
+    'rule_trigger_budget_starts_choice'                   => '预算开头为...',
-    'rule_trigger_budget_starts'                          => 'Budget starts with ":trigger_value"',
+    'rule_trigger_budget_starts'                          => '预算开头为":trigger_value"',
-    'rule_trigger_bill_contains_choice'                   => 'Bill contains..',
+    'rule_trigger_bill_contains_choice'                   => '账单包含...',
-    'rule_trigger_bill_contains'                          => 'Bill contains ":trigger_value"',
+    'rule_trigger_bill_contains'                          => '账单包含":trigger_value"',
-    'rule_trigger_bill_ends_choice'                       => 'Bill ends with..',
+    'rule_trigger_bill_ends_choice'                       => '账单结尾为...',
-    'rule_trigger_bill_ends'                              => 'Bill ends with ":trigger_value"',
+    'rule_trigger_bill_ends'                              => '账单结尾为":trigger_value"',
-    'rule_trigger_bill_starts_choice'                     => 'Bill starts with..',
+    'rule_trigger_bill_starts_choice'                     => '账单开头为...',
-    'rule_trigger_bill_starts'                            => 'Bill starts with ":trigger_value"',
+    'rule_trigger_bill_starts'                            => '账单开头为":trigger_value"',
-    'rule_trigger_external_id_contains_choice'            => 'External ID contains..',
+    'rule_trigger_external_id_contains_choice'            => '外部ID包含...',
-    'rule_trigger_external_id_contains'                   => 'External ID contains ":trigger_value"',
+    'rule_trigger_external_id_contains'                   => '外部ID包含":trigger_value"',
-    'rule_trigger_external_id_ends_choice'                => 'External ID ends with..',
+    'rule_trigger_external_id_ends_choice'                => '外部ID结尾为...',
-    'rule_trigger_external_id_ends'                       => 'External ID ends with ":trigger_value"',
+    'rule_trigger_external_id_ends'                       => '外部ID结尾为":trigger_value"',
-    'rule_trigger_external_id_starts_choice'              => 'External ID starts with..',
+    'rule_trigger_external_id_starts_choice'              => '外部ID开头为...',
-    'rule_trigger_external_id_starts'                     => 'External ID starts with ":trigger_value"',
+    'rule_trigger_external_id_starts'                     => '外部ID开头为":trigger_value"',
     'rule_trigger_internal_reference_contains_choice'     => 'Internal reference contains..',
     'rule_trigger_internal_reference_contains'            => 'Internal reference contains ":trigger_value"',
     'rule_trigger_internal_reference_ends_choice'         => 'Internal reference ends with..',
     'rule_trigger_internal_reference_ends'                => 'Internal reference ends with ":trigger_value"',
     'rule_trigger_internal_reference_starts_choice'       => 'Internal reference starts with..',
     'rule_trigger_internal_reference_starts'              => 'Internal reference starts with ":trigger_value"',
-    'rule_trigger_external_url_is_choice'                 => 'External URL is..',
+    'rule_trigger_external_url_is_choice'                 => '外部URL为...',
-    'rule_trigger_external_url_is'                        => 'External URL is ":trigger_value"',
+    'rule_trigger_external_url_is'                        => '外部URL为":trigger_value"',
-    'rule_trigger_external_url_contains_choice'           => 'External URL contains..',
+    'rule_trigger_external_url_contains_choice'           => '外部URL包含...',
-    'rule_trigger_external_url_contains'                  => 'External URL contains ":trigger_value"',
+    'rule_trigger_external_url_contains'                  => '外部URL包含":trigger_value"',
-    'rule_trigger_external_url_ends_choice'               => 'External URL ends with..',
+    'rule_trigger_external_url_ends_choice'               => '外部URL结尾为',
-    'rule_trigger_external_url_ends'                      => 'External URL ends with ":trigger_value"',
+    'rule_trigger_external_url_ends'                      => '外部URL结尾为":trigger_value"',
-    'rule_trigger_external_url_starts_choice'             => 'External URL starts with..',
+    'rule_trigger_external_url_starts_choice'             => '外部URL开头为...',
-    'rule_trigger_external_url_starts'                    => 'External URL starts with ":trigger_value"',
+    'rule_trigger_external_url_starts'                    => '外部URL开头为":trigger_value"',
-    'rule_trigger_has_no_attachments_choice'              => 'Has no attachments',
+    'rule_trigger_has_no_attachments_choice'              => '没有附件',
-    'rule_trigger_has_no_attachments'                     => 'Transaction has no attachments',
+    'rule_trigger_has_no_attachments'                     => '交易没有附件',
-    'rule_trigger_recurrence_id_choice'                   => 'Recurring transaction ID is..',
+    'rule_trigger_recurrence_id_choice'                   => '定期交易ID为...',
-    'rule_trigger_recurrence_id'                          => 'Recurring transaction ID is ":trigger_value"',
+    'rule_trigger_recurrence_id'                          => '定期交易ID为":trigger_value"',
     'rule_trigger_interest_date_on_choice'                => 'Interest date is on..',
     'rule_trigger_interest_date_on'                       => 'Interest date is on ":trigger_value"',
     'rule_trigger_interest_date_before_choice'            => 'Interest date is before..',
@@ -999,14 +999,14 @@ return [
     'pref_optional_tj_internal_reference'       => '内部引用',
     'pref_optional_tj_notes'                    => '备注',
     'pref_optional_tj_attachments'              => '附件',
-    'pref_optional_tj_external_url'             => 'External URL',
+    'pref_optional_tj_external_url'             => '外部链接',
     'pref_optional_tj_location'                 => '位置',
     'pref_optional_tj_links'                    => '交易关联',
     'optional_field_meta_dates'                 => '日期',
     'optional_field_meta_business'              => '商务',
     'optional_field_attachments'                => '附件',
     'optional_field_meta_data'                  => '可选后设资料',
-    'external_url'                              => 'External URL',
+    'external_url'                              => '外部链接',
 
     // profile:
     'delete_stuff_header'                       => '删除数据',

resources/lang/zh_CN/form.php

@@ -84,7 +84,7 @@ return [
     'liability_type'              => '债务类型',
     'interest'                    => '利息',
     'interest_period'             => '利息期',
-    'extension_date'              => 'Extension date',
+    'extension_date'              => '延续日期',
     'type'                        => '类型',
     'convert_Withdrawal'          => '转换支出',
     'convert_Deposit'             => '转换收入',

resources/lang/zh_CN/validation.php

@@ -23,13 +23,13 @@
 declare(strict_types=1);
 
 return [
-    'missing_where'                  => 'Array is missing "where"-clause',
+    'missing_where'                  => '数组中缺少"where"条目',
-    'missing_update'                 => 'Array is missing "update"-clause',
+    'missing_update'                 => '数组中缺少 "update"条目',
-    'invalid_where_key'              => 'JSON contains an invalid key for the "where"-clause',
+    'invalid_where_key'              => 'JSON包含一个无效的"where"子句',
-    'invalid_update_key'             => 'JSON contains an invalid key for the "update"-clause',
+    'invalid_update_key'             => 'JSON包含一个无效的"update"子句',
-    'invalid_query_data'             => 'There is invalid data in the %s:%s field of your query.',
+    'invalid_query_data'             => '查询中的%s:%s字段存在无效数据',
-    'invalid_query_account_type'     => 'Your query contains accounts of different types, which is not allowed.',
+    'invalid_query_account_type'     => '查询包含不同类型的账户，这是不允许的',
-    'invalid_query_currency'         => 'Your query contains accounts that have different currency settings, which is not allowed.',
+    'invalid_query_currency'         => '查询包含不同货币的账户，这是不不允许的。',
     'iban'                           => '此 IBAN 无效',
     'zero_or_more'                   => '此值不能为负',
     'date_or_time'                   => '此值必须是有效的日期或时间 (ISO 8601)',
@@ -194,7 +194,7 @@ return [
     'withdrawal_dest_need_data'   => '需要一个有效的目标账户 ID 和/或目标账户名称才能继续',
     'withdrawal_dest_bad_data'    => '搜索 ID “:id”或名称“:name”时找不到有效的目标账户',
 
-    'generic_source_bad_data' => 'Could not find a valid source account when searching for ID ":id" or name ":name".',
+    'generic_source_bad_data' => '搜索 ID “:id”或名称“:name”时找不到有效的来源账户',
 
     'deposit_source_need_data' => '需要一个有效的来源账户 ID 和/或来源账户名称才能继续',
     'deposit_source_bad_data'  => '搜索 ID “:id”或名称“:name”时找不到有效的来源账户',

sonar-project.properties

@@ -12,6 +12,6 @@ sonar.organization=firefly-iii
 #sonar.sourceEncoding=UTF-8
 
 
-sonar.projectVersion=5.7.4
+sonar.projectVersion=5.7.5
 sonar.sources=app,bootstrap,database,resources/assets,resources/views,routes,tests
 sonar.sourceEncoding=UTF-8

yarn.lock

@@ -936,9 +936,9 @@
   integrity sha512-SfJxIxNVYLTsKwzB3MoOQ1yxf4w/E6MdkvTgrgAt1bfxjSrLUoHMKrDOykwN14q65waezZIdqDneUIPh4/sKxg==
 
 "@jridgewell/sourcemap-codec@^1.4.10":
-  version "1.4.11"
+  version "1.4.12"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz#771a1d8d744eeb71b6adb35808e1a6c7b9b8c8ec"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.12.tgz#7ed98f6fa525ffb7c56a2cbecb5f7bb91abd2baf"
-  integrity sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==
+  integrity sha512-az/NhpIwP3K33ILr0T2bso+k2E/SLf8Yidd8mHl0n6sCQ4YdyC8qDhZA6kOPDNDBA56ZnIjngVl0U3jREA0BUA==
 
 "@jridgewell/trace-mapping@^0.3.9":
   version "0.3.9"
@@ -1059,9 +1059,9 @@
     "@types/estree" "*"
 
 "@types/eslint@*":
-  version "8.4.1"
+  version "8.4.2"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.1.tgz#c48251553e8759db9e656de3efc846954ac32304"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.2.tgz#48f2ac58ab9c631cb68845c3d956b28f79fad575"
-  integrity sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA==
+  integrity sha512-Z1nseZON+GEnFjJc04sv4NSALGjhFwy6K0HXt7qsn5ArfAKtb63dXNJHf+1YW6IpOIYRBGUbu3GwJdj8DGnCjA==
   dependencies:
     "@types/estree" "*"
     "@types/json-schema" "*"
@@ -1099,9 +1099,9 @@
     "@types/node" "*"
 
 "@types/http-proxy@^1.17.8":
-  version "1.17.8"
+  version "1.17.9"
-  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.8.tgz#968c66903e7e42b483608030ee85800f22d03f55"
+  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.9.tgz#7f0e7931343761efde1e2bf48c40f02f3f75705a"
-  integrity sha512-5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA==
+  integrity sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==
   dependencies:
     "@types/node" "*"
 
@@ -1559,13 +1559,6 @@ assert@^1.1.1:
     object-assign "^4.1.1"
     util "0.10.3"
 
-async@^2.6.2:
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
-  integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
-  dependencies:
-    lodash "^4.17.14"
-
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -2118,9 +2111,9 @@ cookie@0.5.0:
   integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
 
 core-js-compat@^3.21.0, core-js-compat@^3.22.1:
-  version "3.22.3"
+  version "3.22.4"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.22.3.tgz#9b10d786052d042bc97ee8df9c0d1fb6a49c2005"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.22.4.tgz#d700f451e50f1d7672dcad0ac85d910e6691e579"
-  integrity sha512-wliMbvPI2idgFWpFe7UEyHMvu6HWgW8WA+HnDRtgzoSDYvXFMpoGX1H3tPDDXrcfUSyXafCLDd7hOeMQHEZxGw==
+  integrity sha512-dIWcsszDezkFZrfm1cnB4f/J85gyhiCpxbgBdohWCDtSVuAaChTSpPV7ldOQf/Xds2U5xCIJZOK82G4ZPAIswA==
   dependencies:
     browserslist "^4.20.3"
     semver "7.0.0"
@@ -2328,13 +2321,6 @@ debug@2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@^3.1.1:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
-  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
-  dependencies:
-    ms "^2.1.1"
-
 debug@^4.1.0, debug@^4.1.1:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
@@ -2489,9 +2475,9 @@ ee-first@1.1.1:
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
 electron-to-chromium@^1.4.118:
-  version "1.4.129"
+  version "1.4.134"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.129.tgz#c675793885721beefff99da50f57c6525c2cd238"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.134.tgz#9baca7a018ca489d8e81a00c7cfe15161da38568"
-  integrity sha512-GgtN6bsDtHdtXJtlMYZWGB/uOyjZWjmRDumXTas7dGBaB9zUyCjzHet1DY2KhyHN8R0GLbzZWqm4efeddqqyRQ==
+  integrity sha512-OdD7M2no4Mi8PopfvoOuNcwYDJ2mNFxaBfurA6okG3fLBaMcFah9S+si84FhX+FIWLKkdaiHfl4A+5ep/gOVrg==
 
 elliptic@^6.5.3:
   version "6.5.4"
@@ -2767,9 +2753,9 @@ find-up@^4.0.0:
     path-exists "^4.0.0"
 
 follow-redirects@^1.0.0, follow-redirects@^1.14.9:
-  version "1.14.9"
+  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.0.tgz#06441868281c86d0dda4ad8bdaead2d02dca89d4"
-  integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==
+  integrity sha512-aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ==
 
 font-awesome@^4.7.0:
   version "4.7.0"
@@ -3472,7 +3458,7 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@^4.17.14, lodash@^4.17.21:
+lodash@^4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -3639,18 +3625,11 @@ minimatch@^3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@^1.2.0, minimist@^1.2.6:
+minimist@^1.2.0:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
-mkdirp@^0.5.5:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
-  integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
-  dependencies:
-    minimist "^1.2.6"
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -3661,7 +3640,7 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@2.1.3, ms@^2.1.1:
+ms@2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -3675,9 +3654,9 @@ multicast-dns@^7.2.4:
     thunky "^1.0.2"
 
 nanoid@^3.3.3:
-  version "3.3.3"
+  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
-  integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==
+  integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
 
 negotiator@0.6.3:
   version "0.6.3"
@@ -4006,15 +3985,6 @@ portal-vue@^2.1.7:
   resolved "https://registry.yarnpkg.com/portal-vue/-/portal-vue-2.1.7.tgz#ea08069b25b640ca08a5b86f67c612f15f4e4ad4"
   integrity sha512-+yCno2oB3xA7irTt0EU5Ezw22L2J51uKAacE/6hMPMoO/mx3h4rXFkkBkT4GFsMDv/vEe8TNKC3ujJJ0PTwb6g==
 
-portfinder@^1.0.28:
-  version "1.0.28"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
-  integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==
-  dependencies:
-    async "^2.6.2"
-    debug "^3.1.1"
-    mkdirp "^0.5.5"
-
 postcss-calc@^8.2.3:
   version "8.2.4"
   resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.2.4.tgz#77b9c29bfcbe8a07ff6693dc87050828889739a5"
@@ -5239,9 +5209,9 @@ webpack-dev-middleware@^5.3.1:
     schema-utils "^4.0.0"
 
 webpack-dev-server@^4.7.3:
-  version "4.8.1"
+  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.8.1.tgz#58f9d797710d6e25fa17d6afab8708f958c11a29"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.9.0.tgz#737dbf44335bb8bde68f8f39127fc401c97a1557"
-  integrity sha512-dwld70gkgNJa33czmcj/PlKY/nOy/BimbrgZRaR9vDATBQAYgLzggR0nxDtPLJiLrMgZwbE6RRfJ5vnBBasTyg==
+  integrity sha512-+Nlb39iQSOSsFv0lWUuUTim3jDQO8nhK3E68f//J2r5rIcp4lULHXz2oZ0UVdEeWXEh5lSzYUlzarZhDAeAVQw==
   dependencies:
     "@types/bonjour" "^3.5.9"
     "@types/connect-history-api-fallback" "^1.3.5"
@@ -5263,7 +5233,6 @@ webpack-dev-server@^4.7.3:
     ipaddr.js "^2.0.1"
     open "^8.0.9"
     p-retry "^4.5.0"
-    portfinder "^1.0.28"
     rimraf "^3.0.2"
     schema-utils "^4.0.0"
     selfsigned "^2.0.1"