Merge branch 'release/v6.0.18'

2025-02-25 18:45:27 -06:00 · 2023-07-18 07:01:55 +02:00 · 2023-07-18 07:01:55 +02:00 · 07aeb6cd20
commit 07aeb6cd20
parent c59e52bbbf d17cc15037
76 changed files with 975 additions and 766 deletions
--- a/.ci/php-cs-fixer/composer.lock
+++ b/.ci/php-cs-fixer/composer.lock
@ -379,16 +379,16 @@
        },
        {
            "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.21.1",
+            "version": "v3.22.0",
            "source": {
                "type": "git",
                "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "229b55b3eae4729a8e2a321441ba40fcb3720b86"
+                "reference": "92b019f6c8d79aa26349d0db7671d37440dc0ff3"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/229b55b3eae4729a8e2a321441ba40fcb3720b86",
-                "reference": "229b55b3eae4729a8e2a321441ba40fcb3720b86",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/92b019f6c8d79aa26349d0db7671d37440dc0ff3",
+                "reference": "92b019f6c8d79aa26349d0db7671d37440dc0ff3",
                "shasum": ""
            },
            "require": {
@ -398,7 +398,7 @@
                "doctrine/lexer": "^2 || ^3",
                "ext-json": "*",
                "ext-tokenizer": "*",
-                "php": "^8.0.1",
+                "php": "^7.4 || ^8.0",
                "sebastian/diff": "^4.0 || ^5.0",
                "symfony/console": "^5.4 || ^6.0",
                "symfony/event-dispatcher": "^5.4 || ^6.0",
@ -412,6 +412,7 @@
                "symfony/stopwatch": "^5.4 || ^6.0"
            },
            "require-dev": {
+                "facile-it/paraunit": "^1.3 || ^2.0",
                "justinrainbow/json-schema": "^5.2",
                "keradus/cli-executor": "^2.0",
                "mikey179/vfsstream": "^1.6.11",
@ -463,7 +464,7 @@
            ],
            "support": {
                "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.21.1"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.22.0"
            },
            "funding": [
                {
@ -471,7 +472,7 @@
                    "type": "github"
                }
            ],
-            "time": "2023-07-05T21:50:25+00:00"
+            "time": "2023-07-16T23:08:06+00:00"
        },
        {
            "name": "psr/cache",
--- a/app/Api/V2/Controllers/Model/Budget/ShowController.php
+++ b/app/Api/V2/Controllers/Model/Budget/ShowController.php
@ -44,7 +44,8 @@ class ShowController extends Controller
    /**
     *
     */
-    public function __construct() {
+    public function __construct()
+    {
        parent::__construct();
        $this->middleware(
            function ($request, $next) {
@ -60,7 +61,8 @@ class ShowController extends Controller
     * TODO add URL
     *
     */
-    public function budgeted(DateRequest $request, Budget $budget): JsonResponse {
+    public function budgeted(DateRequest $request, Budget $budget): JsonResponse
+    {
        $data      = $request->getAll();
        $result    = $this->repository->budgetedInPeriodForBudget($budget, $data['start'], $data['end']);
        $converted = $this->cerSum(array_values($result));
@ -73,7 +75,8 @@ class ShowController extends Controller
     * TODO add URL
     *
     */
-    public function spent(DateRequest $request, Budget $budget): JsonResponse {
+    public function spent(DateRequest $request, Budget $budget): JsonResponse
+    {
        $data      = $request->getAll();
        $result    = $this->repository->spentInPeriodForBudget($budget, $data['start'], $data['end']);
        $converted = $this->cerSum(array_values($result));
--- a/app/Console/Commands/ShowsFriendlyMessages.php
+++ b/app/Console/Commands/ShowsFriendlyMessages.php
@ -35,7 +35,8 @@ trait ShowsFriendlyMessages
     *
     * @return void
     */
-    public function friendlyError(string $message): void {
+    public function friendlyError(string $message): void
+    {
        $this->error(sprintf('  [x]  %s', trim($message)));
    }

@ -44,7 +45,8 @@ trait ShowsFriendlyMessages
     *
     * @return void
     */
-    public function friendlyInfo(string $message): void {
+    public function friendlyInfo(string $message): void
+    {
        $this->friendlyNeutral($message);
    }

@ -53,7 +55,8 @@ trait ShowsFriendlyMessages
     *
     * @return void
     */
-    public function friendlyNeutral(string $message): void {
+    public function friendlyNeutral(string $message): void
+    {
        $this->line(sprintf('  [i] %s', trim($message)));
    }

@ -62,7 +65,8 @@ trait ShowsFriendlyMessages
     *
     * @return void
     */
-    public function friendlyLine(string $message): void {
+    public function friendlyLine(string $message): void
+    {
        $this->line(sprintf('      %s', trim($message)));
    }

@ -71,7 +75,8 @@ trait ShowsFriendlyMessages
     *
     * @return void
     */
-    public function friendlyPositive(string $message): void {
+    public function friendlyPositive(string $message): void
+    {
        $this->info(sprintf('  [✓] %s', trim($message)));
    }

@ -80,7 +85,8 @@ trait ShowsFriendlyMessages
     *
     * @return void
     */
-    public function friendlyWarning(string $message): void {
+    public function friendlyWarning(string $message): void
+    {
        $this->warn(sprintf('  [!] %s', trim($message)));
    }

--- a/app/Events/Model/BudgetLimit/Created.php
+++ b/app/Events/Model/BudgetLimit/Created.php
@ -41,7 +41,8 @@ class Created extends Event
    /**
     * @param BudgetLimit $budgetLimit
     */
-    public function __construct(BudgetLimit $budgetLimit) {
+    public function __construct(BudgetLimit $budgetLimit)
+    {
        $this->budgetLimit = $budgetLimit;
    }
 }
--- a/app/Events/Model/BudgetLimit/Deleted.php
+++ b/app/Events/Model/BudgetLimit/Deleted.php
@ -41,7 +41,8 @@ class Deleted extends Event
    /**
     * @param BudgetLimit $budgetLimit
     */
-    public function __construct(BudgetLimit $budgetLimit) {
+    public function __construct(BudgetLimit $budgetLimit)
+    {
        $this->budgetLimit = $budgetLimit;
    }
 }
--- a/app/Events/Model/BudgetLimit/Updated.php
+++ b/app/Events/Model/BudgetLimit/Updated.php
@ -41,7 +41,8 @@ class Updated extends Event
    /**
     * @param BudgetLimit $budgetLimit
     */
-    public function __construct(BudgetLimit $budgetLimit) {
+    public function __construct(BudgetLimit $budgetLimit)
+    {
        $this->budgetLimit = $budgetLimit;
    }
 }
--- a/app/Handlers/Events/Model/BudgetLimitHandler.php
+++ b/app/Handlers/Events/Model/BudgetLimitHandler.php
@ -49,7 +49,8 @@ class BudgetLimitHandler
     *
     * @return void
     */
-    public function created(Created $event): void {
+    public function created(Created $event): void
+    {
        Log::debug(sprintf('BudgetLimitHandler::created(#%s)', $event->budgetLimit->id));
        $this->updateAvailableBudget($event->budgetLimit);
    }
@ -59,7 +60,8 @@ class BudgetLimitHandler
     *
     * @return void
     */
-    private function updateAvailableBudget(BudgetLimit $budgetLimit): void {
+    private function updateAvailableBudget(BudgetLimit $budgetLimit): void
+    {
        Log::debug(sprintf('Now in updateAvailableBudget(#%d)', $budgetLimit->id));

        // based on the view range of the user (month week quarter etc) the budget limit could
@ -75,7 +77,11 @@ class BudgetLimitHandler
        $end    = app('navigation')->endOfPeriod($end, $viewRange);
        $budget = Budget::find($budgetLimit->budget_id);
        if (null === $budget) {
-            Log::warning('Budget is null, cannot continue.');
+            Log::warning('Budget is null, probably deleted, find deleted version.');
+            $budget = Budget::withTrashed()->find($budgetLimit->budget_id);
+        }
+        if (null === $budget) {
+            Log::warning('Budget is still null, cannot continue, will delete budget limit.');
            $budgetLimit->forceDelete();
            return;
        }
@ -145,7 +151,8 @@ class BudgetLimitHandler
     *
     * @return void
     */
-    private function calculateAmount(AvailableBudget $availableBudget): void {
+    private function calculateAmount(AvailableBudget $availableBudget): void
+    {
        $repository = app(BudgetLimitRepositoryInterface::class);
        $repository->setUser($availableBudget->user);
        $newAmount = '0';
@ -173,8 +180,8 @@ class BudgetLimitHandler
            );
            // overlap in days:
            $limitPeriod = Period::make(
-                            $budgetLimit->start_date,
-                            $budgetLimit->end_date,
+                $budgetLimit->start_date,
+                $budgetLimit->end_date,
                precision : Precision::DAY(),
                boundaries: Boundaries::EXCLUDE_NONE()
            );
@ -210,13 +217,14 @@ class BudgetLimitHandler
     *
     * @return string
     */
-    private function getDailyAmount(BudgetLimit $budgetLimit): string {
+    private function getDailyAmount(BudgetLimit $budgetLimit): string
+    {
        if (0 === (int)$budgetLimit->id) {
            return '0';
        }
        $limitPeriod = Period::make(
-                        $budgetLimit->start_date,
-                        $budgetLimit->end_date,
+            $budgetLimit->start_date,
+            $budgetLimit->end_date,
            precision : Precision::DAY(),
            boundaries: Boundaries::EXCLUDE_NONE()
        );
@ -233,7 +241,8 @@ class BudgetLimitHandler
     *
     * @return void
     */
-    public function deleted(Deleted $event): void {
+    public function deleted(Deleted $event): void
+    {
        Log::debug(sprintf('BudgetLimitHandler::deleted(#%s)', $event->budgetLimit->id));
        $budgetLimit     = $event->budgetLimit;
        $budgetLimit->id = null;
@ -245,7 +254,8 @@ class BudgetLimitHandler
     *
     * @return void
     */
-    public function updated(Updated $event): void {
+    public function updated(Updated $event): void
+    {
        Log::debug(sprintf('BudgetLimitHandler::updated(#%s)', $event->budgetLimit->id));
        $this->updateAvailableBudget($event->budgetLimit);
    }
--- a/app/Helpers/Collector/Extensions/CollectorProperties.php
+++ b/app/Helpers/Collector/Extensions/CollectorProperties.php
@ -33,6 +33,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 trait CollectorProperties
 {
    public const TEST = 'Test';
+    private bool    $expandGroupSearch;
    private array   $fields;
    private bool    $hasAccountInfo;
    private bool    $hasBillInformation;
--- a/app/Helpers/Collector/GroupCollector.php
+++ b/app/Helpers/Collector/GroupCollector.php
@ -76,6 +76,7 @@ class GroupCollector implements GroupCollectorInterface
        $this->hasNotesInformation  = false;
        $this->hasJoinedTagTables   = false;
        $this->hasJoinedAttTables   = false;
+        $this->expandGroupSearch    = false;
        $this->hasJoinedMetaTables  = false;
        $this->integerFields        = [
            'transaction_group_id',
@ -454,6 +455,14 @@ class GroupCollector implements GroupCollectorInterface
        return $this;
    }

+    /**
+     * @return bool
+     */
+    public function getExpandGroupSearch(): bool
+    {
+        return $this->expandGroupSearch;
+    }
+
    /**
     * Return the transaction journals without group information. Is useful in some instances.
     *
@ -480,10 +489,16 @@ class GroupCollector implements GroupCollectorInterface
     * Return the groups.
     *
     * @return Collection
-     * @throws FireflyException
     */
    public function getGroups(): Collection
    {
+        if ($this->expandGroupSearch) {
+            // get group ID's for the query:
+            $groupIds = $this->getCollectedGroupIds();
+            // add to query:
+            $this->query->orWhereIn('transaction_journals.transaction_group_id', $groupIds);
+        }
+
        $result = $this->query->get($this->fields);

        // now to parse this into an array.
@ -505,6 +520,14 @@ class GroupCollector implements GroupCollectorInterface
        return $collection;
    }

+    /**
+     * @return array
+     */
+    private function getCollectedGroupIds(): array
+    {
+        return $this->query->get(['transaction_journals.transaction_group_id'])->pluck('transaction_group_id')->toArray();
+    }
+
    /**
     * @param Collection $collection
     *
@ -516,7 +539,7 @@ class GroupCollector implements GroupCollectorInterface
        $groups = [];
        /** @var TransactionJournal $augumentedJournal */
        foreach ($collection as $augumentedJournal) {
-            $groupId = $augumentedJournal->transaction_group_id;
+            $groupId = (int)$augumentedJournal->transaction_group_id;

            if (!array_key_exists($groupId, $groups)) {
                // make new array
@ -871,6 +894,14 @@ class GroupCollector implements GroupCollectorInterface
        return $this;
    }

+    /**
+     * @param bool $expandGroupSearch
+     */
+    public function setExpandGroupSearch(bool $expandGroupSearch): void
+    {
+        $this->expandGroupSearch = $expandGroupSearch;
+    }
+
    /**
     * @inheritDoc
     */
--- a/app/Helpers/Collector/GroupCollectorInterface.php
+++ b/app/Helpers/Collector/GroupCollectorInterface.php
@ -583,6 +583,11 @@ interface GroupCollectorInterface
     */
    public function foreignAmountMore(string $amount): GroupCollectorInterface;

+    /**
+     * @return bool
+     */
+    public function getExpandGroupSearch(): bool;
+
    /**
     * Return the transaction journals without group information. Is useful in some instances.
     *
@ -1072,6 +1077,11 @@ interface GroupCollectorInterface
     */
    public function setDestinationAccounts(Collection $accounts): GroupCollectorInterface;

+    /**
+     * @param bool $expandGroupSearch
+     */
+    public function setExpandGroupSearch(bool $expandGroupSearch);
+
    /**
     * Look for specific external ID's.
     *
@ -1502,4 +1512,6 @@ interface GroupCollectorInterface
     * @return GroupCollectorInterface
     */
    public function yearIsNot(string $year): GroupCollectorInterface;
+
+
 }
--- a/app/Http/Controllers/Account/ShowController.php
+++ b/app/Http/Controllers/Account/ShowController.php
@ -131,6 +131,12 @@ class ShowController extends Controller
            ->setLimit($pageSize)
            ->setPage($page)->withAccountInformation()->withCategoryInformation()
            ->setRange($start, $end);
+
+        // this search will not include transaction groups where this asset account (or liability)
+        // is just part of ONE of the journals. To force this:
+        $collector->setExpandGroupSearch(true);
+
+
        $groups = $collector->getPaginatedGroups();

        $groups->setPath(route('accounts.show', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]));
--- a/app/Http/Requests/TriggerRecurrenceRequest.php
+++ b/app/Http/Requests/TriggerRecurrenceRequest.php
@ -42,7 +42,8 @@ class TriggerRecurrenceRequest extends FormRequest
     *
     * @return array
     */
-    public function getAll(): array {
+    public function getAll(): array
+    {
        return [
            'date' => $this->getCarbonDate('date'),
        ];
@ -53,7 +54,8 @@ class TriggerRecurrenceRequest extends FormRequest
     *
     * @return array
     */
-    public function rules(): array {
+    public function rules(): array
+    {
        return [
            'date' => 'required|date',
        ];
--- a/app/Notifications/Admin/TestNotification.php
+++ b/app/Notifications/Admin/TestNotification.php
@ -97,6 +97,10 @@ class TestNotification extends Notification
     */
    public function via($notifiable)
    {
-        return ['mail', 'slack'];
+        $slackUrl = (string)app('preferences')->getForUser(auth()->user(), 'slack_webhook_url', '')->data;
+        if (str_starts_with($slackUrl, 'https://hooks.slack.com/services/')) {
+            return ['mail', 'slack'];
+        }
+        return ['mail'];
    }
 }
--- a/app/Notifications/Admin/UserInvitation.php
+++ b/app/Notifications/Admin/UserInvitation.php
@ -100,6 +100,10 @@ class UserInvitation extends Notification
     */
    public function via($notifiable)
    {
-        return ['mail', 'slack'];
+        $slackUrl = (string)app('preferences')->getForUser(auth()->user(), 'slack_webhook_url', '')->data;
+        if (str_starts_with($slackUrl, 'https://hooks.slack.com/services/')) {
+            return ['mail', 'slack'];
+        }
+        return ['mail'];
    }
 }
--- a/app/Notifications/Admin/UserRegistration.php
+++ b/app/Notifications/Admin/UserRegistration.php
@ -98,6 +98,10 @@ class UserRegistration extends Notification
     */
    public function via($notifiable)
    {
-        return ['mail', 'slack'];
+        $slackUrl = (string)app('preferences')->getForUser(auth()->user(), 'slack_webhook_url', '')->data;
+        if (str_starts_with($slackUrl, 'https://hooks.slack.com/services/')) {
+            return ['mail', 'slack'];
+        }
+        return ['mail'];
    }
 }
--- a/app/Notifications/Admin/VersionCheckResult.php
+++ b/app/Notifications/Admin/VersionCheckResult.php
@ -86,10 +86,21 @@ class VersionCheckResult extends Notification
     */
    public function toSlack($notifiable)
    {
+        //        return (new SlackMessage())->text($this->message)
+        //            ->sectionBlock(function (SectionBlock $block) {
+        //                $button = new ButtonElement('Button');
+        //                $button->url('https://github.com/firefly-iii/firefly-iii/releases');
+        //                $block->accessory($button);
+        //            });
+        ////            ->attachment(function ($attachment) {
+        ////                $attachment->title('Firefly III @ GitHub', 'https://github.com/firefly-iii/firefly-iii/releases');
+        ////            });
+
+
        return (new SlackMessage())->content($this->message)
-                                   ->attachment(function ($attachment) {
-                                       $attachment->title('Firefly III @ GitHub', 'https://github.com/firefly-iii/firefly-iii/releases');
-                                   });
+            ->attachment(function ($attachment) {
+                $attachment->title('Firefly III @ GitHub', 'https://github.com/firefly-iii/firefly-iii/releases');
+            });
    }

    /**
@ -101,6 +112,10 @@ class VersionCheckResult extends Notification
     */
    public function via($notifiable)
    {
-        return ['mail', 'slack'];
+        $slackUrl = (string)app('preferences')->getForUser(auth()->user(), 'slack_webhook_url', '')->data;
+        if (str_starts_with($slackUrl, 'https://hooks.slack.com/services/')) {
+            return ['mail', 'slack'];
+        }
+        return ['mail'];
    }
 }
--- a/app/Notifications/User/BillReminder.php
+++ b/app/Notifications/User/BillReminder.php
@ -37,8 +37,8 @@ class BillReminder extends Notification
 {
    use Queueable;

-    private Bill   $bill;
-    private int    $diff;
+    private Bill $bill;
+    private int $diff;
    private string $field;

    /**
@ -48,9 +48,9 @@ class BillReminder extends Notification
     */
    public function __construct(Bill $bill, string $field, int $diff)
    {
-        $this->bill  = $bill;
+        $this->bill = $bill;
        $this->field = $field;
-        $this->diff  = $diff;
+        $this->diff = $diff;
    }

    /**
@ -100,7 +100,7 @@ class BillReminder extends Notification
            $message = (string)trans(sprintf('email.bill_warning_subject_now_%s', $this->field), ['diff' => $this->diff, 'name' => $this->bill->name]);
        }
        $bill = $this->bill;
-        $url  = route('bills.show', [$bill->id]);
+        $url = route('bills.show', [$bill->id]);
        return (new SlackMessage())
            ->warning()
            ->attachment(function ($attachment) use ($bill, $url) {
@ -118,6 +118,10 @@ class BillReminder extends Notification
     */
    public function via($notifiable)
    {
-        return ['mail', 'slack'];
+        $slackUrl = (string)app('preferences')->getForUser(auth()->user(), 'slack_webhook_url', '')->data;
+        if (str_starts_with($slackUrl, 'https://hooks.slack.com/services/')) {
+            return ['mail', 'slack'];
+        }
+        return ['mail'];
    }
 }
--- a/app/Notifications/User/NewAccessToken.php
+++ b/app/Notifications/User/NewAccessToken.php
@ -94,6 +94,10 @@ class NewAccessToken extends Notification
     */
    public function via($notifiable)
    {
-        return ['mail', 'slack'];
+        $slackUrl = (string)app('preferences')->getForUser(auth()->user(), 'slack_webhook_url', '')->data;
+        if (str_starts_with($slackUrl, 'https://hooks.slack.com/services/')) {
+            return ['mail', 'slack'];
+        }
+        return ['mail'];
    }
 }
--- a/app/Notifications/User/UserLogin.php
+++ b/app/Notifications/User/UserLogin.php
@ -27,9 +27,9 @@ namespace FireflyIII\Notifications\User;
 use FireflyIII\Exceptions\FireflyException;
 use Illuminate\Bus\Queueable;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Notifications\Messages\SlackMessage;

 /**
 * Class UserLogin
@ -122,6 +122,10 @@ class UserLogin extends Notification
     */
    public function via($notifiable)
    {
-        return ['mail', 'slack'];
+        $slackUrl = (string)app('preferences')->getForUser(auth()->user(), 'slack_webhook_url', '')->data;
+        if (str_starts_with($slackUrl, 'https://hooks.slack.com/services/')) {
+            return ['mail', 'slack'];
+        }
+        return ['mail'];
    }
 }
--- a/app/Repositories/Administration/Account/AccountRepository.php
+++ b/app/Repositories/Administration/Account/AccountRepository.php
@ -38,7 +38,8 @@ class AccountRepository implements AccountRepositoryInterface
    /**
     * @inheritDoc
     */
-    public function searchAccount(string $query, array $types, int $limit): Collection {
+    public function searchAccount(string $query, array $types, int $limit): Collection
+    {
        // search by group, not by user
        $dbQuery = $this->userGroup->accounts()
                                   ->where('active', true)
--- a/app/Support/Calendar/Calculator.php
+++ b/app/Support/Calendar/Calculator.php
@ -46,7 +46,8 @@ class Calculator
     * @return Carbon
     * @throws IntervalException
     */
-    public function nextDateByInterval(Carbon $epoch, Periodicity $periodicity, int $skipInterval = 0): Carbon {
+    public function nextDateByInterval(Carbon $epoch, Periodicity $periodicity, int $skipInterval = 0): Carbon
+    {
        if (!self::isAvailablePeriodicity($periodicity)) {
            throw IntervalException::unavailable($periodicity, self::$intervals);
        }
@ -62,7 +63,8 @@ class Calculator
     *
     * @return bool
     */
-    public function isAvailablePeriodicity(Periodicity $periodicity): bool {
+    public function isAvailablePeriodicity(Periodicity $periodicity): bool
+    {
        return self::containsInterval($periodicity);
    }

@ -71,14 +73,16 @@ class Calculator
     *
     * @return bool
     */
-    private static function containsInterval(Periodicity $periodicity): bool {
+    private static function containsInterval(Periodicity $periodicity): bool
+    {
        return self::loadIntervalMap()->contains($periodicity);
    }

    /**
     * @return SplObjectStorage
     */
-    private static function loadIntervalMap(): SplObjectStorage {
+    private static function loadIntervalMap(): SplObjectStorage
+    {
        if (self::$intervalMap != null) {
            return self::$intervalMap;
        }
@ -96,7 +100,8 @@ class Calculator
     *
     * @return int
     */
-    private function skipInterval(int $skip): int {
+    private function skipInterval(int $skip): int
+    {
        return self::DEFAULT_INTERVAL + $skip;
    }

--- a/app/Support/Calendar/Exceptions/IntervalException.php
+++ b/app/Support/Calendar/Exceptions/IntervalException.php
@ -36,7 +36,7 @@ final class IntervalException extends Exception
 {
    public readonly array       $availableIntervals;
    public readonly Periodicity $periodicity;
-    protected                   $message = 'The periodicity %s is unknown. Choose one of available periodicity: %s';
+    protected $message = 'The periodicity %s is unknown. Choose one of available periodicity: %s';

    /**
     * @param Periodicity    $periodicity
--- a/app/Support/Calendar/Periodicity/Daily.php
+++ b/app/Support/Calendar/Periodicity/Daily.php
@ -38,7 +38,8 @@ final class Daily extends Interval
     *
     * @return Carbon
     */
-    public function nextDate(Carbon $date, int $interval = 1): Carbon {
+    public function nextDate(Carbon $date, int $interval = 1): Carbon
+    {
        return ($date->clone())->addDays($this->skip($interval));
    }
 }
--- a/app/Support/Calendar/Periodicity/Interval.php
+++ b/app/Support/Calendar/Periodicity/Interval.php
@ -37,7 +37,8 @@ abstract class Interval implements Interspacable
     *
     * @return int
     */
-    public function skip(int $skip): int {
+    public function skip(int $skip): int
+    {
        return static::INTERVAL * $skip;
    }
 }
--- a/app/Support/Calendar/Periodicity/Monthly.php
+++ b/app/Support/Calendar/Periodicity/Monthly.php
@ -38,7 +38,8 @@ class Monthly extends Interval
     *
     * @return Carbon
     */
-    public function nextDate(Carbon $date, int $interval = 1): Carbon {
+    public function nextDate(Carbon $date, int $interval = 1): Carbon
+    {
        return ($date->clone())->addMonthsNoOverflow($this->skip($interval));
    }
 }
--- a/app/Support/Calendar/Periodicity/Weekly.php
+++ b/app/Support/Calendar/Periodicity/Weekly.php
@ -38,7 +38,8 @@ class Weekly extends Interval
     *
     * @return Carbon
     */
-    public function nextDate(Carbon $date, int $interval = 1): Carbon {
+    public function nextDate(Carbon $date, int $interval = 1): Carbon
+    {
        return ($date->clone())->addWeeks($this->skip($interval));
    }
 }
--- a/app/Support/Calendar/Periodicity/Yearly.php
+++ b/app/Support/Calendar/Periodicity/Yearly.php
@ -38,7 +38,8 @@ final class Yearly extends Interval
     *
     * @return Carbon
     */
-    public function nextDate(Carbon $date, int $interval = 1): Carbon {
+    public function nextDate(Carbon $date, int $interval = 1): Carbon
+    {
        return ($date->clone())->addYearsNoOverflow($this->skip($interval));
    }
 }
--- a/app/Support/Repositories/Administration/AdministrationTrait.php
+++ b/app/Support/Repositories/Administration/AdministrationTrait.php
@ -43,7 +43,8 @@ trait AdministrationTrait
    /**
     * @return int
     */
-    public function getAdministrationId(): int {
+    public function getAdministrationId(): int
+    {
        return $this->administrationId;
    }

@ -52,7 +53,8 @@ trait AdministrationTrait
     *
     * @throws FireflyException
     */
-    public function setAdministrationId(int $administrationId): void {
+    public function setAdministrationId(int $administrationId): void
+    {
        $this->administrationId = $administrationId;
        $this->refreshAdministration();
    }
@ -61,7 +63,8 @@ trait AdministrationTrait
     * @return void
     * @throws FireflyException
     */
-    private function refreshAdministration(): void {
+    private function refreshAdministration(): void
+    {
        if (null !== $this->administrationId) {
            $memberships = GroupMembership::where('user_id', $this->user->id)
                                          ->where('user_group_id', $this->administrationId)
@ -80,7 +83,8 @@ trait AdministrationTrait
     *
     * @return void
     */
-    public function setUser(Authenticatable | User | null $user): void {
+    public function setUser(Authenticatable | User | null $user): void
+    {
        if (null !== $user) {
            $this->user = $user;
        }
--- a/app/Transformers/BillTransformer.php
+++ b/app/Transformers/BillTransformer.php
@ -86,11 +86,6 @@ class BillTransformer extends AbstractTransformer
        foreach ($payDates as $string) {
            $payDatesFormatted[] = Carbon::createFromFormat('!Y-m-d', $string, config('app.timezone'))->toAtomString();
        }
-        if (1 === $bill->id) {
-            var_dump($payDates);
-            var_dump($payDatesFormatted);
-            var_dump($paidData['next_expected_match']);
-        }
        $nextExpectedMatch = null;
        if (null !== $paidData['next_expected_match']) {
            $nextExpectedMatch = Carbon::createFromFormat('!Y-m-d', $paidData['next_expected_match'], config('app.timezone'))->toAtomString();
@ -157,7 +152,7 @@ class BillTransformer extends AbstractTransformer
    {
        Log::debug(sprintf('Now in paidData for bill #%d', $bill->id));
        if (null === $this->parameters->get('start') || null === $this->parameters->get('end')) {
-            //Log::debug('parameters are NULL, return empty array');
+            Log::debug('parameters are NULL, return empty array');

            return [
                'paid_dates'          => [],
@ -165,15 +160,19 @@ class BillTransformer extends AbstractTransformer
            ];
        }
        // 2023-07-1 sub one day from the start date to fix a possible bug (see #7704)
+        // 2023-07-18 this particular date is used to search for the last paid date.
+        // 2023-07-18 the cloned $searchDate is used to grab the correct transactions.
        /** @var Carbon $start */
        $start = clone $this->parameters->get('start');
        $start->subDay();
+
+        $searchStart = clone $start;
        //Log::debug(sprintf('Parameters are start:%s end:%s', $start->format('Y-m-d'), $this->parameters->get('end')->format('Y-m-d')));

        /*
         *  Get from database when bill was paid.
         */
-        $set = $this->repository->getPaidDatesInRange($bill, $start, $this->parameters->get('end'));
+        $set = $this->repository->getPaidDatesInRange($bill, $searchStart, $this->parameters->get('end'));
        //Log::debug(sprintf('Count %d entries in getPaidDatesInRange()', $set->count()));

        /*
--- a/app/Validation/Administration/ValidatesAdministrationAccess.php
+++ b/app/Validation/Administration/ValidatesAdministrationAccess.php
@ -46,7 +46,8 @@ trait ValidatesAdministrationAccess
     * @throws AuthenticationException
     * @throws FireflyException
     */
-    protected function validateAdministration(Validator $validator, array $allowedRoles): void {
+    protected function validateAdministration(Validator $validator, array $allowedRoles): void
+    {
        Log::debug('Now in validateAdministration()');
        if (!auth()->check()) {
            Log::error('User is not authenticated.');
--- a/changelog.md
+++ b/changelog.md
@ -3,10 +3,20 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).

+## 6.0.18 - 2023-07-19
+
+### Fixed
+
+- Slack messages would fail if not configured.
+- Bill display would include transactions from the previous period.
+- Debug information left in bill overview.
+- [Issue 7694](https://github.com/firefly-iii/firefly-iii/issues/7694) Missing CSS info in dark mode.
+- [Issue 7706](https://github.com/firefly-iii/firefly-iii/issues/7706) Deleting a budget would not reset the available amount.
+- [Issue 7749](https://github.com/firefly-iii/firefly-iii/issues/7749) Account overview would show just 1 transaction from a split of multiple.
+
 ## 6.0.17 - 2023-07-16

 ### Added
- 

 - New date calculation code and tests, thanks to @tonicospinelli!

@ -314,7 +324,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).

 ## 6.0.0 - 2023-03-03

-This is release **6.0.0** of Firefly III.
+This is release
+
+*
+
+*6.0.0
+** of Firefly III.

 ### Warnings

@ -326,7 +341,13 @@ This is release **6.0.0** of Firefly III.

 ### Notes

- The new **v3** layout is not yet finished, and it should **not** be used to edit or add data.
+- The new
+    *
+  *v3
+  ** layout is not yet finished, and it should
+    *
+  *not
+  ** be used to edit or add data.

 ### Added

@ -418,7 +439,11 @@ This is release **6.0.0** of Firefly III.
 ### Warnings

 - ⚠️ Make a backup of your database first!
- ⚠️ This version requires **PHP 8.2**.
+- ⚠️ This version requires
+    *
+  *PHP
+  8.2
+  **.

 You can access the new V3 layout under `/v3/`. If you decide to use or test it:

@ -447,7 +472,11 @@ You can access the new V3 layout under `/v3/`. If you decide to use or test it:
 ### Warnings

 - ⚠️ Make a backup of your database first!
- ⚠️ This version requires **PHP 8.2**.
+- ⚠️ This version requires
+    *
+  *PHP
+  8.2
+  **.

 You can access the new V3 layout under `/v3/`. If you decide to use or test it:

@ -469,7 +498,11 @@ You can access the new V3 layout under `/v3/`. If you decide to use or test it:
 ### Warnings

 - ⚠️ Make a backup of your database first!
- ⚠️ This version requires **PHP 8.2**.
+- ⚠️ This version requires
+    *
+  *PHP
+  8.2
+  **.

 You can access the new V3 layout under `/v3/`. If you decide to use or test it:

@ -519,7 +552,11 @@ destructive upgrade process, this is now "6.0.0". It will again be alpha.1.
 ### Warnings

 - ⚠️ Make a backup of your database first!
- ⚠️ This version requires **PHP 8.2**.
+- ⚠️ This version requires
+    *
+  *PHP
+  8.2
+  **.

 You can access the new V3 layout under `/v3/`. If you decide to use or test it:

@ -565,7 +602,11 @@ make a backup of your database first! I guarantee nothing.
 ### Warnings

 - ⚠️ Make a backup of your database first!
- ⚠️ This version requires **PHP 8.2**.
+- ⚠️ This version requires
+    *
+  *PHP
+  8.2
+  **.

 You can access the new V3 layout under `/v3/`. If you decide to use or test it:

@ -821,7 +862,8 @@ https://api-docs.firefly-iii.org/.
 - [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.
+  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
--- a/composer.json
+++ b/composer.json
@ -91,7 +91,7 @@
    "laravel/framework": "^10",
    "laravel/passport": "11.*",
    "laravel/sanctum": "^3.2",
-    "laravel/slack-notification-channel": "^2.4",
+    "laravel/slack-notification-channel": "^3",
    "laravel/ui": "^4.2",
    "league/commonmark": "2.*",
    "league/csv": "^9.7",
--- a/composer.lock
+++ b/composer.lock
@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "99f0c0e3a4fbdd439e03623e5cd9ba38",
+    "content-hash": "a46107aae29496aa6d988a9d3cee2340",
    "packages": [
        {
            "name": "bacon/bacon-qr-code",
@ -2346,31 +2346,35 @@
        },
        {
            "name": "laravel/slack-notification-channel",
-            "version": "v2.5.0",
+            "version": "v3.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/slack-notification-channel.git",
-                "reference": "e0d4be5e01d443a69fa89f0a4cac6bd2eda2be8f"
+                "reference": "20d0f6ae89aed80696e7ff2c667369a4f270c08c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/slack-notification-channel/zipball/e0d4be5e01d443a69fa89f0a4cac6bd2eda2be8f",
-                "reference": "e0d4be5e01d443a69fa89f0a4cac6bd2eda2be8f",
+                "url": "https://api.github.com/repos/laravel/slack-notification-channel/zipball/20d0f6ae89aed80696e7ff2c667369a4f270c08c",
+                "reference": "20d0f6ae89aed80696e7ff2c667369a4f270c08c",
                "shasum": ""
            },
            "require": {
-                "guzzlehttp/guzzle": "^6.0|^7.0",
-                "illuminate/notifications": "~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0",
-                "php": "^7.1.3|^8.0"
+                "guzzlehttp/guzzle": "^7.0",
+                "illuminate/http": "^9.0|^10.0",
+                "illuminate/notifications": "^9.0|^10.0",
+                "illuminate/support": "^9.0|^10.0",
+                "php": "^8.0"
            },
            "require-dev": {
                "mockery/mockery": "^1.0",
-                "phpunit/phpunit": "^7.0|^8.0|^9.0"
+                "orchestra/testbench": "^7.0|^8.0",
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^9.0"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "2.x-dev"
+                    "dev-master": "3.x-dev"
                },
                "laravel": {
                    "providers": [
@ -2401,9 +2405,9 @@
            ],
            "support": {
                "issues": "https://github.com/laravel/slack-notification-channel/issues",
-                "source": "https://github.com/laravel/slack-notification-channel/tree/v2.5.0"
+                "source": "https://github.com/laravel/slack-notification-channel/tree/v3.0.0"
            },
-            "time": "2023-01-12T16:21:26+00:00"
+            "time": "2023-07-14T14:58:23+00:00"
        },
        {
            "name": "laravel/ui",
@ -10459,16 +10463,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "10.2.5",
+            "version": "10.2.6",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "15a89f123d8ca9c1e1598d6d87a56a8bf28c72cd"
+                "reference": "1c17815c129f133f3019cc18e8d0c8622e6d9bcd"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/15a89f123d8ca9c1e1598d6d87a56a8bf28c72cd",
-                "reference": "15a89f123d8ca9c1e1598d6d87a56a8bf28c72cd",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1c17815c129f133f3019cc18e8d0c8622e6d9bcd",
+                "reference": "1c17815c129f133f3019cc18e8d0c8622e6d9bcd",
                "shasum": ""
            },
            "require": {
@ -10540,7 +10544,7 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.2.5"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.2.6"
            },
            "funding": [
                {
@ -10556,7 +10560,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-07-14T04:18:47+00:00"
+            "time": "2023-07-17T12:08:28+00:00"
        },
        {
            "name": "sebastian/cli-parser",
--- a/config/firefly.php
+++ b/config/firefly.php
@ -107,7 +107,7 @@ return [
        'webhooks'     => true,
        'handle_debts' => true,
    ],
-    'version'                      => '6.0.17',
+    'version'                      => '6.0.18',
    'api_version'                  => '2.0.4',
    'db_version'                   => 19,

--- a/frontend/src/i18n/ja_JP/index.js
+++ b/frontend/src/i18n/ja_JP/index.js
@ -72,7 +72,7 @@ export default {
        "newTransfer": "\u65b0\u3057\u3044\u9001\u91d1",
        "submission_options": "\u9001\u4fe1\u30aa\u30d7\u30b7\u30e7\u30f3",
        "apply_rules_checkbox": "\u30eb\u30fc\u30eb\u3092\u9069\u7528",
-        "fire_webhooks_checkbox": "Webhook \u3092\u5b9f\u884c\u3059\u308b",
+        "fire_webhooks_checkbox": "Webhook\u3092\u5b9f\u884c",
        "newDeposit": "\u65b0\u3057\u3044\u5165\u91d1",
        "newWithdrawal": "\u65b0\u3057\u3044\u652f\u51fa",
        "bills_paid": "\u652f\u6255\u3044\u6e08\u307f\u8acb\u6c42",
@ -87,22 +87,22 @@ export default {
        "rule_trigger_source_account_contains_choice": "\u5f15\u304d\u51fa\u3057\u53e3\u5ea7\u540d\u304c\u2026\u3092\u542b\u3080",
        "rule_trigger_account_id_choice": "\u3069\u3061\u3089\u304b\u306e\u53e3\u5ea7ID\u304c\u2026",
        "rule_trigger_source_account_id_choice": "\u5f15\u304d\u51fa\u3057\u53e3\u5ea7ID\u304c\u2026",
-        "rule_trigger_destination_account_id_choice": "\u5b9b\u5148\u53e3\u5ea7ID\u304c\u2026",
+        "rule_trigger_destination_account_id_choice": "\u9810\u3051\u5165\u308c\u53e3\u5ea7ID\u304c\u2026",
        "rule_trigger_account_is_cash_choice": "\u3069\u3061\u3089\u304b\u306e\u53e3\u5ea7\u304c\u73fe\u91d1",
-        "rule_trigger_source_is_cash_choice": "\u5b9b\u5148\u53e3\u5ea7\u304c\u73fe\u91d1\u53e3\u5ea7",
-        "rule_trigger_destination_is_cash_choice": "\u5b9b\u5148\u53e3\u5ea7\u304c\u73fe\u91d1\u53e3\u5ea7",
+        "rule_trigger_source_is_cash_choice": "\u9810\u3051\u5165\u308c\u53e3\u5ea7\u304c\u73fe\u91d1\u53e3\u5ea7",
+        "rule_trigger_destination_is_cash_choice": "\u9810\u3051\u5165\u308c\u53e3\u5ea7\u304c\u73fe\u91d1\u53e3\u5ea7",
        "rule_trigger_source_account_nr_starts_choice": "\u5f15\u304d\u51fa\u3057\u53e3\u5ea7\u756a\u53f7\/IBAN\u304c\u2026\u3067\u59cb\u307e\u308b",
        "rule_trigger_source_account_nr_ends_choice": "\u5f15\u304d\u51fa\u3057\u53e3\u5ea7\u756a\u53f7\/IBAN\u304c\u2026\u3067\u7d42\u308f\u308b",
        "rule_trigger_source_account_nr_is_choice": "\u5f15\u304d\u51fa\u3057\u53e3\u5ea7\u756a\u53f7\/IBAN\u304c\u2026",
        "rule_trigger_source_account_nr_contains_choice": "\u5f15\u304d\u51fa\u3057\u53e3\u5ea7\u756a\u53f7\/IBAN\u304c\u2026\u3092\u542b\u3080",
-        "rule_trigger_destination_account_starts_choice": "\u5b9b\u5148\u53e3\u5ea7\u540d\u304c...\u3067\u59cb\u307e\u308b",
-        "rule_trigger_destination_account_ends_choice": "\u5b9b\u5148\u53e3\u5ea7\u540d\u304c...\u3067\u7d42\u308f\u308b",
-        "rule_trigger_destination_account_is_choice": "\u5b9b\u5148\u53e3\u5ea7\u540d\u304c\u2026",
-        "rule_trigger_destination_account_contains_choice": "\u5b9b\u5148\u53e3\u5ea7\u540d\u304c...\u3092\u542b\u3080",
-        "rule_trigger_destination_account_nr_starts_choice": "\u5b9b\u5148\u53e3\u5ea7\u756a\u53f7\/IBAN\u304c...\u3067\u59cb\u307e\u308b",
-        "rule_trigger_destination_account_nr_ends_choice": "\u5b9b\u5148\u53e3\u5ea7\u756a\u53f7\/IBAN\u304c...\u3067\u7d42\u308f\u308b",
-        "rule_trigger_destination_account_nr_is_choice": "\u5b9b\u5148\u53e3\u5ea7\u756a\u53f7\/IBAN\u304c\u2026",
-        "rule_trigger_destination_account_nr_contains_choice": "\u5b9b\u5148\u53e3\u5ea7\u756a\u53f7\/IBAN\u304c...\u3092\u542b\u3080",
+        "rule_trigger_destination_account_starts_choice": "\u9810\u3051\u5165\u308c\u53e3\u5ea7\u540d\u304c...\u3067\u59cb\u307e\u308b",
+        "rule_trigger_destination_account_ends_choice": "\u9810\u3051\u5165\u308c\u53e3\u5ea7\u540d\u304c...\u3067\u7d42\u308f\u308b",
+        "rule_trigger_destination_account_is_choice": "\u9810\u3051\u5165\u308c\u53e3\u5ea7\u540d\u304c\u2026",
+        "rule_trigger_destination_account_contains_choice": "\u9810\u3051\u5165\u308c\u53e3\u5ea7\u540d\u304c...\u3092\u542b\u3080",
+        "rule_trigger_destination_account_nr_starts_choice": "\u9810\u3051\u5165\u308c\u53e3\u5ea7\u756a\u53f7\/IBAN\u304c...\u3067\u59cb\u307e\u308b",
+        "rule_trigger_destination_account_nr_ends_choice": "\u9810\u3051\u5165\u308c\u53e3\u5ea7\u756a\u53f7\/IBAN\u304c...\u3067\u7d42\u308f\u308b",
+        "rule_trigger_destination_account_nr_is_choice": "\u9810\u3051\u5165\u308c\u53e3\u5ea7\u756a\u53f7\/IBAN\u304c\u2026",
+        "rule_trigger_destination_account_nr_contains_choice": "\u9810\u3051\u5165\u308c\u53e3\u5ea7\u756a\u53f7\/IBAN\u304c...\u3092\u542b\u3080",
        "rule_trigger_transaction_type_choice": "\u53d6\u5f15\u7a2e\u5225\u304c\u2026",
        "rule_trigger_category_is_choice": "\u30ab\u30c6\u30b4\u30ea\u304c\u2026",
        "rule_trigger_amount_less_choice": "\u91d1\u984d\u304c\u2026\u3088\u308a\u5c0f\u3055\u3044",
@ -171,7 +171,7 @@ export default {
        "title_withdrawal": "\u652f\u51fa",
        "title_revenue": "\u53ce\u76ca \/ \u53ce\u5165",
        "pref_1D": "1\u65e5",
-        "pref_1W": "YYYY\u5e74w[\u9031\u76ee]",
+        "pref_1W": "1\u9031",
        "pref_1M": "1\u30f5\u6708",
        "pref_3M": "3\u30f6\u6708 (\u56db\u534a\u671f)",
        "pref_6M": "6\u30f6\u6708",
@ -200,7 +200,7 @@ export default {
        "tags": "\u30bf\u30b0",
        "object_groups_page_title": "\u30b0\u30eb\u30fc\u30d7",
        "reports": "\u30ec\u30dd\u30fc\u30c8",
-        "webhooks": "Webhooks",
+        "webhooks": "Webhook",
        "currencies": "\u901a\u8ca8",
        "administration": "\u7ba1\u7406",
        "profile": "\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb",
@ -215,7 +215,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",
        "net_worth": "\u7d14\u8cc7\u7523",
        "pref_last365": "\u6628\u5e74",
        "pref_last90": "\u904e\u53bb 90 \u65e5\u9593",
--- a/frontend/src/i18n/nn_NO/index.js
+++ b/frontend/src/i18n/nn_NO/index.js
@ -31,7 +31,7 @@ export default {
        "title": "Tittel",
        "first_date": "F\u00f8rste dato",
        "repetitions": "Repetisjoner",
-        "description": "Beskrivelse",
+        "description": "Beskriving",
        "iban": "IBAN",
        "skip": "Hopp over",
        "date": "Dato"
@ -81,8 +81,8 @@ export default {
        "budgeted": "Budsjettert",
        "spent": "Brukt",
        "no_bill": "(ingen rekning)",
-        "rule_trigger_source_account_starts_choice": "Kjeldekonto namn starter med..",
-        "rule_trigger_source_account_ends_choice": "Kjeldenamnet slutter med..",
+        "rule_trigger_source_account_starts_choice": "Kjeldekonto namn byrjar med..",
+        "rule_trigger_source_account_ends_choice": "Kjeldenamnet sluttar med..",
        "rule_trigger_source_account_is_choice": "Kjeldekonto namn er..",
        "rule_trigger_source_account_contains_choice": "Kjeldekonto namn inneheld..",
        "rule_trigger_account_id_choice": "Ein av konto ID'er, er n\u00f8yaktig.",
@ -91,16 +91,16 @@ export default {
        "rule_trigger_account_is_cash_choice": "Ein av konto er kontant",
        "rule_trigger_source_is_cash_choice": "Kjeldekonto er (kontant) konto",
        "rule_trigger_destination_is_cash_choice": "M\u00e5lkonto er (kontant) konto",
-        "rule_trigger_source_account_nr_starts_choice": "Kjeldekontonummer \/ IBAN starter med..",
-        "rule_trigger_source_account_nr_ends_choice": "Kjeldekontonummer \/ IBAN slutter med..",
+        "rule_trigger_source_account_nr_starts_choice": "Kjeldekontonummer \/ IBAN byrjar med..",
+        "rule_trigger_source_account_nr_ends_choice": "Kjeldekontonummer \/ IBAN sluttar med..",
        "rule_trigger_source_account_nr_is_choice": "Kjeldekontonummer \/ IBAN er..",
-        "rule_trigger_source_account_nr_contains_choice": "Kjelde kontonummer \/ IBAN inneheld..",
-        "rule_trigger_destination_account_starts_choice": "M\u00e5lkontonamnet begynner med..",
-        "rule_trigger_destination_account_ends_choice": "M\u00e5lkontonamnet slutter med..",
-        "rule_trigger_destination_account_is_choice": "M\u00e5lkonto namn slutter med..",
+        "rule_trigger_source_account_nr_contains_choice": "Kjeldekontonummer \/ IBAN inneheld..",
+        "rule_trigger_destination_account_starts_choice": "M\u00e5lkontonamnet byrjar med..",
+        "rule_trigger_destination_account_ends_choice": "M\u00e5lkontonamnet sluttar med..",
+        "rule_trigger_destination_account_is_choice": "M\u00e5lkonto namn sluttar med..",
        "rule_trigger_destination_account_contains_choice": "M\u00e5lkontonamn inneheld..",
-        "rule_trigger_destination_account_nr_starts_choice": "M\u00e5lkontonummer \/ IBAN starter med..",
-        "rule_trigger_destination_account_nr_ends_choice": "M\u00e5lkontonummer \/ IBAN slutter med..",
+        "rule_trigger_destination_account_nr_starts_choice": "M\u00e5lkontonummer \/ IBAN byrjar med..",
+        "rule_trigger_destination_account_nr_ends_choice": "M\u00e5lkontonummer \/ IBAN sluttar med..",
        "rule_trigger_destination_account_nr_is_choice": "M\u00e5lkontonummer \/ IBAN er..",
        "rule_trigger_destination_account_nr_contains_choice": "M\u00e5lkontonummer \/ IBAN inneheld..",
        "rule_trigger_transaction_type_choice": "Transaksjonen er av typen..",
@ -108,10 +108,10 @@ export default {
        "rule_trigger_amount_less_choice": "Bel\u00f8pet er mindre enn..",
        "rule_trigger_amount_is_choice": "Bel\u00f8pet er..",
        "rule_trigger_amount_more_choice": "Bel\u00f8pet er meir enn..",
-        "rule_trigger_description_starts_choice": "Beskrivelse starter med..",
-        "rule_trigger_description_ends_choice": "Beskrivelse slutter med..",
-        "rule_trigger_description_contains_choice": "Beskrivelse inneheld..",
-        "rule_trigger_description_is_choice": "Beskrivelse er..",
+        "rule_trigger_description_starts_choice": "Beskrivinga byrjar med..",
+        "rule_trigger_description_ends_choice": "Beskrivinga sluttar med..",
+        "rule_trigger_description_contains_choice": "Beskrivinga inneheld..",
+        "rule_trigger_description_is_choice": "Beskrivinga er..",
        "rule_trigger_date_on_choice": "Transaksjonsdato er..",
        "rule_trigger_date_before_choice": "Transaksjons dato er f\u00f8r..",
        "rule_trigger_date_after_choice": "Transaksjons dato er etter..",
@ -130,12 +130,12 @@ export default {
        "rule_trigger_has_any_bill_choice": "Har ein rekning",
        "rule_trigger_has_no_tag_choice": "Har ingen tagg(ar)",
        "rule_trigger_has_any_tag_choice": "Har ein eller fleire tagger",
-        "rule_trigger_any_notes_choice": "Har ett eller fleire notater",
-        "rule_trigger_no_notes_choice": "Har ingen notater",
-        "rule_trigger_notes_is_choice": "Notater er..",
-        "rule_trigger_notes_contains_choice": "Notater inneheld..",
-        "rule_trigger_notes_starts_choice": "Notater begynner med..",
-        "rule_trigger_notes_ends_choice": "Notater som slutter med..",
+        "rule_trigger_any_notes_choice": "Har notat",
+        "rule_trigger_no_notes_choice": "Har ikkje notat",
+        "rule_trigger_notes_is_choice": "Notat er..",
+        "rule_trigger_notes_contains_choice": "Notat inneheld..",
+        "rule_trigger_notes_starts_choice": "Notat byrjar med..",
+        "rule_trigger_notes_ends_choice": "Notat sluttar med..",
        "rule_trigger_bill_is_choice": "Rekning er..",
        "rule_trigger_external_id_is_choice": "Ekstern ID er..",
        "rule_trigger_internal_reference_is_choice": "Intern referanse er..",
@ -157,16 +157,16 @@ export default {
        "rule_action_prepend_description_choice": "Legg til foran beskrivinga med ..",
        "rule_action_set_source_account_choice": "Sett kjeldekonto til ..",
        "rule_action_set_destination_account_choice": "Sett m\u00e5lkonto til ..",
-        "rule_action_append_notes_choice": "Legg til i notater med ..",
-        "rule_action_prepend_notes_choice": "Legg til foran i notater med ..",
-        "rule_action_clear_notes_choice": "Fjern notater",
-        "rule_action_set_notes_choice": "Sett notater til ..",
+        "rule_action_append_notes_choice": "Legg til notat med ..",
+        "rule_action_prepend_notes_choice": "Legg f\u00f8lgande framfor notat ..",
+        "rule_action_clear_notes_choice": "Fjern notat",
+        "rule_action_set_notes_choice": "Sett notat til ..",
        "rule_action_link_to_bill_choice": "Koble til ein rekning ..",
        "rule_action_convert_deposit_choice": "Konverter transaksjonen til eit innskot",
        "rule_action_convert_withdrawal_choice": "Konverter denne transaksjonen til eit uttak",
        "rule_action_convert_transfer_choice": "Konverter transaksjonen til ein overf\u00f8ring",
        "placeholder": "[Placeholder]",
-        "recurrences": "Gjentakende transaksjonar",
+        "recurrences": "Gjentakande transaksjonar",
        "title_expenses": "Utgifter",
        "title_withdrawal": "Utgifter",
        "title_revenue": "Inntekt",
@ -177,7 +177,7 @@ export default {
        "pref_6M": "Seks m\u00e5neder",
        "pref_1Y": "Ett \u00e5r",
        "repeat_freq_yearly": "\u00e5rlig",
-        "repeat_freq_half-year": "hvert halv\u00e5r",
+        "repeat_freq_half-year": "kvart halv\u00e5r",
        "repeat_freq_quarterly": "kvartalsvis",
        "repeat_freq_monthly": "m\u00e5nedlig",
        "repeat_freq_weekly": "ukentlig",
@ -188,7 +188,7 @@ export default {
        "undefined_accounts": "Kontoar",
        "name": "Namn",
        "revenue_accounts": "Inntektskontoar",
-        "description": "Beskrivelse",
+        "description": "Beskriving",
        "category": "Kategori",
        "title_deposit": "Inntekt",
        "title_transfer": "Overf\u00f8ringer",
--- a/frontend/src/layouts/MainLayout.vue
+++ b/frontend/src/layouts/MainLayout.vue
@ -338,7 +338,7 @@ page container: q-ma-xs (margin all, xs) AND q-mb-md to give the page content so
    <q-footer bordered class="bg-grey-8 text-white">
      <q-toolbar>
        <div>
-          <small>Firefly III v v6.0.17 &copy; James Cole, AGPL-3.0-or-later.</small>
+          <small>Firefly III v v6.0.18 &copy; James Cole, AGPL-3.0-or-later.</small>
        </div>
      </q-toolbar>
    </q-footer>
--- a/public/v1/js/create_transaction.js
+++ b/public/v1/js/create_transaction.js
--- a/public/v1/js/edit_transaction.js
+++ b/public/v1/js/edit_transaction.js
--- a/public/v1/js/profile.js
+++ b/public/v1/js/profile.js
--- a/public/v1/js/webhooks/create.js
+++ b/public/v1/js/webhooks/create.js
--- a/public/v1/js/webhooks/edit.js
+++ b/public/v1/js/webhooks/edit.js
--- a/public/v1/js/webhooks/index.js
+++ b/public/v1/js/webhooks/index.js
--- a/public/v1/js/webhooks/show.js
+++ b/public/v1/js/webhooks/show.js
--- a/public/v1/lib/adminlte/css/skins/skin-dark.css
+++ b/public/v1/lib/adminlte/css/skins/skin-dark.css
@ -498,7 +498,6 @@
 .skin-firefly-iii .input-group textarea {
  background-color: #353c42;
  color: #bec5cb;
-  border: 1px solid #73818f;
 }
 .skin-firefly-iii .list-group {
  color: #bec5cb;
@ -515,6 +514,9 @@
  border-color: #272c30;
  background-color: #353c42;
 }
+.skin-firefly-iii .form-control:focus {
+  border-color: #3c8dbc;
+}
 .skin-firefly-iii .select2 .select2-selection {
  background-color: #353c42;
  color: #bec5cb;
--- a/public/v1/lib/adminlte/css/skins/skin-dark.min.css
+++ b/public/v1/lib/adminlte/css/skins/skin-dark.min.css
--- a/public/v3/index.html
+++ b/public/v3/index.html
@ -1 +1 @@
-<!DOCTYPE html><html><head><base href=/v3/ ><title>Firefly III</title><meta charset=utf-8><meta content="Personal finances manager" name=description><meta content="telephone=no" name=format-detection><meta content=no name=msapplication-tap-highlight><meta content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width" name=viewport><link href=favicon-32x32.png rel=icon sizes=32x32 type=image/png><link href=favicon-16x16.png rel=icon sizes=16x16 type=image/png><link href=maskable76.png rel=apple-touch-icon sizes=76x76><link href=maskable120.png rel=apple-touch-icon sizes=120x120><link href=maskable152.png rel=apple-touch-icon sizes=152x152><link href=apple-touch-icon.png rel=apple-touch-icon sizes=180x180><link color=#3c8dbc href=safari-pinned-tab.svg rel=mask-icon><link href=maskable192.png rel=icon sizes=192x192><link href=maskable128.png rel=icon sizes=128x128><link href=manifest.webmanifest rel=manifest><meta content=#1e6581 name=msapplication-TileColor><meta content=maskable512.png name=msapplication-TileImage><meta content=no name=msapplication-tap-highlight><meta content="Firefly III" name=application-name><meta content="noindex, nofollow, noarchive, noodp, NoImageIndex, noydir" name=robots><meta content=yes name=apple-mobile-web-app-capable><meta content="Firefly III" name=apple-mobile-web-app-title><meta content="Firefly III" name=application-name><meta content=#3c8dbc name=msapplication-TileColor><meta content="mstile-144x144.png?v=3e8AboOwbd" name=msapplication-TileImage><meta content=#3c8dbc name=theme-color><script defer src=/v3/js/vendor.c85174b6.js></script><script defer src=/v3/js/app.aa7178b5.js></script><link href=/v3/css/vendor.1042cbfe.css rel=stylesheet><link href=/v3/css/app.50c7ba73.css rel=stylesheet></head><body><div id=q-app></div></body></html>
+<!DOCTYPE html><html><head><base href=/v3/ ><title>Firefly III</title><meta charset=utf-8><meta content="Personal finances manager" name=description><meta content="telephone=no" name=format-detection><meta content=no name=msapplication-tap-highlight><meta content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width" name=viewport><link href=favicon-32x32.png rel=icon sizes=32x32 type=image/png><link href=favicon-16x16.png rel=icon sizes=16x16 type=image/png><link href=maskable76.png rel=apple-touch-icon sizes=76x76><link href=maskable120.png rel=apple-touch-icon sizes=120x120><link href=maskable152.png rel=apple-touch-icon sizes=152x152><link href=apple-touch-icon.png rel=apple-touch-icon sizes=180x180><link color=#3c8dbc href=safari-pinned-tab.svg rel=mask-icon><link href=maskable192.png rel=icon sizes=192x192><link href=maskable128.png rel=icon sizes=128x128><link href=manifest.webmanifest rel=manifest><meta content=#1e6581 name=msapplication-TileColor><meta content=maskable512.png name=msapplication-TileImage><meta content=no name=msapplication-tap-highlight><meta content="Firefly III" name=application-name><meta content="noindex, nofollow, noarchive, noodp, NoImageIndex, noydir" name=robots><meta content=yes name=apple-mobile-web-app-capable><meta content="Firefly III" name=apple-mobile-web-app-title><meta content="Firefly III" name=application-name><meta content=#3c8dbc name=msapplication-TileColor><meta content="mstile-144x144.png?v=3e8AboOwbd" name=msapplication-TileImage><meta content=#3c8dbc name=theme-color><script defer src=/v3/js/vendor.c85174b6.js></script><script defer src=/v3/js/app.db0b243e.js></script><link href=/v3/css/vendor.1042cbfe.css rel=stylesheet><link href=/v3/css/app.50c7ba73.css rel=stylesheet></head><body><div id=q-app></div></body></html>
--- a/public/v3/js/2686.9a32e198.js
+++ b/public/v3/js/2686.9a32e198.js
--- a/public/v3/js/2769.435f626d.js
+++ b/public/v3/js/2769.435f626d.js
@ -1 +0,0 @@
-"use strict";(globalThis["webpackChunkfirefly_iii"]=globalThis["webpackChunkfirefly_iii"]||[]).push([[2769],{2769:(e,t,l)=>{l.r(t),l.d(t,{default:()=>d});var n=l(9835);const i={class:"fullscreen bg-blue text-white text-center q-pa-md flex flex-center"},o=(0,n._)("div",{style:{"font-size":"30vh"}}," 404 ",-1),s=(0,n._)("div",{class:"text-h2",style:{opacity:".4"}}," Oops. Nothing here... ",-1);function c(e,t,l,c,r,a){const u=(0,n.up)("q-btn");return(0,n.wg)(),(0,n.iD)("div",i,[(0,n._)("div",null,[o,s,(0,n.Wm)(u,{class:"q-mt-xl",color:"white",label:"Go Home","no-caps":"","text-color":"blue",to:"/",unelevated:""})])])}const r=(0,n.aZ)({name:"Error404"});var a=l(1639),u=l(8879),h=l(9984),f=l.n(h);const b=(0,a.Z)(r,[["render",c]]),d=b;f()(r,"components",{QBtn:u.Z})}}]);
--- a/public/v3/js/2769.fb18b544.js
+++ b/public/v3/js/2769.fb18b544.js
@ -0,0 +1 @@
+"use strict";(globalThis["webpackChunkfirefly_iii"]=globalThis["webpackChunkfirefly_iii"]||[]).push([[2769],{855:(e,t,l)=>{l.r(t),l.d(t,{default:()=>d});var n=l(9835);const i={class:"fullscreen bg-blue text-white text-center q-pa-md flex flex-center"},o=(0,n._)("div",{style:{"font-size":"30vh"}}," 404 ",-1),s=(0,n._)("div",{class:"text-h2",style:{opacity:".4"}}," Oops. Nothing here... ",-1);function c(e,t,l,c,r,a){const u=(0,n.up)("q-btn");return(0,n.wg)(),(0,n.iD)("div",i,[(0,n._)("div",null,[o,s,(0,n.Wm)(u,{class:"q-mt-xl",color:"white",label:"Go Home","no-caps":"","text-color":"blue",to:"/",unelevated:""})])])}const r=(0,n.aZ)({name:"Error404"});var a=l(1639),u=l(8879),h=l(9984),f=l.n(h);const b=(0,a.Z)(r,[["render",c]]),d=b;f()(r,"components",{QBtn:u.Z})}}]);
--- a/public/v3/js/353.46c1b6bd.js
+++ b/public/v3/js/353.46c1b6bd.js
--- a/public/v3/js/app.aa7178b5.js
+++ b/public/v3/js/app.aa7178b5.js
--- a/public/v3/js/app.db0b243e.js
+++ b/public/v3/js/app.db0b243e.js
--- a/resources/assets/js/locales/ja.json
+++ b/resources/assets/js/locales/ja.json
@ -16,7 +16,7 @@
        "transaction_journal_information": "\u53d6\u5f15\u60c5\u5831",
        "submission_options": "\u9001\u4fe1\u30aa\u30d7\u30b7\u30e7\u30f3",
        "apply_rules_checkbox": "\u30eb\u30fc\u30eb\u3092\u9069\u7528",
-        "fire_webhooks_checkbox": "Webhook \u3092\u5b9f\u884c\u3059\u308b",
+        "fire_webhooks_checkbox": "Webhook\u3092\u5b9f\u884c",
        "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",
@ -24,7 +24,7 @@
        "destination_account": "\u9001\u91d1\u5148\u306e\u53e3\u5ea7",
        "add_another_split": "\u5225\u306e\u5206\u5272\u3092\u8ffd\u52a0",
        "submission": "\u9001\u4fe1",
-        "create_another": "\u4fdd\u5b58\u5f8c\u306b\u3053\u3053\u306b\u623b\u308a\u3001\u3055\u3089\u306b\u4f5c\u6210\u3059\u308b\u3002",
+        "create_another": "\u4fdd\u5b58\u5f8c\u306b\u623b\u308a\u4f5c\u6210\u3092\u7d9a\u3051\u308b\u3002",
        "reset_after": "\u9001\u4fe1\u5f8c\u306b\u30d5\u30a9\u30fc\u30e0\u3092\u30ea\u30bb\u30c3\u30c8",
        "submit": "\u9001\u4fe1",
        "amount": "\u91d1\u984d",
@ -44,7 +44,7 @@
        "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": "\u5b9b\u5148\u53e3\u5ea7\u306e\u53d6\u5f15\u7167\u5408\u3092\u7de8\u96c6\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002",
+        "destination_account_reconciliation": "\u9810\u3051\u5165\u308c\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",
@ -88,10 +88,10 @@
        "profile_oauth_client_secret_expl": "\u65b0\u3057\u3044\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u30b7\u30fc\u30af\u30ec\u30c3\u30c8\u3067\u3059\u3002 \u3053\u308c\u306f\u4e00\u5ea6\u3057\u304b\u8868\u793a\u3055\u308c\u306a\u3044\u306e\u3067\u3001\u5931\u304f\u3055\u306a\u3044\u3067\u304f\u3060\u3055\u3044\uff01\u3053\u306e\u30b7\u30fc\u30af\u30ec\u30c3\u30c8\u306b\u3088\u308a API \u30ea\u30af\u30a8\u30b9\u30c8\u3092\u5b9f\u884c\u3067\u304d\u307e\u3059\u3002",
        "profile_oauth_confidential": "\u6a5f\u5bc6",
        "profile_oauth_confidential_help": "\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u306b\u30b7\u30fc\u30af\u30ec\u30c3\u30c8\u3092\u4f7f\u3063\u3066\u8a8d\u8a3c\u3059\u308b\u3053\u3068\u3092\u8981\u6c42\u3057\u307e\u3059\u3002\u5185\u3005\u306e\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u306f\u3001\u8a31\u53ef\u3055\u308c\u3066\u3044\u306a\u3044\u8005\u306b\u516c\u958b\u3059\u308b\u3053\u3068\u306a\u304f\u3001\u8a8d\u8a3c\u60c5\u5831\u3092\u5b89\u5168\u306a\u65b9\u6cd5\u3067\u4fdd\u6301\u3067\u304d\u307e\u3059\u3002 \u30cd\u30a4\u30c6\u30a3\u30d6\u30c7\u30b9\u30af\u30c8\u30c3\u30d7\u3084 JavaScript SPA\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306a\u3069\u306e\u30d1\u30d6\u30ea\u30c3\u30af\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306f\u3001\u30b7\u30fc\u30af\u30ec\u30c3\u30c8\u3092\u5b89\u5168\u306b\u4fdd\u6301\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002",
-        "multi_account_warning_unknown": "\u4f5c\u6210\u3059\u308b\u53d6\u5f15\u306e\u7a2e\u985e\u306b\u5fdc\u3058\u3066\u3001\u7d9a\u304f\u5206\u5272\u306e\u5f15\u304d\u51fa\u3057\u53e3\u5ea7\u3084\u5b9b\u5148\u53e3\u5ea7\u306f\u3001\u53d6\u5f15\u306e\u6700\u521d\u306e\u5206\u5272\u3067\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u308b\u3082\u306e\u306b\u3088\u3063\u3066\u8986\u3055\u308c\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002",
+        "multi_account_warning_unknown": "\u4f5c\u6210\u3059\u308b\u53d6\u5f15\u306e\u7a2e\u985e\u306b\u5fdc\u3058\u3066\u3001\u7d9a\u304f\u5206\u5272\u306e\u5f15\u304d\u51fa\u3057\u53e3\u5ea7\u3084\u9810\u3051\u5165\u308c\u53e3\u5ea7\u306f\u3001\u53d6\u5f15\u306e\u6700\u521d\u306e\u5206\u5272\u3067\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u308b\u3082\u306e\u306b\u3088\u3063\u3066\u8986\u3055\u308c\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002",
        "multi_account_warning_withdrawal": "\u7d9a\u304f\u5206\u5272\u306e\u5f15\u304d\u51fa\u3057\u53e3\u5ea7\u306f\u3001\u51fa\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",
-        "multi_account_warning_deposit": "\u7d9a\u304f\u5206\u5272\u306e\u5b9b\u5148\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",
-        "multi_account_warning_transfer": "\u7d9a\u304f\u5206\u5272\u306e\u5b9b\u5148\u53e3\u5ea7\u3068\u5f15\u304d\u51fa\u3057\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",
+        "multi_account_warning_deposit": "\u7d9a\u304f\u5206\u5272\u306e\u9810\u3051\u5165\u308c\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",
+        "multi_account_warning_transfer": "\u7d9a\u304f\u5206\u5272\u306e\u9810\u3051\u5165\u308c\u53e3\u5ea7\u3068\u5f15\u304d\u51fa\u3057\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",
        "webhook_trigger_STORE_TRANSACTION": "\u53d6\u5f15\u4f5c\u6210\u5f8c",
        "webhook_trigger_UPDATE_TRANSACTION": "\u53d6\u5f15\u66f4\u65b0\u5f8c",
        "webhook_trigger_DESTROY_TRANSACTION": "\u53d6\u5f15\u524a\u9664\u5f8c",
@ -101,30 +101,30 @@
        "webhook_delivery_JSON": "JSON",
        "actions": "\u64cd\u4f5c",
        "meta_data": "\u30e1\u30bf\u30c7\u30fc\u30bf",
-        "webhook_messages": "Webhook \u30e1\u30c3\u30bb\u30fc\u30b8",
+        "webhook_messages": "Webhook\u30e1\u30c3\u30bb\u30fc\u30b8",
        "inactive": "\u975e\u30a2\u30af\u30c6\u30a3\u30d6",
        "no_webhook_messages": "Webhook\u30e1\u30c3\u30bb\u30fc\u30b8\u306f\u3042\u308a\u307e\u305b\u3093",
        "inspect": "\u8a73\u7d30\u78ba\u8a8d",
        "create_new_webhook": "Webhook\u3092\u4f5c\u6210",
-        "webhooks": "Webhooks",
-        "webhook_trigger_form_help": "Webhook\u304c\u30c8\u30ea\u30ac\u30fc\u3059\u308b\u30a4\u30d9\u30f3\u30c8\u3092\u793a\u3057\u307e\u3059",
-        "webhook_response_form_help": "Webhook\u304cURL\u306b\u4f55\u3092\u9001\u4fe1\u3059\u308b\u306e\u304b\u3092\u793a\u3057\u307e\u3059\u3002",
-        "webhook_delivery_form_help": "Webhook\u304c\u3069\u306e\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u3067\u30c7\u30fc\u30bf\u3092\u914d\u4fe1\u3059\u308b\u304b",
+        "webhooks": "Webhook",
+        "webhook_trigger_form_help": "Webhook\u304c\u30c8\u30ea\u30ac\u30fc\u3059\u308b\u30a4\u30d9\u30f3\u30c8\u3067\u3059",
+        "webhook_response_form_help": "Webhook\u304cURL\u306b\u9001\u4fe1\u3059\u308b\u3082\u306e\u3067\u3059\u3002",
+        "webhook_delivery_form_help": "Webhook\u304c\u30c7\u30fc\u30bf\u3092\u914d\u4fe1\u3059\u308b\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u3067\u3059\u3002",
        "webhook_active_form_help": "Webhook\u306f\u6709\u52b9\u3067\u3042\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002\u3067\u306a\u3051\u308c\u3070\u547c\u3073\u51fa\u3055\u308c\u307e\u305b\u3093\u3002",
        "edit_webhook_js": "Webhook\u300c{title}\u300d\u3092\u7de8\u96c6",
        "webhook_was_triggered": "\u6307\u5b9a\u3055\u308c\u305f\u53d6\u5f15\u3067Webhook\u304c\u30c8\u30ea\u30ac\u30fc\u3055\u308c\u307e\u3057\u305f\u3002\u7d50\u679c\u304c\u8868\u793a\u3055\u308c\u308b\u307e\u3067\u304a\u5f85\u3061\u304f\u3060\u3055\u3044\u3002",
        "view_message": "\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u898b\u308b",
        "view_attempts": "\u5931\u6557\u3057\u305f\u8a66\u884c\u306e\u8868\u793a",
-        "message_content_title": "Webhook \u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u5185\u5bb9",
+        "message_content_title": "Webhook\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u5185\u5bb9",
        "message_content_help": "\u3053\u306eWebhook\u3092\u4f7f\u7528\u3057\u3066\u9001\u4fe1\uff08\u307e\u305f\u306f\u9001\u4fe1\u8a66\u884c\uff09\u3055\u308c\u305f\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u5185\u5bb9\u3067\u3059\u3002",
-        "attempt_content_title": "Webhook \u306e\u8a66\u884c",
+        "attempt_content_title": "Webhook\u306e\u8a66\u884c",
        "attempt_content_help": "\u8a2d\u5b9a\u3055\u308c\u305fURL\u306b\u9001\u4fe1\u3059\u308bWebhook\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u8a66\u307f\u306f\u3059\u3079\u3066\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u3057\u3070\u3089\u304f\u3059\u308b\u3068Firefly III\u306f\u8a66\u884c\u3092\u505c\u6b62\u3057\u307e\u3059\u3002",
        "no_attempts": "\u5931\u6557\u3057\u305f\u8a66\u884c\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u3053\u308c\u306f\u826f\u3044\u3053\u3068\u3067\u3059\uff01",
        "webhook_attempt_at": "{moment} \u306b\u8a66\u884c",
        "logs": "\u30ed\u30b0",
        "response": "\u30ec\u30b9\u30dd\u30f3\u30b9",
        "visit_webhook_url": "Webhook\u306eURL\u3092\u958b\u304f",
-        "reset_webhook_secret": "Webhook \u306e\u30b7\u30fc\u30af\u30ec\u30c3\u30c8\u3092\u30ea\u30bb\u30c3\u30c8"
+        "reset_webhook_secret": "Webhook\u306e\u30b7\u30fc\u30af\u30ec\u30c3\u30c8\u3092\u30ea\u30bb\u30c3\u30c8"
    },
    "form": {
        "url": "URL",
@ -152,6 +152,6 @@
    },
    "config": {
        "html_language": "ja",
-        "date_time_fns": "MMMM do, yyyy @ HH:mm:ss"
+        "date_time_fns": "yyyy\u5e74MMMM\u6708do\u65e5 HH:mm:ss"
    }
 }
--- a/resources/assets/js/locales/nn.json
+++ b/resources/assets/js/locales/nn.json
@ -4,7 +4,7 @@
        "flash_error": "Feil!",
        "flash_success": "Suksess!",
        "close": "Lukk",
-        "split_transaction_title": "Beskrivelse av den splittende transaksjon",
+        "split_transaction_title": "Beskrivinga av den splitta transaksjonen",
        "errors_submission": "Noe gikk galt med innleveringen. Vennligst sjekk ut feilene.",
        "split": "Del opp",
        "single_split": "Del opp",
@ -34,7 +34,7 @@
        "no_bill": "(ingen rekning)",
        "category": "Kategori",
        "attachments": "Vedlegg",
-        "notes": "Notater",
+        "notes": "Notat",
        "external_url": "Ekstern URL",
        "update_transaction": "Oppdater transaksjonen",
        "after_update_create_another": "G\u00e5 tilbake hit etter oppdatering, for \u00e5 fortsetja \u00e5 redigera.",
@ -42,7 +42,7 @@
        "split_title_help": "Om du oppretter ein splittet transaksjon, m\u00e5 du ha ein global beskriving for alle deler av transaksjonen.",
        "none_in_select_list": "(ingen)",
        "no_piggy_bank": "(ingen sparegriser)",
-        "description": "Beskrivelse",
+        "description": "Beskriving",
        "split_transaction_title_help": "Om du oppretter ein splittet transaksjon, m\u00e5 du ha ein hoved beskriving for alle deler av transaksjonen.",
        "destination_account_reconciliation": "Du kan ikkje redigera kildekontoen for ein avstemmingstransaksjon.",
        "source_account_reconciliation": "Du kan ikkje redigera kildekontoen for ein avstemmingstransaksjon.",
--- a/resources/lang/ja_JP/breadcrumbs.php
+++ b/resources/lang/ja_JP/breadcrumbs.php
@ -56,8 +56,8 @@ return [
    'change_email'     => 'メールアドレスを変更する',
    'bills'            => '請求',
    'newBill'          => '新しい請求',
-    'edit_bill'        => '請求書 ":name" を編集する',
-    'delete_bill'      => '請求書 ":name" を削除する',
+    'edit_bill'        => '請求「:name」を編集する',
+    'delete_bill'      => '請求「:name」を削除する',
    'reports'          => 'レポート',
    'search_result'    => '":query" の検索結果',
    'withdrawal_list'  => '支出',
--- a/resources/lang/ja_JP/config.php
+++ b/resources/lang/ja_JP/config.php
@ -46,7 +46,7 @@ return [
    'month_and_day_js'         => 'YYYY年MM月DD日',

    //'month_and_date_day'      => '%A %B %e, %Y',
-    'month_and_date_day_js'    => 'YYYY年M月D日 ddd',
+    'month_and_date_day_js'    => 'YYYY年M月D日 dddd',

    //'month_and_day_no_year'   => '%B %e',
    'month_and_day_no_year_js' => 'M月D日',
@ -65,14 +65,14 @@ return [

    //'date_time'               => '%B %e, %Y, @ %T',
    'date_time_js'             => 'YYYY年MM月DD日 HH:mm:ss',
-    'date_time_fns'            => 'MMMM do, yyyy @ HH:mm:ss',
+    'date_time_fns'            => 'yyyy年MMMM月do日 HH:mm:ss',

    //'specific_day'            => '%e %B %Y',
    'specific_day_js'          => 'YYYY年MM月D日',

    //'week_in_year'            => 'Week %V, %G',
-    'week_in_year_js'          => '[Week] W, GGGG',
-    'week_in_year_fns'         => "'Week' w, yyyy",
+    'week_in_year_js'          => 'GGGG年W週',
+    'week_in_year_fns'         => "yyyy年w週",

    //'year'                    => '%Y',
    'year_js'                  => 'YYYY年',
@ -81,7 +81,7 @@ return [
    'half_year_js'             => 'YYYY年第Q四半期',

    'quarter_fns'   => "yyyy年第Q四半期",
-    'half_year_fns' => "yyyy年H[半期]",
+    'half_year_fns' => "yyyy年H半期",
    'dow_1'         => '月曜日',
    'dow_2'         => '火曜日',
    'dow_3'         => '水曜日',
--- a/resources/lang/ja_JP/firefly.php
+++ b/resources/lang/ja_JP/firefly.php
@ -149,7 +149,7 @@ return [
    'source_account'                       => '支出元口座',
    'source_account_reconciliation'        => '支出元口座の取引照合を編集することはできません。',
    'destination_account'                  => '送金先の口座',
-    'destination_account_reconciliation'   => '宛先口座の取引照合を編集することはできません。',
+    'destination_account_reconciliation'   => '預け入れ口座の取引照合を編集することはできません。',
    'sum_of_expenses_in_budget'            => '予算":budget"の合計支出',
    'left_in_budget_limit'                 => '予算による支出残高',
    'current_period'                       => '現在の期間',
@ -241,7 +241,7 @@ return [
    'here_be_dragons'                      => 'Hic sunt dracones',

    // Webhooks
-    'webhooks'                             => 'Webhooks',
+    'webhooks'                             => 'Webhook',
    'webhooks_breadcrumb'                  => 'Webhook',
    'no_webhook_messages'                  => 'Webhookメッセージはありません',
    'webhook_trigger_STORE_TRANSACTION'    => '取引作成後',
@ -254,31 +254,31 @@ return [
    'inspect'                              => '詳細確認',
    'create_new_webhook'                   => 'Webhookを作成',
    'webhooks_create_breadcrumb'           => 'Webhookを作成',
-    'webhook_trigger_form_help'            => 'Webhookがトリガーするイベントを示します',
-    'webhook_response_form_help'           => 'WebhookがURLに何を送信するのかを示します。',
-    'webhook_delivery_form_help'           => 'Webhookがどのフォーマットでデータを配信するか',
+    'webhook_trigger_form_help'            => 'Webhookがトリガーするイベントです',
+    'webhook_response_form_help'           => 'WebhookがURLに送信するものです。',
+    'webhook_delivery_form_help'           => 'Webhookがデータを配信するフォーマットです。',
    'webhook_active_form_help'             => 'Webhookは有効である必要があります。でなければ呼び出されません。',
    'stored_new_webhook'                   => 'Webhook「:title」が保存されました',
-    'delete_webhook'                       => 'Webhook を削除する',
+    'delete_webhook'                       => 'Webhookを削除する',
    'deleted_webhook'                      => 'Webhook「:title」が削除されました',
    'edit_webhook'                         => 'Webhook「:title」を編集',
    'updated_webhook'                      => 'Webhook「:title」が更新されました',
    'edit_webhook_js'                      => 'Webhook「{title}」を編集',
    'show_webhook'                         => 'Webhook「:title」',
    'webhook_was_triggered'                => '指定された取引でWebhookがトリガーされました。結果が表示されるまでお待ちください。',
-    'webhook_messages'                     => 'Webhook メッセージ',
+    'webhook_messages'                     => 'Webhookメッセージ',
    'view_message'                         => 'メッセージを見る',
    'view_attempts'                        => '失敗した試行の表示',
-    'message_content_title'                => 'Webhook メッセージの内容',
+    'message_content_title'                => 'Webhookメッセージの内容',
    'message_content_help'                 => 'このWebhookを使用して送信（または送信試行）されたメッセージの内容です。',
-    'attempt_content_title'                => 'Webhook の試行',
+    'attempt_content_title'                => 'Webhookの試行',
    'attempt_content_help'                 => '設定されたURLに送信するWebhookメッセージの試みはすべて失敗しました。しばらくするとFirefly IIIは試行を停止します。',
    'no_attempts'                          => '失敗した試行はありません。これは良いことです！',
    'webhook_attempt_at'                   => '{moment} に試行',
    'logs'                                 => 'ログ',
    'response'                             => 'レスポンス',
    'visit_webhook_url'                    => 'WebhookのURLを開く',
-    'reset_webhook_secret'                 => 'Webhook のシークレットをリセット',
+    'reset_webhook_secret'                 => 'Webhookのシークレットをリセット',
    'webhook_stored_link'                  => '<a href="webhooks/show/{ID}">Webhook #{ID} ("{title}")</a> が保存されました。',
    'webhook_updated_link'                 => '<a href="webhooks/show/{ID}">Webhook #{ID} ("{title}")</a> が更新されました。',

@ -296,7 +296,7 @@ return [
    'unpaid_in_currency'                   => ':currency で未払い',
    'is_alpha_warning'                     => 'あなたはアルファバージョンを使用しています。バグや問題に注意してください。',
    'is_beta_warning'                      => 'あなたはベータバージョンを使用しています。バグや問題に注意してください。',
-    'all_destination_accounts'             => '宛先口座',
+    'all_destination_accounts'             => '預け入れ口座',
    'all_source_accounts'                  => '支出元口座',
    'back_to_index'                        => 'インデックスに戻る',
    'cant_logout_guard'                    => 'Firefly III からログアウトできません。',
@ -435,30 +435,30 @@ return [
    'search_modifier_not_source_account_nr_starts'        => '引き出し口座番号（IBAN）が「:value」で始まらない',
    'search_modifier_source_account_nr_ends'              => '引き出し口座番号（IBAN）が「:value」で終わる',
    'search_modifier_not_source_account_nr_ends'          => '引き出し口座番号（IBAN）が「:value」で終わらない',
-    'search_modifier_destination_account_is'              => '宛先口座名が「:value」と一致する',
-    'search_modifier_not_destination_account_is'          => '宛先口座名が「:value」ではない',
-    'search_modifier_destination_account_contains'        => '宛先口座名が「:value」を含む',
-    'search_modifier_not_destination_account_contains'    => '宛先口座名が「:value」を含まない',
-    'search_modifier_destination_account_starts'          => '宛先口座名が「:value」で始まる',
-    'search_modifier_not_destination_account_starts'      => '宛先口座名が「:value」で始まらない',
-    'search_modifier_destination_account_ends'            => '宛先口座名が「:value」で終わる',
-    'search_modifier_not_destination_account_ends'        => '宛先口座名が「:value」で終わらない',
-    'search_modifier_destination_account_id'              => '宛先口座IDが「:value」',
-    'search_modifier_not_destination_account_id'          => '宛先口座IDが「:value」ではない',
-    'search_modifier_destination_is_cash'                 => '宛先口座が現金口座',
-    'search_modifier_not_destination_is_cash'             => '宛先口座が現金口座ではない',
+    'search_modifier_destination_account_is'              => '預け入れ口座名が「:value」と一致する',
+    'search_modifier_not_destination_account_is'          => '預け入れ口座名が「:value」ではない',
+    'search_modifier_destination_account_contains'        => '預け入れ口座名が「:value」を含む',
+    'search_modifier_not_destination_account_contains'    => '預け入れ口座名が「:value」を含まない',
+    'search_modifier_destination_account_starts'          => '預け入れ口座名が「:value」で始まる',
+    'search_modifier_not_destination_account_starts'      => '預け入れ口座名が「:value」で始まらない',
+    'search_modifier_destination_account_ends'            => '預け入れ口座名が「:value」で終わる',
+    'search_modifier_not_destination_account_ends'        => '預け入れ口座名が「:value」で終わらない',
+    'search_modifier_destination_account_id'              => '預け入れ口座IDが「:value」',
+    'search_modifier_not_destination_account_id'          => '預け入れ口座IDが「:value」ではない',
+    'search_modifier_destination_is_cash'                 => '預け入れ口座が現金口座',
+    'search_modifier_not_destination_is_cash'             => '預け入れ口座が現金口座ではない',
    'search_modifier_source_is_cash'                      => '引き出し口座が現金口座',
    'search_modifier_not_source_is_cash'                  => '引き出し口座が現金口座ではない',
-    'search_modifier_destination_account_nr_is'           => '宛先口座番号（IBAN）が「:value」',
-    'search_modifier_not_destination_account_nr_is'       => '宛先口座番号（IBAN）が「:value」',
-    'search_modifier_destination_account_nr_contains'     => '宛先口座番号（IBAN）が「:value」を含む',
-    'search_modifier_not_destination_account_nr_contains' => '宛先口座番号（IBAN）が「:value」を含まない',
-    'search_modifier_destination_account_nr_starts'       => '宛先口座番号（IBAN）が「:value」で始まる',
-    'search_modifier_not_destination_account_nr_starts'   => '宛先口座番号（IBAN）が「:value」で始まらない',
-    'search_modifier_destination_account_nr_ends'         => '宛先口座番号（IBAN）が「:value」で終わる',
-    'search_modifier_not_destination_account_nr_ends'     => '宛先口座番号（IBAN）が「:value」で終わらない',
-    'search_modifier_account_id'                          => '引き出し口座または宛先口座IDが「:value」',
-    'search_modifier_not_account_id'                      => '引き出し口座または宛先口座IDが「:value」ではない',
+    'search_modifier_destination_account_nr_is'           => '預け入れ口座番号（IBAN）が「:value」',
+    'search_modifier_not_destination_account_nr_is'       => '預け入れ口座番号（IBAN）が「:value」',
+    'search_modifier_destination_account_nr_contains'     => '預け入れ口座番号（IBAN）が「:value」を含む',
+    'search_modifier_not_destination_account_nr_contains' => '預け入れ口座番号（IBAN）が「:value」を含まない',
+    'search_modifier_destination_account_nr_starts'       => '預け入れ口座番号（IBAN）が「:value」で始まる',
+    'search_modifier_not_destination_account_nr_starts'   => '預け入れ口座番号（IBAN）が「:value」で始まらない',
+    'search_modifier_destination_account_nr_ends'         => '預け入れ口座番号（IBAN）が「:value」で終わる',
+    'search_modifier_not_destination_account_nr_ends'     => '預け入れ口座番号（IBAN）が「:value」で終わらない',
+    'search_modifier_account_id'                          => '引き出し口座または預け入れ口座IDが「:value」',
+    'search_modifier_not_account_id'                      => '引き出し口座または預け入れ口座IDが「:value」ではない',
    'search_modifier_category_is'                         => 'カテゴリが「:value」',
    'search_modifier_not_category_is'                     => 'カテゴリが「:value」ではない',
    'search_modifier_budget_is'                           => '予算名が「:value」',
@ -588,9 +588,9 @@ return [
    'search_modifier_process_date_on_year'                => '取引処理日が「:value」',
    'search_modifier_process_date_on_month'               => '取引処理日が「:value」',
    'search_modifier_process_date_on_day'                 => '取引処理日が「:value」',
-    'search_modifier_not_process_date_on_year'            => 'Transaction process date is not in year ":value"',
-    'search_modifier_not_process_date_on_month'           => 'Transaction process date is not in month ":value"',
-    'search_modifier_not_process_date_on_day'             => 'Transaction process date is not on day of month ":value"',
+    'search_modifier_not_process_date_on_year'            => '取引処理日が「:value」年ではない',
+    'search_modifier_not_process_date_on_month'           => '取引処理日が「:value」月ではない',
+    'search_modifier_not_process_date_on_day'             => '取引処理日が「:value」日ではない',
    'search_modifier_process_date_before_year'            => '取引処理日が「:value」以前',
    'search_modifier_process_date_before_month'           => '取引処理日が「:value」以前',
    'search_modifier_process_date_before_day'             => '取引処理日が「:value」以前',
@ -600,9 +600,9 @@ return [
    'search_modifier_due_date_on_year'                    => '「:value」が期限の取引',
    'search_modifier_due_date_on_month'                   => '「:value」が期限の取引',
    'search_modifier_due_date_on_day'                     => '「:value」が期限の取引',
-    'search_modifier_not_due_date_on_year'                => 'Transaction due date is not in year ":value"',
-    'search_modifier_not_due_date_on_month'               => 'Transaction due date is not in month ":value"',
-    'search_modifier_not_due_date_on_day'                 => 'Transaction due date is not on day of month ":value"',
+    'search_modifier_not_due_date_on_year'                => '支払期日が「:value」年ではない',
+    'search_modifier_not_due_date_on_month'               => '支払期日が「:value」月ではない',
+    'search_modifier_not_due_date_on_day'                 => '支払期日が「:value」日ではない',
    'search_modifier_due_date_before_year'                => '「:value」以前が期限の取引',
    'search_modifier_due_date_before_month'               => '「:value」以前が期限の取引',
    'search_modifier_due_date_before_day'                 => '「:value」以前が期限の取引',
@ -612,9 +612,9 @@ return [
    'search_modifier_payment_date_on_year'                => '引き落とし日が「:value」',
    'search_modifier_payment_date_on_month'               => '引き落とし日が「:value」',
    'search_modifier_payment_date_on_day'                 => '引き落とし日が「:value」',
-    'search_modifier_not_payment_date_on_year'            => 'Transaction payment date is not in year ":value"',
-    'search_modifier_not_payment_date_on_month'           => 'Transaction payment date is not in month ":value"',
-    'search_modifier_not_payment_date_on_day'             => 'Transaction payment date is not on day of month ":value"',
+    'search_modifier_not_payment_date_on_year'            => '支払日が「:value」年ではない',
+    'search_modifier_not_payment_date_on_month'           => '支払日が「:value」月ではない',
+    'search_modifier_not_payment_date_on_day'             => '支払日が「:value」日ではない',
    'search_modifier_payment_date_before_year'            => '引き落とし日が「:value」以前',
    'search_modifier_payment_date_before_month'           => '引き落とし日が「:value」以前',
    'search_modifier_payment_date_before_day'             => '引き落とし日が「:value」以前',
@ -624,9 +624,9 @@ return [
    'search_modifier_invoice_date_on_year'                => '請求日が「:value」内',
    'search_modifier_invoice_date_on_month'               => '請求日が「:value」内',
    'search_modifier_invoice_date_on_day'                 => '請求日が「:value」',
-    'search_modifier_not_invoice_date_on_year'            => 'Transaction invoice date is not in year ":value"',
-    'search_modifier_not_invoice_date_on_month'           => 'Transaction invoice date is not in month ":value"',
-    'search_modifier_not_invoice_date_on_day'             => 'Transaction invoice date is not on day of month ":value"',
+    'search_modifier_not_invoice_date_on_year'            => '請求日が「:value」年ではない',
+    'search_modifier_not_invoice_date_on_month'           => '請求日が「:value」月ではない',
+    'search_modifier_not_invoice_date_on_day'             => '請求日が「:value」日ではない',
    'search_modifier_invoice_date_before_year'            => '請求日が「:value」以前',
    'search_modifier_invoice_date_before_month'           => '請求日が「:value」以前',
    'search_modifier_invoice_date_before_day'             => '請求日が「:value」以前',
@ -637,9 +637,9 @@ return [
    'search_modifier_updated_at_on_year'                  => '取引の最終更新が「:value」',
    'search_modifier_updated_at_on_month'                 => '取引の最終更新が「:value」',
    'search_modifier_updated_at_on_day'                   => '取引の最終更新が「:value」',
-    'search_modifier_not_updated_at_on_year'              => 'Transaction was not last updated in year ":value"',
-    'search_modifier_not_updated_at_on_month'             => 'Transaction was not last updated in month ":value"',
-    'search_modifier_not_updated_at_on_day'               => 'Transaction was not last updated on day of month ":value"',
+    'search_modifier_not_updated_at_on_year'              => '取引の最終更新が「:value」年ではない',
+    'search_modifier_not_updated_at_on_month'             => '取引の最終更新が「:value」月ではない',
+    'search_modifier_not_updated_at_on_day'               => '取引の最終更新が「:value」日ではない',
    'search_modifier_updated_at_before_year'              => '取引の最終更新が「:value」以前',
    'search_modifier_updated_at_before_month'             => '取引の最終更新が「:value」以前',
    'search_modifier_updated_at_before_day'               => '取引の最終更新が「:value」以前',
@ -649,9 +649,9 @@ return [
    'search_modifier_created_at_on_year'                  => '取引の作成が「:value」',
    'search_modifier_created_at_on_month'                 => '取引の作成が「:value」',
    'search_modifier_created_at_on_day'                   => '取引の作成が「:value」',
-    'search_modifier_not_created_at_on_year'              => 'Transaction was not created in year ":value"',
-    'search_modifier_not_created_at_on_month'             => 'Transaction was not created in month ":value"',
-    'search_modifier_not_created_at_on_day'               => 'Transaction was not created on day of month ":value"',
+    'search_modifier_not_created_at_on_year'              => '取引の作成が「:value」年ではない',
+    'search_modifier_not_created_at_on_month'             => '取引の作成が「:value」月ではない',
+    'search_modifier_not_created_at_on_day'               => '取引の作成が「:value」日ではない',
    'search_modifier_created_at_before_year'              => '取引の作成が「:value」以前',
    'search_modifier_created_at_before_month'             => '取引の作成が「:value」以前',
    'search_modifier_created_at_before_day'               => '取引の最終更新が「:value」以前',
@ -661,31 +661,31 @@ return [
    'search_modifier_interest_date_before'                => '利息日が「:value」以前',
    'search_modifier_interest_date_after'                 => '利息日が「:value」以降',
    'search_modifier_book_date_on'                        => '記帳日が「:value」',
-    'search_modifier_not_book_date_on'                    => 'Transaction book date is not on ":value"',
+    'search_modifier_not_book_date_on'                    => '記帳日が「:value」ではない',
    'search_modifier_book_date_before'                    => '記帳日が「:value」以前',
    'search_modifier_book_date_after'                     => '記帳日が「:value」以降',
-    'search_modifier_process_date_on'                     => 'Transaction process date is on ":value"',
-    'search_modifier_not_process_date_on'                 => 'Transaction process date is not on ":value"',
-    'search_modifier_process_date_before'                 => 'Transaction process date is on or before ":value"',
-    'search_modifier_process_date_after'                  => 'Transaction process date is on or after ":value"',
-    'search_modifier_due_date_on'                         => 'Transaction due date is on ":value"',
-    'search_modifier_not_due_date_on'                     => 'Transaction due date is not on ":value"',
-    'search_modifier_due_date_before'                     => 'Transaction due date is on or before ":value"',
-    'search_modifier_due_date_after'                      => 'Transaction due date is on or after ":value"',
-    'search_modifier_payment_date_on'                     => 'Transaction payment date is on ":value"',
-    'search_modifier_not_payment_date_on'                 => 'Transaction payment date is not on ":value"',
-    'search_modifier_payment_date_before'                 => 'Transaction payment date is on or before ":value"',
-    'search_modifier_payment_date_after'                  => 'Transaction payment date is on or after ":value"',
-    'search_modifier_invoice_date_on'                     => 'Transaction invoice date is on ":value"',
-    'search_modifier_not_invoice_date_on'                 => 'Transaction invoice date is not on ":value"',
-    'search_modifier_invoice_date_before'                 => 'Transaction invoice date is on or before ":value"',
-    'search_modifier_invoice_date_after'                  => 'Transaction invoice date is on or after ":value"',
+    'search_modifier_process_date_on'                     => '取引処理日が「:value」',
+    'search_modifier_not_process_date_on'                 => '取引処理日が「:value」 ではない',
+    'search_modifier_process_date_before'                 => '取引処理日が「:value」以前',
+    'search_modifier_process_date_after'                  => '取引処理日が「:value」以降',
+    'search_modifier_due_date_on'                         => '取引期限が「:value」',
+    'search_modifier_not_due_date_on'                     => '取引期限が「:value」ではない',
+    'search_modifier_due_date_before'                     => '取引期限が「:value」以前',
+    'search_modifier_due_date_after'                      => '取引期限が「:value」以降',
+    'search_modifier_payment_date_on'                     => '支払日が「:value」',
+    'search_modifier_not_payment_date_on'                 => '支払日が「:value」ではない',
+    'search_modifier_payment_date_before'                 => '支払日が「:value」以前',
+    'search_modifier_payment_date_after'                  => '支払日が「:value」以降',
+    'search_modifier_invoice_date_on'                     => '請求日が「:value」',
+    'search_modifier_not_invoice_date_on'                 => '請求日が「:value」ではない',
+    'search_modifier_invoice_date_before'                 => '請求日が「:value」以前',
+    'search_modifier_invoice_date_after'                  => '請求日が「:value」以降',
    'search_modifier_created_at_on'                       => '「:value」に作成された取引',
-    'search_modifier_not_created_at_on'                   => 'Transaction was not created on ":value"',
+    'search_modifier_not_created_at_on'                   => '取引作成が「:value」ではない',
    'search_modifier_created_at_before'                   => '「:value」以前に作成された取引',
    'search_modifier_created_at_after'                    => '「:value」以降に作成された取引',
    'search_modifier_updated_at_on'                       => '取引が「:value」に更新',
-    'search_modifier_not_updated_at_on'                   => 'Transaction was not updated on ":value"',
+    'search_modifier_not_updated_at_on'                   => '取引更新が「:value」ではない',
    'search_modifier_updated_at_before'                   => '取引が「:value」以前に更新',
    'search_modifier_updated_at_after'                    => '取引が「:value」以降に更新',

@ -696,15 +696,15 @@ return [
    'search_modifier_attachment_notes_are'                => 'いずれかの添付ファイルの備考が「:value」',
    'search_modifier_attachment_notes_contains'           => 'いずれかの添付ファイルの備考が「:value」を含む',
    'search_modifier_attachment_notes_starts'             => 'いずれかの添付ファイルの備考が「:value」で始まる',
-    'search_modifier_attachment_notes_ends'               => 'Any attachment\'s notes end with ":value"',
-    'search_modifier_not_attachment_name_is'              => 'Any attachment\'s name is not ":value"',
-    'search_modifier_not_attachment_name_contains'        => 'Any attachment\'s name does not contain ":value"',
-    'search_modifier_not_attachment_name_starts'          => 'Any attachment\'s name does not start with ":value"',
-    'search_modifier_not_attachment_name_ends'            => 'Any attachment\'s name does not end with ":value"',
-    'search_modifier_not_attachment_notes_are'            => 'Any attachment\'s notes are not ":value"',
-    'search_modifier_not_attachment_notes_contains'       => 'Any attachment\'s notes do not contain ":value"',
-    'search_modifier_not_attachment_notes_starts'         => 'Any attachment\'s notes start with ":value"',
-    'search_modifier_not_attachment_notes_ends'           => 'Any attachment\'s notes do not end with ":value"',
+    'search_modifier_attachment_notes_ends'               => 'いずれかの添付ファイルの備考が「:value」で終わる',
+    'search_modifier_not_attachment_name_is'              => '添付ファイル名が「:value」ではない',
+    'search_modifier_not_attachment_name_contains'        => '添付ファイル名が「:value」を含まない',
+    'search_modifier_not_attachment_name_starts'          => '添付ファイル名が「:value」で始まらない',
+    'search_modifier_not_attachment_name_ends'            => '添付ファイル名が「:value」で終わらない',
+    'search_modifier_not_attachment_notes_are'            => '添付ファイルの備考が「:value」ではない',
+    'search_modifier_not_attachment_notes_contains'       => '添付ファイルの備考が「:value」を含まない',
+    'search_modifier_not_attachment_notes_starts'         => '添付ファイルの備考が「:value」で始まらない',
+    'search_modifier_not_attachment_notes_ends'           => '添付ファイルの備考が「:value」で終わらない',
    'search_modifier_sepa_ct_is'                          => 'SEPA CTが「:value」',
    'update_rule_from_query'                              => '検索クエリからルール「:rule」を更新',
    'create_rule_from_query'                              => '検索クエリから新しいルールを作成',
@ -828,14 +828,14 @@ return [
    '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_destination_account_id_choice'          => '預け入れ口座IDが…',
+    'rule_trigger_destination_account_id'                 => '預け入れ口座IDが「:trigger_value」',
    'rule_trigger_account_is_cash_choice'                 => 'どちらかの口座が現金',
    'rule_trigger_account_is_cash'                        => 'どちらかの口座が現金',
-    'rule_trigger_source_is_cash_choice'                  => '宛先口座が現金口座',
+    'rule_trigger_source_is_cash_choice'                  => '預け入れ口座が現金口座',
    'rule_trigger_source_is_cash'                         => '引き出し口座が現金口座',
-    'rule_trigger_destination_is_cash_choice'             => '宛先口座が現金口座',
-    'rule_trigger_destination_is_cash'                    => '宛先口座が現金口座',
+    'rule_trigger_destination_is_cash_choice'             => '預け入れ口座が現金口座',
+    'rule_trigger_destination_is_cash'                    => '預け入れ口座が現金口座',
    'rule_trigger_source_account_nr_starts_choice'        => '引き出し口座番号/IBANが…で始まる',
    'rule_trigger_source_account_nr_starts'               => '出金元口座番号/IBANが「:trigger_value」で始まる',
    'rule_trigger_source_account_nr_ends_choice'          => '引き出し口座番号/IBANが…で終わる',
@ -844,22 +844,22 @@ return [
    'rule_trigger_source_account_nr_is'                   => '引き出し口座番号/IBANが「:trigger_value」',
    'rule_trigger_source_account_nr_contains_choice'      => '引き出し口座番号/IBANが…を含む',
    'rule_trigger_source_account_nr_contains'             => '引き出し口座番号/IBANが「:trigger_value」を含む',
-    'rule_trigger_destination_account_starts_choice'      => '宛先口座名が...で始まる',
-    'rule_trigger_destination_account_starts'             => '宛先口座名が「:trigger_value」で始まる',
-    'rule_trigger_destination_account_ends_choice'        => '宛先口座名が...で終わる',
-    'rule_trigger_destination_account_ends'               => '宛先口座名が「:trigger_value」で終わる',
-    'rule_trigger_destination_account_is_choice'          => '宛先口座名が…',
-    'rule_trigger_destination_account_is'                 => '宛先口座名が「:trigger_value」',
-    'rule_trigger_destination_account_contains_choice'    => '宛先口座名が...を含む',
-    'rule_trigger_destination_account_contains'           => '宛先口座名が「:trigger_value」を含む',
-    'rule_trigger_destination_account_nr_starts_choice'   => '宛先口座番号/IBANが...で始まる',
-    'rule_trigger_destination_account_nr_starts'          => '宛先口座番号/IBANが「:trigger_value」で始まる',
-    'rule_trigger_destination_account_nr_ends_choice'     => '宛先口座番号/IBANが...で終わる',
+    'rule_trigger_destination_account_starts_choice'      => '預け入れ口座名が...で始まる',
+    'rule_trigger_destination_account_starts'             => '預け入れ口座名が「:trigger_value」で始まる',
+    'rule_trigger_destination_account_ends_choice'        => '預け入れ口座名が...で終わる',
+    'rule_trigger_destination_account_ends'               => '預け入れ口座名が「:trigger_value」で終わる',
+    'rule_trigger_destination_account_is_choice'          => '預け入れ口座名が…',
+    'rule_trigger_destination_account_is'                 => '預け入れ口座名が「:trigger_value」',
+    'rule_trigger_destination_account_contains_choice'    => '預け入れ口座名が...を含む',
+    'rule_trigger_destination_account_contains'           => '預け入れ口座名が「:trigger_value」を含む',
+    'rule_trigger_destination_account_nr_starts_choice'   => '預け入れ口座番号/IBANが...で始まる',
+    'rule_trigger_destination_account_nr_starts'          => '預け入れ口座番号/IBANが「:trigger_value」で始まる',
+    'rule_trigger_destination_account_nr_ends_choice'     => '預け入れ口座番号/IBANが...で終わる',
    'rule_trigger_destination_account_nr_ends'            => '引き出し口座番号/IBANが「:trigger_value」で終わる',
-    'rule_trigger_destination_account_nr_is_choice'       => '宛先口座番号/IBANが…',
+    'rule_trigger_destination_account_nr_is_choice'       => '預け入れ口座番号/IBANが…',
    'rule_trigger_destination_account_nr_is'              => '引き出し口座番号/IBANが「:trigger_value」',
-    'rule_trigger_destination_account_nr_contains_choice' => '宛先口座番号/IBANが...を含む',
-    'rule_trigger_destination_account_nr_contains'        => '宛先口座番号/IBANが「:trigger_value」を含む',
+    'rule_trigger_destination_account_nr_contains_choice' => '預け入れ口座番号/IBANが...を含む',
+    'rule_trigger_destination_account_nr_contains'        => '預け入れ口座番号/IBANが「:trigger_value」を含む',
    'rule_trigger_transaction_type_choice'                => '取引種別が…',
    'rule_trigger_transaction_type'                       => '取引種別が「:trigger_value」',
    'rule_trigger_category_is_choice'                     => 'カテゴリが…',
@ -1071,120 +1071,120 @@ return [
    'rule_trigger_attachment_notes_starts'                => 'いずれかの添付ファイル備考が「:trigger_value」で始まる',
    'rule_trigger_attachment_notes_ends_choice'           => 'いずれかの添付ファイル備考が…で終わる',
    'rule_trigger_attachment_notes_ends'                  => 'いずれかの添付ファイル備考が「:trigger_value」で終わる',
-    'rule_trigger_reconciled_choice'                      => 'Transaction is reconciled',
-    'rule_trigger_reconciled'                             => 'Transaction is reconciled',
+    'rule_trigger_reconciled_choice'                      => '照合済みの取引',
+    'rule_trigger_reconciled'                             => '照合済みの取引',
    'rule_trigger_exists_choice'                          => 'すべてのトランザクションが一致(!)',
-    'rule_trigger_exists'                                 => 'Any transaction matches',
+    'rule_trigger_exists'                                 => 'すべての取引が一致',

    // more values for new types:
-    'rule_trigger_not_account_id'                         => 'Account ID is not ":trigger_value"',
-    'rule_trigger_not_source_account_id'                  => 'Source account ID is not ":trigger_value"',
-    'rule_trigger_not_destination_account_id'             => 'Destination account ID is not ":trigger_value"',
-    'rule_trigger_not_transaction_type'                   => 'Transaction type is not ":trigger_value"',
+    'rule_trigger_not_account_id'                         => '口座IDが「:trigger_value」ではない',
+    'rule_trigger_not_source_account_id'                  => '引き出し口座IDが「:trigger_value」ではない',
+    'rule_trigger_not_destination_account_id'             => '預け入れ口座IDが「:trigger_value」ではない',
+    'rule_trigger_not_transaction_type'                   => '取引種別が「:trigger_value」ではない',
    'rule_trigger_not_tag_is'                             => 'タグが「:trigger_value」ではない',
    'rule_trigger_not_tag_is_not'                         => 'タグが「:trigger_value」',
-    'rule_trigger_not_description_is'                     => 'Description is not ":trigger_value"',
-    'rule_trigger_not_description_contains'               => 'Description does not contain',
-    'rule_trigger_not_description_ends'                   => 'Description does not end with ":trigger_value"',
-    'rule_trigger_not_description_starts'                 => 'Description does not start with ":trigger_value"',
-    'rule_trigger_not_notes_is'                           => 'Notes are not ":trigger_value"',
-    'rule_trigger_not_notes_contains'                     => 'Notes do not contain ":trigger_value"',
-    'rule_trigger_not_notes_ends'                         => 'Notes do not end on ":trigger_value"',
-    'rule_trigger_not_notes_starts'                       => 'Notes do not start with ":trigger_value"',
-    'rule_trigger_not_source_account_is'                  => 'Source account is not ":trigger_value"',
-    'rule_trigger_not_source_account_contains'            => 'Source account does not contain ":trigger_value"',
-    'rule_trigger_not_source_account_ends'                => 'Source account does not end on ":trigger_value"',
-    'rule_trigger_not_source_account_starts'              => 'Source account does not start with ":trigger_value"',
-    'rule_trigger_not_source_account_nr_is'               => 'Source account number / IBAN is not ":trigger_value"',
-    'rule_trigger_not_source_account_nr_contains'         => 'Source account number / IBAN does not contain ":trigger_value"',
-    'rule_trigger_not_source_account_nr_ends'             => 'Source account number / IBAN does not end on ":trigger_value"',
-    'rule_trigger_not_source_account_nr_starts'           => 'Source account number / IBAN does not start with ":trigger_value"',
-    'rule_trigger_not_destination_account_is'             => 'Destination account is not ":trigger_value"',
-    'rule_trigger_not_destination_account_contains'       => 'Destination account does not contain ":trigger_value"',
-    'rule_trigger_not_destination_account_ends'           => 'Destination account does not end on ":trigger_value"',
-    'rule_trigger_not_destination_account_starts'         => 'Destination account does not start with ":trigger_value"',
-    'rule_trigger_not_destination_account_nr_is'          => 'Destination account number / IBAN is not ":trigger_value"',
-    'rule_trigger_not_destination_account_nr_contains'    => 'Destination account number / IBAN does not contain ":trigger_value"',
-    'rule_trigger_not_destination_account_nr_ends'        => 'Destination account number / IBAN does not end on ":trigger_value"',
-    'rule_trigger_not_destination_account_nr_starts'      => 'Destination account number / IBAN does not start with ":trigger_value"',
-    'rule_trigger_not_account_is'                         => 'Neither account is ":trigger_value"',
-    'rule_trigger_not_account_contains'                   => 'Neither account contains ":trigger_value"',
-    'rule_trigger_not_account_ends'                       => 'Neither account ends on ":trigger_value"',
-    'rule_trigger_not_account_starts'                     => 'Neither account starts with ":trigger_value"',
-    'rule_trigger_not_account_nr_is'                      => 'Neither account number / IBAN is ":trigger_value"',
-    'rule_trigger_not_account_nr_contains'                => 'Neither account number / IBAN contains ":trigger_value"',
-    'rule_trigger_not_account_nr_ends'                    => 'Neither account number / IBAN ends on ":trigger_value"',
-    'rule_trigger_not_account_nr_starts'                  => 'Neither account number / IBAN starts with ":trigger_value"',
-    'rule_trigger_not_category_is'                        => 'Category is not ":trigger_value"',
-    'rule_trigger_not_category_contains'                  => 'Category does not contain ":trigger_value"',
-    'rule_trigger_not_category_ends'                      => 'Category does not end on ":trigger_value"',
-    'rule_trigger_not_category_starts'                    => 'Category does not start with ":trigger_value"',
-    'rule_trigger_not_budget_is'                          => 'Budget is not ":trigger_value"',
-    'rule_trigger_not_budget_contains'                    => 'Budget does not contain ":trigger_value"',
-    'rule_trigger_not_budget_ends'                        => 'Budget does not end on ":trigger_value"',
-    'rule_trigger_not_budget_starts'                      => 'Budget does not start with ":trigger_value"',
-    'rule_trigger_not_bill_is'                            => 'Bill is not is ":trigger_value"',
-    'rule_trigger_not_bill_contains'                      => 'Bill does not contain ":trigger_value"',
-    'rule_trigger_not_bill_ends'                          => 'Bill does not end on ":trigger_value"',
-    'rule_trigger_not_bill_starts'                        => 'Bill does not end with ":trigger_value"',
-    'rule_trigger_not_external_id_is'                     => 'External ID is not ":trigger_value"',
-    'rule_trigger_not_external_id_contains'               => 'External ID does not contain ":trigger_value"',
-    'rule_trigger_not_external_id_ends'                   => 'External ID does not end on ":trigger_value"',
-    'rule_trigger_not_external_id_starts'                 => 'External ID does not start with ":trigger_value"',
-    'rule_trigger_not_internal_reference_is'              => 'Internal reference is not ":trigger_value"',
-    'rule_trigger_not_internal_reference_contains'        => 'Internal reference does not contain ":trigger_value"',
-    'rule_trigger_not_internal_reference_ends'            => 'Internal reference does not end on ":trigger_value"',
-    'rule_trigger_not_internal_reference_starts'          => 'Internal reference does not start with ":trigger_value"',
-    'rule_trigger_not_external_url_is'                    => 'External URL is not ":trigger_value"',
-    'rule_trigger_not_external_url_contains'              => 'External URL does not contain ":trigger_value"',
-    'rule_trigger_not_external_url_ends'                  => 'External URL does not end on ":trigger_value"',
-    'rule_trigger_not_external_url_starts'                => 'External URL does not start with ":trigger_value"',
-    'rule_trigger_not_currency_is'                        => 'Currency is not ":trigger_value"',
-    'rule_trigger_not_foreign_currency_is'                => 'Foreign currency is not ":trigger_value"',
-    'rule_trigger_not_id'                                 => 'Transaction ID is not ":trigger_value"',
-    'rule_trigger_not_journal_id'                         => 'Transaction journal ID is not ":trigger_value"',
-    'rule_trigger_not_recurrence_id'                      => 'Recurrence ID is not ":trigger_value"',
-    'rule_trigger_not_date_on'                            => 'Date is not on ":trigger_value"',
-    'rule_trigger_not_date_before'                        => 'Date is not before ":trigger_value"',
-    'rule_trigger_not_date_after'                         => 'Date is not after ":trigger_value"',
-    'rule_trigger_not_interest_date_on'                   => 'Interest date is not on ":trigger_value"',
-    'rule_trigger_not_interest_date_before'               => 'Interest date is not before ":trigger_value"',
-    'rule_trigger_not_interest_date_after'                => 'Interest date is not after ":trigger_value"',
-    'rule_trigger_not_book_date_on'                       => 'Book date is not on ":trigger_value"',
-    'rule_trigger_not_book_date_before'                   => 'Book date is not before ":trigger_value"',
-    'rule_trigger_not_book_date_after'                    => 'Book date is not after ":trigger_value"',
-    'rule_trigger_not_process_date_on'                    => 'Process date is not on ":trigger_value"',
-    'rule_trigger_not_process_date_before'                => 'Process date is not before ":trigger_value"',
-    'rule_trigger_not_process_date_after'                 => 'Process date is not after ":trigger_value"',
+    'rule_trigger_not_description_is'                     => '説明が「:trigger_value」ではない',
+    'rule_trigger_not_description_contains'               => '説明を含まない',
+    'rule_trigger_not_description_ends'                   => '説明が「:trigger_value」で終わらない',
+    'rule_trigger_not_description_starts'                 => '説明が「:trigger_value」で始まらない',
+    'rule_trigger_not_notes_is'                           => '備考が「:trigger_value」ではない',
+    'rule_trigger_not_notes_contains'                     => '備考に「:trigger_value」を含まない',
+    'rule_trigger_not_notes_ends'                         => '備考が「:trigger_value」で終わらない',
+    'rule_trigger_not_notes_starts'                       => '備考が「:trigger_value」で始まらない',
+    'rule_trigger_not_source_account_is'                  => '引き出し口座名が「:trigger_value」ではない',
+    'rule_trigger_not_source_account_contains'            => '引き出し口座名が「:trigger_value」を含まない',
+    'rule_trigger_not_source_account_ends'                => '引き出し口座名が「:trigger_value」で終わらない',
+    'rule_trigger_not_source_account_starts'              => '引き出し口座名が「:trigger_value」で始まらない',
+    'rule_trigger_not_source_account_nr_is'               => '引き出し口座番号/IBANが「:trigger_value」ではない',
+    'rule_trigger_not_source_account_nr_contains'         => '引き出し口座番号/IBANが「:trigger_value」を含まない',
+    'rule_trigger_not_source_account_nr_ends'             => '引き出し口座番号/IBANが「:trigger_value」で終わらない',
+    'rule_trigger_not_source_account_nr_starts'           => '引き出し口座番号/IBANが「:trigger_value」で始まらない',
+    'rule_trigger_not_destination_account_is'             => '預け入れ口座名が「:trigger_value」ではない',
+    'rule_trigger_not_destination_account_contains'       => '預け入れ口座名が「:trigger_value」を含まない',
+    'rule_trigger_not_destination_account_ends'           => '預け入れ口座名が「:trigger_value」で終わらない',
+    'rule_trigger_not_destination_account_starts'         => '預け入れ口座名が「:trigger_value」で始まらない',
+    'rule_trigger_not_destination_account_nr_is'          => '預け入れ口座番号/IBANが「:trigger_value」ではない',
+    'rule_trigger_not_destination_account_nr_contains'    => '預け入れ口座番号/IBANが「:trigger_value」を含まない',
+    'rule_trigger_not_destination_account_nr_ends'        => '預け入れ口座番号/IBANが「:trigger_value」で終わらない',
+    'rule_trigger_not_destination_account_nr_starts'      => '預け入れ口座番号/IBANが「:trigger_value」を始まらない',
+    'rule_trigger_not_account_is'                         => 'どちらの口座も「:trigger_value」ではない',
+    'rule_trigger_not_account_contains'                   => 'どちらの口座も「:trigger_value」を含まない',
+    'rule_trigger_not_account_ends'                       => 'どちらの口座も「:trigger_value」で終わらない',
+    'rule_trigger_not_account_starts'                     => 'どちらの口座も「:trigger_value」で始まらない',
+    'rule_trigger_not_account_nr_is'                      => 'どちらの口座番号/IBANも「:trigger_value」ではない',
+    'rule_trigger_not_account_nr_contains'                => 'どちらの口座番号/IBANも「:trigger_value」を含まない',
+    'rule_trigger_not_account_nr_ends'                    => 'どちらの口座番号/IBANも「:trigger_value」で終わらない',
+    'rule_trigger_not_account_nr_starts'                  => 'どちらの口座番号/IBANも「:trigger_value」で始まらない',
+    'rule_trigger_not_category_is'                        => 'カテゴリが「:trigger_value」ではない',
+    'rule_trigger_not_category_contains'                  => 'カテゴリが「:trigger_value」を含まない',
+    'rule_trigger_not_category_ends'                      => 'カテゴリが「:trigger_value」で終わらない',
+    'rule_trigger_not_category_starts'                    => 'カテゴリが「:trigger_value」で始まらない',
+    'rule_trigger_not_budget_is'                          => '予算名が「:trigger_value」ではない',
+    'rule_trigger_not_budget_contains'                    => '予算名に「:trigger_value」を含まない',
+    'rule_trigger_not_budget_ends'                        => '予算名が「:trigger_value」で終わらない',
+    'rule_trigger_not_budget_starts'                      => '予算名が「:trigger_value」で始まらない',
+    'rule_trigger_not_bill_is'                            => '請求名が「:trigger_value」ではない',
+    'rule_trigger_not_bill_contains'                      => '請求名に「:trigger_value」を含まない',
+    'rule_trigger_not_bill_ends'                          => '請求名が「:trigger_value」で終わらない',
+    'rule_trigger_not_bill_starts'                        => '請求名が「:trigger_value」で終わらない',
+    'rule_trigger_not_external_id_is'                     => '外部IDが「:trigger_value」ではない',
+    'rule_trigger_not_external_id_contains'               => '外部IDに「:trigger_value」を含まない',
+    'rule_trigger_not_external_id_ends'                   => '外部IDが「:trigger_value」で終わらない',
+    'rule_trigger_not_external_id_starts'                 => '外部IDが「:trigger_value」で始まらない',
+    'rule_trigger_not_internal_reference_is'              => '内部参照が「:trigger_value」ではない',
+    'rule_trigger_not_internal_reference_contains'        => '内部参照に「:trigger_value」を含まない',
+    'rule_trigger_not_internal_reference_ends'            => '内部参照が「:trigger_value」で終わらない',
+    'rule_trigger_not_internal_reference_starts'          => '内部参照が「:trigger_value」で始まらない',
+    'rule_trigger_not_external_url_is'                    => '外部URLが「:trigger_value」ではない',
+    'rule_trigger_not_external_url_contains'              => '外部URLに「:trigger_value」を含まない',
+    'rule_trigger_not_external_url_ends'                  => '外部URLが「:trigger_value」で終わらない',
+    'rule_trigger_not_external_url_starts'                => '外部URLが「:trigger_value」で始まらない',
+    'rule_trigger_not_currency_is'                        => '通貨が「:trigger_value」ではない',
+    'rule_trigger_not_foreign_currency_is'                => '外国通貨が「:trigger_value」ではない',
+    'rule_trigger_not_id'                                 => '取引IDが「:trigger_value」ではない',
+    'rule_trigger_not_journal_id'                         => '取引ジャーナルIDが「:trigger_value」ではない',
+    'rule_trigger_not_recurrence_id'                      => '繰り返しIDが「:trigger_value」ではない',
+    'rule_trigger_not_date_on'                            => '日付が「:trigger_value」ではない',
+    'rule_trigger_not_date_before'                        => '日付が「:trigger_value」より前ではない',
+    'rule_trigger_not_date_after'                         => '日付が「:trigger_value」より後ではない',
+    'rule_trigger_not_interest_date_on'                   => '利息日が「:trigger_value」ではない',
+    'rule_trigger_not_interest_date_before'               => '利息日が「:trigger_value」より前ではない',
+    'rule_trigger_not_interest_date_after'                => '利息日が「:trigger_value」より後ではない',
+    'rule_trigger_not_book_date_on'                       => '記帳日が「:trigger_value」ではない',
+    'rule_trigger_not_book_date_before'                   => '記帳日が「:trigger_value」より前ではない',
+    'rule_trigger_not_book_date_after'                    => '記帳日が「:trigger_value」より後ではない',
+    'rule_trigger_not_process_date_on'                    => '処理日が「:trigger_value」ではない',
+    'rule_trigger_not_process_date_before'                => '処理日が「:trigger_value」より前ではない',
+    'rule_trigger_not_process_date_after'                 => '処理日が「:trigger_value」より後ではない',
    'rule_trigger_not_due_date_on'                        => '支払い期日が「:trigger_value」ではない',
    'rule_trigger_not_due_date_before'                    => '支払い期日が「:trigger_value」より前ではない',
    'rule_trigger_not_due_date_after'                     => '支払い期日が「:trigger_value」より後ではない',
-    'rule_trigger_not_payment_date_on'                    => 'Payment date is not on ":trigger_value"',
-    'rule_trigger_not_payment_date_before'                => 'Payment date is not before ":trigger_value"',
-    'rule_trigger_not_payment_date_after'                 => 'Payment date is not after ":trigger_value"',
-    'rule_trigger_not_invoice_date_on'                    => 'Invoice date is not on ":trigger_value"',
-    'rule_trigger_not_invoice_date_before'                => 'Invoice date is not before ":trigger_value"',
-    'rule_trigger_not_invoice_date_after'                 => 'Invoice date is not after ":trigger_value"',
-    'rule_trigger_not_created_at_on'                      => 'Transaction is not created on ":trigger_value"',
-    'rule_trigger_not_created_at_before'                  => 'Transaction is not created before ":trigger_value"',
-    'rule_trigger_not_created_at_after'                   => 'Transaction is not created after ":trigger_value"',
-    'rule_trigger_not_updated_at_on'                      => 'Transaction is not updated on ":trigger_value"',
-    'rule_trigger_not_updated_at_before'                  => 'Transaction is not updated before ":trigger_value"',
-    'rule_trigger_not_updated_at_after'                   => 'Transaction is not updated after ":trigger_value"',
-    'rule_trigger_not_amount_is'                          => 'Transaction amount is not ":trigger_value"',
-    'rule_trigger_not_amount_less'                        => 'Transaction amount is more than ":trigger_value"',
-    'rule_trigger_not_amount_more'                        => 'Transaction amount is less than ":trigger_value"',
-    'rule_trigger_not_foreign_amount_is'                  => 'Foreign transaction amount is not ":trigger_value"',
-    'rule_trigger_not_foreign_amount_less'                => 'Foreign transaction amount is more than ":trigger_value"',
-    'rule_trigger_not_foreign_amount_more'                => 'Foreign transaction amount is less than ":trigger_value"',
-    'rule_trigger_not_attachment_name_is'                 => 'No attachment is named ":trigger_value"',
-    'rule_trigger_not_attachment_name_contains'           => 'No attachment name contains ":trigger_value"',
-    'rule_trigger_not_attachment_name_starts'             => 'No attachment name starts with ":trigger_value"',
-    'rule_trigger_not_attachment_name_ends'               => 'No attachment name ends on ":trigger_value"',
-    'rule_trigger_not_attachment_notes_are'               => 'No attachment notes are ":trigger_value"',
-    'rule_trigger_not_attachment_notes_contains'          => 'No attachment notes contain ":trigger_value"',
-    'rule_trigger_not_attachment_notes_starts'            => 'No attachment notes start with ":trigger_value"',
-    'rule_trigger_not_attachment_notes_ends'              => 'No attachment notes end on ":trigger_value"',
+    'rule_trigger_not_payment_date_on'                    => '支払日が「:trigger_value」ではない',
+    'rule_trigger_not_payment_date_before'                => '支払日が「:trigger_value」より前',
+    'rule_trigger_not_payment_date_after'                 => '支払日が「:trigger_value」より後ではない',
+    'rule_trigger_not_invoice_date_on'                    => '請求日が「:trigger_value」ではない',
+    'rule_trigger_not_invoice_date_before'                => '支払日が「:trigger_value」より前ではない',
+    'rule_trigger_not_invoice_date_after'                 => '請求日が「:trigger_value」より後ではない',
+    'rule_trigger_not_created_at_on'                      => '取引作成が「:trigger_value」ではない',
+    'rule_trigger_not_created_at_before'                  => '取引作成が「:trigger_value」の前ではない',
+    'rule_trigger_not_created_at_after'                   => '取引作成が「:trigger_value」より後ではない',
+    'rule_trigger_not_updated_at_on'                      => '取引更新が「:trigger_value」ではない',
+    'rule_trigger_not_updated_at_before'                  => '取引更新が「:trigger_value」より前ではない',
+    'rule_trigger_not_updated_at_after'                   => '取引更新が「:trigger_value」より後ではない',
+    'rule_trigger_not_amount_is'                          => '取引金額が「:trigger_value」ではない',
+    'rule_trigger_not_amount_less'                        => '取引金額が「:trigger_value」より大きい',
+    'rule_trigger_not_amount_more'                        => '取引金額が「:trigger_value」より小さい',
+    'rule_trigger_not_foreign_amount_is'                  => '取引外貨金額が「:trigger_value」ではない',
+    'rule_trigger_not_foreign_amount_less'                => '取引外貨金額が「:trigger_value」より大きい',
+    'rule_trigger_not_foreign_amount_more'                => '取引外貨金額が「:trigger_value」より小さい',
+    'rule_trigger_not_attachment_name_is'                 => '添付ファイル名「:trigger_value」がない',
+    'rule_trigger_not_attachment_name_contains'           => '添付ファイル名に「:trigger_value」を含むものがない',
+    'rule_trigger_not_attachment_name_starts'             => '添付ファイル名が「:trigger_value」で始まるものがない',
+    'rule_trigger_not_attachment_name_ends'               => '添付ファイル名が「:trigger_value」で終わるものがない',
+    'rule_trigger_not_attachment_notes_are'               => '添付ファイルの備考が「:trigger_value」のものがない',
+    'rule_trigger_not_attachment_notes_contains'          => '添付ファイルの備考に「:trigger_value」を含むものがない',
+    'rule_trigger_not_attachment_notes_starts'            => '添付ファイルの備考が「:trigger_value」で始まるものがない',
+    'rule_trigger_not_attachment_notes_ends'              => '添付ファイルの備考が「:trigger_value」で終わるものがない',
    'rule_trigger_not_reconciled'                         => '照合されていない取引',
    'rule_trigger_not_exists'                             => '存在しない取引',
    'rule_trigger_not_has_attachments'                    => '添付ファイルがない取引',
@ -1202,7 +1202,7 @@ return [
    'rule_trigger_not_no_notes'                           => '備考がある取引',
    'rule_trigger_not_no_external_url'                    => '外部URLがある取引',
    'rule_trigger_not_source_is_cash'                     => '引き出し口座が現金口座ではない',
-    'rule_trigger_not_destination_is_cash'                => '宛先口座が現金口座ではない',
+    'rule_trigger_not_destination_is_cash'                => '預け入れ口座が現金口座ではない',
    'rule_trigger_not_account_is_cash'                    => 'どちらの口座も現金口座ではない',

 /*
@ -1245,7 +1245,7 @@ return [
    'rule_action_set_source_account_choice'               => '引き出し口座を...に設定',
    'rule_action_set_source_account'                      => '支払元口座を「:action_value」にする',
    'rule_action_set_destination_account_choice'          => '相手先口座を...に設定',
-    'rule_action_set_destination_account'                 => '宛先口座を「:action_value」にする',
+    'rule_action_set_destination_account'                 => '預け入れ口座を「:action_value」にする',
    'rule_action_append_notes_choice'                     => '備考の終わりに...を追加',
    'rule_action_append_notes'                            => '備考の始めに「:action_value」を追加',
    'rule_action_prepend_notes_choice'                    => '備考の終わりに…を追加',
@ -1264,18 +1264,18 @@ return [
    'rule_action_convert_transfer'                        => '取引を「:action_value」で送金に変換する',
    'rule_action_append_descr_to_notes_choice'            => '取引の備考の終わりに説明を追加',
    'rule_action_append_notes_to_descr_choice'            => '説明の終わりに取引の備考を追加',
-    'rule_action_move_descr_to_notes_choice'              => 'Replace the current transaction notes with the description',
-    'rule_action_move_notes_to_descr_choice'              => 'Replace the current description with the transaction notes',
+    'rule_action_move_descr_to_notes_choice'              => '現在の取引備考を説明に置き換えます',
+    'rule_action_move_notes_to_descr_choice'              => '現在の説明を取引備考に置き換えます',
    'rule_action_append_descr_to_notes'                   => '備考の終わりに説明を追加',
    'rule_action_append_notes_to_descr'                   => '説明の終わりに備考を追加',
-    'rule_action_move_descr_to_notes'                     => 'Replace notes with description',
-    'rule_action_move_notes_to_descr'                     => 'Replace description with notes',
+    'rule_action_move_descr_to_notes'                     => '備考を説明に置き換え',
+    'rule_action_move_notes_to_descr'                     => '説明を備考に置き換え',
    'rulegroup_for_bills_title'                           => '請求のルールグループ',
-    'rulegroup_for_bills_description'                     => 'A special rule group for all the rules that involve bills.',
-    'rule_for_bill_title'                                 => 'Auto-generated rule for bill ":name"',
-    'rule_for_bill_description'                           => 'This rule is auto-generated to try to match bill ":name".',
+    'rulegroup_for_bills_description'                     => '請求に関するすべてのルールのための特別なグループです。',
+    'rule_for_bill_title'                                 => '請求「:name」用に自動作成されたルール',
+    'rule_for_bill_description'                           => 'このルールは請求「:name」を紐付けるため自動生成されます。',
    'create_rule_for_bill'                                => '請求「:name」用にルールを作成する',
-    'create_rule_for_bill_txt'                            => 'You have just created a new bill called ":name", congratulations!Firefly III can automagically match new withdrawals to this bill. For example, whenever you pay your rent, the bill "rent" will be linked to the expense. This way, Firefly III can accurately show you which bills are due and which ones aren\'t. In order to do so, a new rule must be created. Firefly III has filled in some sensible defaults for you. Please make sure these are correct. If these values are correct, Firefly III will automatically link the correct withdrawal to the correct bill. Please check out the triggers to see if they are correct, and add some if they\'re wrong.',
+    'create_rule_for_bill_txt'                            => '請求「:name」を作成しました、おめでとうございます！Firefly III は自動的にこの請求と出金をリンクすることができます。 例えば、家賃を支払うたびに、請求「家賃」は支出にリンクされます。 このように、Firefly III は正確にどの請求が支払われているか、そうでないかを示すことができます。 これにはルールを作成する必要があります。 Firefly III にはいくつかのデフォルト設定がありますが、これらが適切か確認してください。 これらが正しい場合、Firefly III は自動的に出金を請求にリンクします。 トリガーが正しいかどうかを確認し、間違っている場合は訂正してください。',
    'new_rule_for_bill_title'                             => '請求「:name」のルール',
    'new_rule_for_bill_description'                       => 'このルールは請求「:name」の取引をマークします。',

@ -1313,7 +1313,7 @@ return [
    'pref_view_range'                           => '閲覧範囲',
    'pref_view_range_help'                      => 'いくつかのチャートは自動的に期間でグループ化されます。予算も期間にグループ化されます。どの期間を設定しますか？',
    'pref_1D'                                   => '1日',
-    'pref_1W'                                   => 'YYYY年w[週目]',
+    'pref_1W'                                   => '1週',
    'pref_1M'                                   => '1ヵ月',
    'pref_3M'                                   => '3ヶ月 (四半期)',
    'pref_6M'                                   => '6ヶ月',
@ -1384,7 +1384,7 @@ return [
    'optional_field_attachments'                => '添付ファイル',
    'optional_field_meta_data'                  => '任意のメタデータ',
    'external_url'                              => '外部 URL',
-    'pref_notification_bill_reminder'           => '期限切れの請求書について通知する',
+    'pref_notification_bill_reminder'           => '期限切れの請求について通知する',
    'pref_notification_new_access_token'        => '新しい API アクセストークンが作成されたときに警告する',
    'pref_notification_transaction_creation'    => '取引が自動的に作成されたとき警告する',
    'pref_notification_user_login'              => '新しい場所からログインしたときに警告する',
@ -1399,7 +1399,7 @@ return [

    // profile:
    'purge_data_title'                          => 'Firefly III からデータを消去',
-    'purge_data_expl'                           => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. The button below deletes all of these previously "deleted" records FOREVER.',
+    'purge_data_expl'                           => '「パージ」とは、「削除済みのものを削除する」ことを意味します。通常、Firefly IIIは何も永久には削除せず、それを非表示にします。下のボタンは以前に削除されたレコードのすべてを削除します。',
    'delete_stuff_header'                       => '削除と完全消去',
    'purge_all_data'                            => '削除済の全レコードを完全消去',
    'purge_data'                                => 'データを消去',
@ -1407,9 +1407,9 @@ return [
    'delete_data_title'                         => 'Firefly IIIからデータを削除',
    'permanent_delete_stuff'                    => 'Firefly IIIからデータを削除することができます。下のボタンを使用すると、表示されているものおよび非表示のものから削除されます。 このための取り消しボタンはありませんが、必要な場合サルベージできる項目がデータベースに残っている可能性があります。',
    'other_sessions_logged_out'                 => 'すべてのセッションでログアウトしました。',
-    'delete_unused_accounts'                    => 'Deleting unused accounts will clean your auto-complete lists.',
-    'delete_all_unused_accounts'                => 'Delete unused accounts',
-    'deleted_all_unused_accounts'               => 'All unused accounts are deleted',
+    'delete_unused_accounts'                    => '未使用の口座を削除すると、オートコンプリートの一覧がきれいになります。',
+    'delete_all_unused_accounts'                => '未使用の口座を削除',
+    'deleted_all_unused_accounts'               => 'すべての未使用の口座は削除されました',
    'delete_all_budgets'                        => 'すべての予算を削除する',
    'delete_all_categories'                     => 'すべてのカテゴリを削除する',
    'delete_all_tags'                           => 'すべてのタグを削除する',
@ -1517,10 +1517,10 @@ return [
    'profile_something_wrong'                   => '何か問題が発生しました！',
    'profile_try_again'                         => '問題が発生しました。もう一度やり直してください。',
    'amounts'                                   => '金額',
-    'multi_account_warning_unknown'             => '作成する取引の種類に応じて、続く分割の引き出し口座や宛先口座は、取引の最初の分割で定義されているものによって覆される可能性があります。',
+    'multi_account_warning_unknown'             => '作成する取引の種類に応じて、続く分割の引き出し口座や預け入れ口座は、取引の最初の分割で定義されているものによって覆される可能性があります。',
    'multi_account_warning_withdrawal'          => '続く分割の引き出し口座は、出金の最初の分割の定義によって覆されることに注意してください。',
-    'multi_account_warning_deposit'             => '続く分割の宛先口座は、送金の最初の分割の定義によって覆されることに注意してください。',
-    'multi_account_warning_transfer'            => '続く分割の宛先口座と引き出し口座は、送金の最初の分割の定義によって覆されることに注意してください。',
+    'multi_account_warning_deposit'             => '続く分割の預け入れ口座は、送金の最初の分割の定義によって覆されることに注意してください。',
+    'multi_account_warning_transfer'            => '続く分割の預け入れ口座と引き出し口座は、送金の最初の分割の定義によって覆されることに注意してください。',

 /*
 * PLEASE DO NOT EDIT THIS FILE DIRECTLY.
@ -1564,7 +1564,7 @@ return [
    'title_transfers'                           => '送金',
    'submission_options'                        => '送信オプション',
    'apply_rules_checkbox'                      => 'ルールを適用',
-    'fire_webhooks_checkbox'                    => 'Webhook を実行する',
+    'fire_webhooks_checkbox'                    => 'Webhookを実行',

    // convert stuff:
    'convert_is_already_type_Withdrawal'        => 'この取引はすでに出金です',
@ -1589,14 +1589,14 @@ return [
    'convert_please_set_asset_destination'      => 'お金が入る資産口座を選んでください。',
    'convert_please_set_expense_destination'    => 'お金が出ていく支出口座を選んでください。',
    'convert_please_set_asset_source'           => 'お金が入ってくる資産口座を選んでください。',
-    'convert_expl_w_d'                          => '出金を入金に変換すると、お金は出金ではなく表示された宛先口座への入金となります。 |出金を入金に変換すると、お金は出金ではなく表示された宛先口座への入金となります。',
+    'convert_expl_w_d'                          => '出金を入金に変換すると、お金は出金ではなく表示された預け入れ口座への入金となります。 |出金を入金に変換すると、お金は出金ではなく表示された預け入れ口座への入金となります。',
    'convert_expl_w_t'                          => '出金を送金に変換すると、お金は元の支出口座での支出ではなく、引き出し口座から他の資産口座または債務口座への送金となります。|出金を送金に変換すると、お金は元の支出口座での支出ではなく、引き出し口座から他の資産口座または債務口座への送金となります。',
    'convert_expl_d_w'                          => '入金を出金に変換すると、お金は入金ではなく、表示された引き出し口座からの出金となります。 |入金を出金に変換すると、お金は入金ではなく、表示された引き出し口座からの出金となります。',
-    'convert_expl_d_t'                          => '入金を送金に変換すると、お金は資産口座や債務口座から、一覧にある宛先口座への入金となります。|入金を送金に変換すると、お金は資産口座や債務口座から、一覧にある宛先口座への入金となります。',
-    'convert_expl_t_w'                          => '送金を出金に変換すると、宛先口座への送金ではなく、ここで設定した宛先口座での支出となります。|送金を出金に変換すると、宛先口座への送金ではなく、ここで設定した相手先口座での支出となります。',
-    'convert_expl_t_d'                          => '送金を入金に変換すると、宛先口座への送金ではなく、ここで設定した宛先口座への入金となります。|送金を入金に変換すると、宛先口座への送金ではなく、ここで設定した宛先口座への入金となります。',
+    'convert_expl_d_t'                          => '入金を送金に変換すると、お金は資産口座や債務口座から、一覧にある預け入れ口座への入金となります。|入金を送金に変換すると、お金は資産口座や債務口座から、一覧にある預け入れ口座への入金となります。',
+    'convert_expl_t_w'                          => '送金を出金に変換すると、預け入れ口座への送金ではなく、ここで設定した預け入れ口座での支出となります。|送金を出金に変換すると、預け入れ口座への送金ではなく、ここで設定した相手先口座での支出となります。',
+    'convert_expl_t_d'                          => '送金を入金に変換すると、預け入れ口座への送金ではなく、ここで設定した預け入れ口座への入金となります。|送金を入金に変換すると、預け入れ口座への送金ではなく、ここで設定した預け入れ口座への入金となります。',
    'convert_select_sources'                    => '変換を完了するには、以下で新しい引き出し口座を設定してください。 |変換を完了するには、以下で新しい引き出し口座を設定してください。',
-    'convert_select_destinations'               => '変換を完了するには、以下で新しい宛先口座を設定してください。 |変換を完了するには、以下で新しい宛先口座を設定してください。',
+    'convert_select_destinations'               => '変換を完了するには、以下で新しい預け入れ口座を設定してください。 |変換を完了するには、以下で新しい預け入れ口座を設定してください。',
    'converted_to_Withdrawal'                   => '取引は引き出しに変換されました',
    'converted_to_Deposit'                      => '取引は入金に変換されました',
    'converted_to_Transfer'                     => '取引は送金に変換されました',
@ -1706,7 +1706,7 @@ return [
    'auto_budget_none'                          => '自動予算なし',
    'auto_budget_reset'                         => '期間ごとに固定金額を設定する',
    'auto_budget_rollover'                      => '期間ごとに金額を追加',
-    'auto_budget_adjusted'                      => 'Add an amount every period and correct for overspending',
+    'auto_budget_adjusted'                      => '期間ごとに金額を追加し過剰な支出のために補正します',
    'auto_budget_period_daily'                  => '毎日',
    'auto_budget_period_weekly'                 => '毎週',
    'auto_budget_period_monthly'                => '毎月',
@ -1716,19 +1716,19 @@ return [
    'auto_budget_help'                          => 'この機能の詳細については、ヘルプを参照してください。右上の (？) アイコンをクリックします。',
    'auto_budget_reset_icon'                    => 'この予算は定期的に設定されます',
    'auto_budget_rollover_icon'                 => '予算額は定期的に増加します',
-    'auto_budget_adjusted_icon'                 => 'The budget amount will increase periodically and will correct for overspending',
+    'auto_budget_adjusted_icon'                 => '予算額は定期的に増加し過剰な支出を補正します',
    'remove_budgeted_amount'                    => ':currency で予算を削除する',

    // bills:
    'not_expected_period'                       => 'この期間には予定なし',
    'not_or_not_yet'                            => '(まだ) なし',
-    'visit_bill'                                => 'Visit bill ":name" at Firefly III',
+    'visit_bill'                                => 'Firefly IIIの請求「:name」を開く',
    'match_between_amounts'                     => '請求は :low から :high の間の取引に適合します。',
    'running_again_loss'                        => '以前にこの請求にリンクされた取引は、ルールに適合しない場合、リンクを失う可能性があります。',
    'bill_related_rules'                        => 'この請求に関連するルール',
    'repeats'                                   => '繰り返し',
-    'bill_end_date_help'                        => 'Optional field. The bill is expected to end on this date.',
-    'bill_extension_date_help'                  => 'Optional field. The bill must be extended (or cancelled) on or before this date.',
+    'bill_end_date_help'                        => 'オプション項目です。請求はこの日付に終了する予定です。',
+    'bill_extension_date_help'                  => 'オプション項目です。請求はこの日付前に延長（またはキャンセル）する必要があります。',
    'bill_end_index_line'                       => 'この請求は :date に終わる',
    'bill_extension_index_line'                 => 'この請求は延長されるか :date にキャンセルされる',
    'connected_journals'                        => '接続した取引',
@ -1741,7 +1741,7 @@ return [
    'more'                                      => 'もっと見る',
    'rescan_old'                                => 'すべての取引にルールを再度実行する',
    'update_bill'                               => '請求を更新',
-    'updated_bill'                              => '請求書 ":name" を更新しました',
+    'updated_bill'                              => '請求「:name」を更新しました',
    'store_new_bill'                            => '新しい請求を保存',
    'stored_new_bill'                           => '新しい請求「:name」を保存しました',
    'cannot_scan_inactive_bill'                 => '無効な請求はスキャンされません。',
@ -1750,7 +1750,7 @@ return [
    'average_bill_amount_overall'               => '平均請求額 (全体)',
    'bill_is_active'                            => '請求は有効',
    'bill_expected_between'                     => ':start から :end までの予測',
-    'bill_will_automatch'                       => '請求書は自動的に一致する取引にリンクされます',
+    'bill_will_automatch'                       => '請求は自動的に一致する取引にリンクされます',
    'skips_over'                                => 'スキップする',
    'bill_store_error'                          => '新しい請求の保存中に予期しないエラーが発生しました。ログを確認してください',
    'list_inactive_rule'                        => '非アクティブなルール',
@ -1778,8 +1778,8 @@ return [
    'extension_date_is'                         => '延長日は {date} です',

    // accounts:
-    'i_am_owed_amount'                          => 'I am owed amount',
-    'i_owe_amount'                              => 'I owe amount',
+    'i_am_owed_amount'                          => '債務額',
+    'i_owe_amount'                              => '債務額',
    'inactive_account_link'                     => ':count 件の非アクティブ (アーカイブ済み) 口座があり、この別々のページで表示できます。|:count 件の非アクティブ (アーカイブ済み) 口座があり、この別々のページで表示できます。',
    'all_accounts_inactive'                     => 'これらは、アクティブでないアカウントです。',
    'active_account_link'                       => 'このリンクはアクティブな口座に戻ります。',
@ -1975,17 +1975,17 @@ return [
    'all_other_budgets'                         => '(その他の予算すべて)',
    'all_other_accounts'                        => '(その他の口座すべて)',
    'expense_per_source_account'                => '引き出し口座ごとの支出',
-    'expense_per_destination_account'           => '宛先口座ごとの支出',
-    'income_per_destination_account'            => '宛先口座ごとの収入',
+    'expense_per_destination_account'           => '預け入れ口座ごとの支出',
+    'income_per_destination_account'            => '預け入れ口座ごとの収入',
    'spent_in_specific_category'                => 'カテゴリ「:category」の支出',
    'earned_in_specific_category'               => 'カテゴリ「:category」の収入',
    'spent_in_specific_tag'                     => 'タグ「:tag」の支出',
    'earned_in_specific_tag'                    => 'タグ「:tag」の収入',
    'income_per_source_account'                 => '引き出し口座ごとの収入',
-    'average_spending_per_destination'          => '宛先口座ごとの平均支出',
+    'average_spending_per_destination'          => '預け入れ口座ごとの平均支出',
    'average_spending_per_source'               => '引き出し口座あたりの平均支出',
    'average_earning_per_source'                => '引き出し口座あたりの平均収益',
-    'average_earning_per_destination'           => '宛先口座あたりの平均収入',
+    'average_earning_per_destination'           => '預け入れ口座あたりの平均収入',
    'account_per_tag'                           => 'タグごとの口座',
    'tag_report_expenses_listed_once'           => '支出と収入は2重表示されません。取引に複数のタグがある場合は、そのタグの1つにのみ表示される可能性があります。 このリストはデータが欠けているように見えるかもしれませんが、金額は正しいです。',
    'double_report_expenses_charted_once'       => '支出と収入は2重表示されません。取引に複数のタグがある場合は、そのタグの1つにのみ表示される可能性があります。 このリストはデータが欠けているように見えるかもしれませんが、金額は正しいです。',
@ -2019,7 +2019,7 @@ return [
    'transaction_updated_no_changes'            => '<a href="transactions/show/{ID}">取引 #{ID}</a>「{title}」は変更されませんでした。',
    'first_split_decides'                       => '最初の分割がこの項目の値を決定します。',
    'first_split_overrules_source'              => '最初の分割が引き出し口座を覆す可能性があります',
-    'first_split_overrules_destination'         => '最初の分割が宛先口座を覆す可能性があります',
+    'first_split_overrules_destination'         => '最初の分割が預け入れ口座を覆す可能性があります',
    'spent_x_of_y'                              => '{amount} / {total} を支出しました',

    // new user:
@ -2055,7 +2055,7 @@ return [
    'newWithdrawal'                             => '新しい支出',
    'newDeposit'                                => '新しい入金',
    'newTransfer'                               => '新しい送金',
-    'bills_to_pay'                              => '請求書',
+    'bills_to_pay'                              => '支払うべき請求',
    'per_day'                                   => '1日あたり',
    'left_to_spend_per_day'                     => '1日あたりの残り支出額',
    'bills_paid'                                => '支払い済み請求',
@ -2377,8 +2377,8 @@ return [
    'invite_new_user_title'                    => 'ユーザーを招待する',
    'invite_new_user_text'                     => '管理者として、Firefly III管理にユーザーを登録するように招待できます。共有できる直接リンクを使用して、招待されたユーザーはアカウントを登録することができます。 招待されたユーザーと招待リンクが下の表に表示されます。招待リンクを自由に共有できます。',
    'invited_user_mail'                        => 'メールアドレス',
-    'invite_user'                              => 'ユーザーを招待する',
-    'user_is_invited'                          => 'Email address ":address" was invited to Firefly III',
+    'invite_user'                              => 'ユーザーを招待',
+    'user_is_invited'                          => 'メールアドレス「:address」がFirefly IIIに招待されました。',
    'administration'                           => '管理',
    'code_already_used'                        => '招待コードが使用されました',
    'user_administration'                      => 'ユーザー管理',
@ -2419,15 +2419,15 @@ return [
    'admin_maintanance_title'                  => 'メンテナンス',
    'admin_maintanance_expl'                   => 'Firefly III メンテナンス用の素敵なボタン',
    'admin_maintenance_clear_cache'            => 'キャッシュをクリア',
-    'admin_notifications'                      => '管理者向け通知',
+    'admin_notifications'                      => '通知管理',
    'admin_notifications_expl'                 => 'これらの通知は管理者によって有効/無効にできます。 Slack でもこれらのメッセージを取得したい場合は、"incoming webhook" URL を設定します。',
-    'admin_notification_check_user_new_reg'    => 'User gets post-registration welcome message',
+    'admin_notification_check_user_new_reg'    => 'ユーザーが登録後のウェルカムメッセージを受け取ります',
    'admin_notification_check_admin_new_reg'   => '管理者は新しいユーザー登録通知を受け取ります',
    'admin_notification_check_new_version'     => '新しいバージョンが利用可能です',
-    'admin_notification_check_invite_created'  => 'Firefly III に招待されたユーザー',
+    'admin_notification_check_invite_created'  => 'Firefly IIIにユーザー招待されました',
    'admin_notification_check_invite_redeemed' => 'ユーザー招待が利用されました',
    'all_invited_users'                        => '招待されたすべてのユーザー',
-    'save_notification_settings'               => '設定を保存する',
+    'save_notification_settings'               => '設定を保存',
    'notification_settings_saved'              => '通知設定が保存されました。',


@ -2509,7 +2509,7 @@ return [
    'breadcrumb_convert_group'              => '取引を変換',
    'convert_invalid_source'                => '取引 #%d の引き出し元情報が無効です。',
    'convert_invalid_destination'           => '取引 #%d の宛先情報が無効です。',
-    'create_another'                        => '保存後にここに戻り、さらに作成する。',
+    'create_another'                        => '保存後に戻り作成を続ける。',
    'after_update_create_another'           => '保存後にここに戻り、編集を続ける。',
    'store_as_new'                          => '更新ではなく、新しい取引として保存する。',
    'reset_after'                           => '送信後にフォームをリセット',
@ -2576,7 +2576,7 @@ return [

    // recurring transactions
    'create_right_now'                      => '今すぐ作成',
-    'no_new_transaction_in_recurrence'      => 'No new transaction was created. Perhaps it was already fired for this date?',
+    'no_new_transaction_in_recurrence'      => '新しい取引は作成されませんでした。この日付で既に発行されている可能性があります。',
    'recurrences'                           => '定期的な取引',
    'repeat_until_in_past'                  => 'この繰り返し取引は :date で繰り返し処理を停止しました。',
    'recurring_calendar_view'               => 'カレンダー',
@ -2692,24 +2692,24 @@ return [

    // audit log entries
    'audit_log_entries'                  => '監査ログのエントリ',
-    'ale_action_log_add'                 => 'Added :amount to piggy bank ":name"',
+    'ale_action_log_add'                 => '貯金箱「:name」に「:amount」を追加',
    'ale_action_log_remove'              => '貯金箱「:name」から:amountを減算',
-    'ale_action_clear_budget'            => 'Removed from budget',
-    'ale_action_update_group_title'      => 'Updated transaction group title',
-    'ale_action_update_date'             => 'Updated transaction date',
-    'ale_action_update_order'            => 'Updated transaction order',
-    'ale_action_clear_category'          => 'Removed from category',
-    'ale_action_clear_notes'             => 'Removed notes',
-    'ale_action_clear_tag'               => 'Cleared tag',
-    'ale_action_clear_all_tags'          => 'Cleared all tags',
+    'ale_action_clear_budget'            => '予算から削除されました',
+    'ale_action_update_group_title'      => '更新された取引グループタイトル',
+    'ale_action_update_date'             => '更新された取引日',
+    'ale_action_update_order'            => '更新された取引並び順',
+    'ale_action_clear_category'          => 'カテゴリから削除されました',
+    'ale_action_clear_notes'             => '削除された備考',
+    'ale_action_clear_tag'               => '削除されたタグ',
+    'ale_action_clear_all_tags'          => '削除されたすべてのタグ',
    'ale_action_set_bill'                => '請求にリンクされました',
    'ale_action_set_budget'              => '予算を設定する',
    'ale_action_set_category'            => 'カテゴリを設定する',
    'ale_action_set_source'              => '引き出し口座を設定',
-    'ale_action_set_destination'         => '宛先口座を設定',
-    'ale_action_update_transaction_type' => 'Changed transaction type',
-    'ale_action_update_notes'            => 'Changed notes',
-    'ale_action_update_description'      => 'Changed description',
+    'ale_action_set_destination'         => '預け入れ口座を設定',
+    'ale_action_update_transaction_type' => '変更された取引種別',
+    'ale_action_update_notes'            => '変更された備考',
+    'ale_action_update_description'      => '変更された説明',
    'ale_action_add_to_piggy'            => '貯金箱',
    'ale_action_remove_from_piggy'       => '貯金箱',
    'ale_action_add_tag'                 => '追加したタグ',
--- a/resources/lang/ja_JP/form.php
+++ b/resources/lang/ja_JP/form.php
@ -61,8 +61,8 @@ return [
    'BIC'                       => 'BIC',
    'verify_password'           => 'パスワードの安全性確認',
    'source_account'            => '支出元口座',
-    'destination_account'       => '宛先口座',
-    'asset_destination_account' => '宛先口座',
+    'destination_account'       => '預け入れ口座',
+    'asset_destination_account' => '預け入れ口座',
    'include_net_worth'         => '純資産に含める',
    'asset_source_account'      => '支出元口座',
    'journal_description'       => '説明',
@ -94,7 +94,7 @@ return [
    'cc_monthly_payment_date'     => 'クレジットカードの引き落とし日',
    'piggy_bank_id'               => '貯金箱',
    'returnHere'                  => 'ここへ戻る',
-    'returnHereExplanation'       => '保存後、ここに戻って別のものを作成する。',
+    'returnHereExplanation'       => '保存後に戻り作成を続ける。',
    'returnHereUpdateExplanation' => '保存後、ここへ戻る。',
    'description'                 => '説明',
    'expense_account'             => '支出口座',
@ -176,7 +176,7 @@ return [
    'recurring_areYouSure'        => '定期的な取引「:title」を削除してもよろしいですか？',
    'currency_areYouSure'         => '通貨「:name」を削除してもよろしいですか？',
    'piggyBank_areYouSure'        => '貯金箱「:name」を削除してもよろしいですか？',
-    'journal_areYouSure'          => '「:description」と説明されている取引を削除してもよろしいですか？',
+    'journal_areYouSure'          => '「:description」という説明の取引を削除してもよろしいですか？',
    'mass_journal_are_you_sure'   => 'これらの取引を削除してもよろしいですか？',

 /*
--- a/resources/lang/ja_JP/intro.php
+++ b/resources/lang/ja_JP/intro.php
@ -45,7 +45,7 @@ return [
    'index_cash_account'                    => 'これらは今までに作られた口座です。現金支出を管理するため現金口座を使うこともできますが、もちろん強制ではありません。',

    // transactions
-    'transactions_create_basic_info'        => '貸方、借方、日付、説明など、取引の基本情報を入力します。',
+    'transactions_create_basic_info'        => '引き出し口座、預け入れ口座、日付、説明など、取引の基本情報を入力します。',
    'transactions_create_amount_info'       => '取引の金額を入力します。必要に応じて、フィールドは自動的に更新されます。',
    'transactions_create_optional_info'     => 'これらのフィールドはすべて任意です。ここにメタデータを追加すると、取引をより整理できます。',
    'transactions_create_split'             => '取引を分割する場合は、このボタンでさらに分割を追加します',
--- a/resources/lang/ja_JP/list.php
+++ b/resources/lang/ja_JP/list.php
@ -107,14 +107,14 @@ return [
    'iban'                    => 'IBAN',
    'account_number'          => '口座番号',
    'paid_current_period'     => 'この期間の支払い済み',
-    'email'                   => 'Email',
+    'email'                   => 'メールアドレス',
    'registered_at'           => '登録日時',
    'is_blocked'              => 'ブロック済み',
    'is_admin'                => '管理者',
    'has_two_factor'          => '2要素認証が有効か',
    'blocked_code'            => 'ブロックコード',
    'source_account'          => '引き出し口座',
-    'destination_account'     => '宛先口座',
+    'destination_account'     => '預け入れ口座',
    'accounts_count'          => '口座数',
    'journals_count'          => '取引件数',
    'attachments_count'       => '添付ファイル数',
--- a/resources/lang/ja_JP/validation.php
+++ b/resources/lang/ja_JP/validation.php
@ -62,17 +62,17 @@ return [
    'belongs_user'                   => 'この欄ではその値は無効です。',
    'at_least_one_transaction'       => '最低でも一つの取引が必要です。',
    'recurring_transaction_id'       => '少なくとも 1 つの取引が必要です。',
-    'need_id_to_match'               => 'You need to submit this entry with an ID for the API to be able to match it.',
-    'too_many_unmatched'             => 'Too many submitted transactions cannot be matched to their respective database entries. Make sure existing entries have a valid ID.',
-    'id_does_not_match'              => 'Submitted ID #:id does not match expected ID. Make sure it matches or omit the field.',
+    'need_id_to_match'               => 'APIを一致させるためにこのエントリをIDで送信する必要があります。',
+    'too_many_unmatched'             => '送信された取引がそれぞれのデータベースエントリと一致しません。既存のエントリに有効なIDがあることを確認してください。',
+    'id_does_not_match'              => '送信されたID #:id は期待されたIDと一致しません。一致させるか、フィールドを省略してください。',
    'at_least_one_repetition'        => '最低でも一回の繰り返しが必要です。',
    'require_repeat_until'           => '繰り返し回数か、終了日 (繰り返し期限) が必要です。両方は使えません。',
    'require_currency_info'          => 'この項目の内容は通貨情報がなければ無効です。',
    'not_transfer_account'           => 'このアカウントは送金に使用できるアカウントではありません。',
    'require_currency_amount'        => 'この項目の内容は、外部金額情報がなければ無効です。',
    'require_foreign_currency'       => 'このフィールドには数字が必要です',
-    'require_foreign_dest'           => 'This field value must match the currency of the destination account.',
-    'require_foreign_src'            => 'This field value must match the currency of the source account.',
+    'require_foreign_dest'           => 'この項目の値は預け入れ口座の通貨と一致する必要があります。',
+    'require_foreign_src'            => 'この項目の値は、引き出し口座の通貨と一致する必要があります。',
    'equal_description'              => '取引の説明はグローバルな説明と同じであってはいけません。',
    'file_invalid_mime'              => '「:mime」タイプのファイル ":name" は新しいアップロードとして受け付けられません。',
    'file_too_large'                 => 'ファイル ":name"は大きすぎます。',
@ -234,20 +234,20 @@ return [

    // validation of accounts:
    'withdrawal_source_need_data' => '続行するには有効な引き出し元口座 ID および（または）有効な引き出し元口座名を取得する必要があります。',
-    'withdrawal_source_bad_data'  => '[a] Could not find a valid source account when searching for ID ":id" or name ":name".',
-    'withdrawal_dest_need_data'   => '[a] Need to get a valid destination account ID and/or valid destination account name to continue.',
+    'withdrawal_source_bad_data'  => '[a] ID「:id」、名称「:name」で検索しましたが、有効な引き出し口座が見つかりませんでした。',
+    'withdrawal_dest_need_data'   => '[a] 続けるには有効な預け入れ口座IDおよび（または）有効な預け入れ口座名が必要があります。',
    'withdrawal_dest_bad_data'    => 'ID「:id」、名称「:name」で検索した結果、有効な預け入れ口座が見つかりませんでした。',

-    'withdrawal_dest_iban_exists' => 'この宛先口座IBANはすでに資産口座または負債で使用されており、引き出し先として使用することはできません。',
+    'withdrawal_dest_iban_exists' => 'この預け入れ口座IBANはすでに資産口座または負債で使用されており、引き出し先として使用することはできません。',
    'deposit_src_iban_exists'     => 'この引き出し口座IBANはすでに資産口座または負債で使用されており、引き出し元として使用することはできません。',

-    'reconciliation_source_bad_data' => 'Could not find a valid reconciliation account when searching for ID ":id" or name ":name".',
+    'reconciliation_source_bad_data' => 'ID「:id」または名称「:name」で検索しましたが、有効な照合口座が見つかりませんでした。',

-    'generic_source_bad_data' => '[e] Could not find a valid source account when searching for ID ":id" or name ":name".',
+    'generic_source_bad_data' => '[e] ID「:id」、名称「:name」で検索しましたが、有効な引き出し口座が見つかりませんでした。',

    'deposit_source_need_data' => '続行するには、有効な引き出し元口座 ID および（または）有効な引き出し元口座名を取得する必要があります。',
-    'deposit_source_bad_data'  => '[b] Could not find a valid source account when searching for ID ":id" or name ":name".',
-    'deposit_dest_need_data'   => '[b] Need to get a valid destination account ID and/or valid destination account name to continue.',
+    'deposit_source_bad_data'  => '[b] ID「:id」、名称「:name」で検索しましたが、有効な引き出し口座が見つかりませんでした。',
+    'deposit_dest_need_data'   => '[b] 続けるには有効な預け入れ口座IDおよび（または）有効な預け入れ口座名が必要があります。',
    'deposit_dest_bad_data'    => 'ID「:id」、名称「:name」で検索した結果、有効な預け入れ先口座が見つかりませんでした。',
    'deposit_dest_wrong_type'  => '預け入れ先口座が適切なタイプではありません。',

@ -264,22 +264,22 @@ return [


    'transfer_source_need_data' => '続行するには、有効な引き出し元口座 ID および（または）有効な引き出し元口座名を取得する必要があります。',
-    'transfer_source_bad_data'  => '[c] Could not find a valid source account when searching for ID ":id" or name ":name".',
-    'transfer_dest_need_data'   => '[c] Need to get a valid destination account ID and/or valid destination account name to continue.',
+    'transfer_source_bad_data'  => '[c] ID「:id」、名称「:name」で検索しましたが、有効な引き出し口座が見つかりませんでした。',
+    'transfer_dest_need_data'   => '[c] 続けるには有効な預け入れ口座IDおよび（または）有効な預け入れ口座名が必要があります。',
    'transfer_dest_bad_data'    => 'ID「:id」、名称「:name」で検索した結果、有効な預け入れ先口座が見つかりませんでした。',
    'need_id_in_edit'           => '各分割は transaction_journal_id (有効な ID または 0 のいずれか) でなければなりません。',

    'ob_source_need_data'           => '続行するには、有効な引き出し元口座 ID および（または）有効な引き出し元口座名を取得する必要があります。',
    'lc_source_need_data'           => '続行するには有効な引き出し元口座 ID が必要です。',
-    'ob_dest_need_data'             => '[d] 続行するには、有効な宛先口座IDおよび（または）有効な宛先口座名を得る必要があります。',
+    'ob_dest_need_data'             => '[d] 続行するには、有効な預け入れ口座IDおよび（または）有効な預け入れ口座名を得る必要があります。',
    'ob_dest_bad_data'              => 'ID「:id」、名称「:name」で検索した結果、有効な預け入れ先口座が見つかりませんでした。',
-    'reconciliation_either_account' => 'To submit a reconciliation, you must submit either a source or a destination account. Not both, not neither.',
+    'reconciliation_either_account' => '照合を送信するには、引き出し口座または預け入れ口座を送信する必要があります。両方ではありません。',

    'generic_invalid_source'      => 'この口座を引き出し元口座として使用することはできません。',
    'generic_invalid_destination' => 'この口座を預け入れ先口座として使用することはできません。',

    'generic_no_source'      => '引き出し口座の情報か取引ジャーナルIDを送信する必要があります。',
-    'generic_no_destination' => '宛先口座の情報か取引ジャーナルIDを送信する必要があります。',
+    'generic_no_destination' => '預け入れ口座の情報か取引ジャーナルIDを送信する必要があります。',

    'gte.numeric' => ':attribute は :value 以上でなければなりません。',
    'gt.numeric'  => ':attribute は :value より大きな値でなければいけません。',
--- a/resources/lang/nn_NO/firefly.php
+++ b/resources/lang/nn_NO/firefly.php
@ -126,7 +126,7 @@ return [
    'no_bill_pointer'                      => 'Det ser ut til at du ikkje har nokon rekningar enda. Du bør oppretta nokon på <a href="bills">rekningar</a>-side. Rekningar kan hjelpa deg med å holde oversikt over utgifter.',
    'Savings account'                      => 'Sparekonto',
    'Credit card'                          => 'Kredittkort',
-    'source_accounts'                      => 'Kjelde konto|Kjeldekontoar',
+    'source_accounts'                      => 'Kjeldekonto|Kjeldekontoar',
    'destination_accounts'                 => 'Målkonto|Målkontoar',
    'user_id_is'                           => 'Din brukar-ID er <strong>:user</strong>',
    'field_supports_markdown'              => 'Dette feltet støttar <a href="https://en.support.wordpress.com/markdown-quick-reference/">Markdown</a>.',
@ -370,19 +370,19 @@ return [
    'search_modifier_not_no_external_id'                  => 'Transaksjonen må ha ein (hvilken som helst) ekstern ID',
    'search_modifier_internal_reference_is'               => 'Intern referanse er ":value"',
    'search_modifier_not_internal_reference_is'           => 'Intern referanse er ikkje ":value"',
-    'search_modifier_description_starts'                  => 'Beskrivelsen begynner med ":value',
-    'search_modifier_not_description_starts'              => 'Beskrivelsen starter ikkje med ":value"',
-    'search_modifier_description_ends'                    => 'Beskrivelsen slutter på ":value',
-    'search_modifier_not_description_ends'                => 'Beskrivelsen slutter ikkje på ":value',
-    'search_modifier_description_contains'                => 'Beskrivelsen inneheld ":value"',
-    'search_modifier_not_description_contains'            => 'Beskrivelsen inneheld ikkje ":value',
-    'search_modifier_description_is'                      => 'Beskrivelsen er nøyaktig ":value""',
-    'search_modifier_not_description_is'                  => 'Beskrivelsen er nøyaktig ikkje ":value',
+    'search_modifier_description_starts'                  => 'Beskrivinga byrjar med ":value',
+    'search_modifier_not_description_starts'              => 'Beskrivinga byrjar ikkje med ":value"',
+    'search_modifier_description_ends'                    => 'Beskrivinga sluttar på ":value',
+    'search_modifier_not_description_ends'                => 'Beskrivinga sluttar ikkje på ":value',
+    'search_modifier_description_contains'                => 'Beskrivinga inneheld ":value"',
+    'search_modifier_not_description_contains'            => 'Beskrivinga inneheld ikkje ":value',
+    'search_modifier_description_is'                      => 'Beskrivinga er nøyaktig ":value""',
+    'search_modifier_not_description_is'                  => 'Beskrivinga er nøyaktig ikkje ":value',
    'search_modifier_currency_is'                         => 'Transaksjon (fremmed) valuta er ":value"',
    'search_modifier_not_currency_is'                     => 'Transaksjon (fremmed) valuta er ikkje ":value"',
    'search_modifier_foreign_currency_is'                 => 'Transaksjonen for utenlansk valuta er ":value"',
    'search_modifier_not_foreign_currency_is'             => 'Transaksjonen fremmed valuta er ikkje ":value"',
-    'search_modifier_has_attachments'                     => 'Transaksjonen må ha minst ett vedlegg',
+    'search_modifier_has_attachments'                     => 'Transaksjonen må ha minst eit vedlegg',
    'search_modifier_has_no_category'                     => 'Transaksjonen kan ikkje ha nokon kategori',
    'search_modifier_not_has_no_category'                 => 'Transaksjonen må ha ein (hvilken som helst) kategori',
    'search_modifier_not_has_any_category'                => 'Transaksjonen må ikkje ha nokon kategori',
@ -399,50 +399,50 @@ return [
    'search_modifier_not_has_any_tag'                     => 'Transaksjonen kan ikkje ha tagger',
    'search_modifier_not_has_no_tag'                      => 'Transaksjonen må ha ein (hvilken som helst) tagg',
    'search_modifier_has_any_tag'                         => 'Transaksjonen må ha minst ein tagg',
-    'search_modifier_notes_contains'                      => 'Transaksjons notater inneheld ":value"',
-    'search_modifier_not_notes_contains'                  => 'Transaksjons notater inneheld ikkje ":value',
+    'search_modifier_notes_contains'                      => 'Transaksjonsnotata inneheld ":value"',
+    'search_modifier_not_notes_contains'                  => 'Transaksjonsnotata inneheld ikkje ":value',
    'search_modifier_notes_starts'                        => 'Transaksjons notat inneheld ":value"',
-    'search_modifier_not_notes_starts'                    => 'Transaksjons notater starter ikkje med ":value',
+    'search_modifier_not_notes_starts'                    => 'Transaksjonsnotata byrjar ikkje med ":value',
    'search_modifier_notes_ends'                          => 'Transaksjons notat ender med ":value"',
-    'search_modifier_not_notes_ends'                      => 'Transaksjons notater slutter ikkje med ":value',
-    'search_modifier_notes_is'                            => 'Transaksjons notater er eksakt ":value"',
-    'search_modifier_not_notes_is'                        => 'Transaksjons notater er nøyaktig ikkje ":value',
-    'search_modifier_no_notes'                            => 'Transaksjonen har ingen notater',
-    'search_modifier_not_no_notes'                        => 'Transaksjonen må ha notater',
-    'search_modifier_any_notes'                           => 'Transaksjonen må ha notater',
-    'search_modifier_not_any_notes'                       => 'Transaksjonen har ingen notater',
+    'search_modifier_not_notes_ends'                      => 'Transaksjonsnotata sluttar ikkje med ":value',
+    'search_modifier_notes_is'                            => 'Transaksjonsnotata er nøyaktig ":value"',
+    'search_modifier_not_notes_is'                        => 'Transaksjonsnotata er nøyaktig ikkje ":value',
+    'search_modifier_no_notes'                            => 'Transaksjonen har ingen notat',
+    'search_modifier_not_no_notes'                        => 'Transaksjonen må ha notat',
+    'search_modifier_any_notes'                           => 'Transaksjonen må ha notat',
+    'search_modifier_not_any_notes'                       => 'Transaksjonen har ingen notat',
    'search_modifier_amount_is'                           => 'Beløpet er nøyaktig :value',
    'search_modifier_not_amount_is'                       => 'Beløpet er ikkje :value',
    'search_modifier_amount_less'                         => 'Beløpet er mindre enn eller lik :value',
    'search_modifier_not_amount_more'                     => 'Beløpet er mindre enn eller lik :value',
    'search_modifier_amount_more'                         => 'Beløpet er meir enn eller lik :value',
    'search_modifier_not_amount_less'                     => 'Beløpet er meir enn eller lik :value',
-    'search_modifier_source_account_is'                   => 'Kjelde konto er eksakt ":value"',
+    'search_modifier_source_account_is'                   => 'Kjeldekonto er nøyaktig ":value"',
    'search_modifier_not_source_account_is'               => 'Kjeldekonto namn er ikkje ":value"',
    'search_modifier_source_account_contains'             => 'Kjeldekonto namn inneheld ":value"',
    'search_modifier_not_source_account_contains'         => 'Kjeldekonto namn inneheld ikkje ":value"',
-    'search_modifier_source_account_starts'               => 'Kjeldekonto namn starter med ":value"',
-    'search_modifier_not_source_account_starts'           => 'Kjeldekonto namn starter ikkje med ":value"',
-    'search_modifier_source_account_ends'                 => 'Kild konto namn slutter med ":value"',
-    'search_modifier_not_source_account_ends'             => 'Kjeldekonto namn slutter ikkje med ":value"',
+    'search_modifier_source_account_starts'               => 'Kjeldekonto namn byrjar med ":value"',
+    'search_modifier_not_source_account_starts'           => 'Kjeldekonto namn byrjar ikkje med ":value"',
+    'search_modifier_source_account_ends'                 => 'Kild konto namn sluttar med ":value"',
+    'search_modifier_not_source_account_ends'             => 'Kjeldekonto namn sluttar ikkje med ":value"',
    'search_modifier_source_account_id'                   => 'Kjeldekonto ID er :value',
    'search_modifier_not_source_account_id'               => 'Kjeldekonto ID er ikkje :value',
-    'search_modifier_source_account_nr_is'                => 'Kjelde kontonummer (IBAN) er ":value"',
+    'search_modifier_source_account_nr_is'                => 'Kjeldekontonummer (IBAN) er ":value"',
    'search_modifier_not_source_account_nr_is'            => 'Kjeldekonto nummer (IBAN) er ikkje ":value"',
-    'search_modifier_source_account_nr_contains'          => 'Kjelde kontonummer (IBAN) inneheld ":value"',
+    'search_modifier_source_account_nr_contains'          => 'Kjeldekontonummer (IBAN) inneheld ":value"',
    'search_modifier_not_source_account_nr_contains'      => 'Kjeldekonto nummer (IBAN) inneheld ikkje ":value"',
-    'search_modifier_source_account_nr_starts'            => 'Kjelde kontonummer (IBAN) starter med ":value"',
-    'search_modifier_not_source_account_nr_starts'        => 'Kjeldekonto nummer (IBAN) starter ikkje med ":value"',
-    'search_modifier_source_account_nr_ends'              => 'Kjeldekonto nummer (IBAN) slutter på ":value"',
-    'search_modifier_not_source_account_nr_ends'          => 'Kjeldekonto nummer (IBAN) slutter ikkje på ":value"',
-    'search_modifier_destination_account_is'              => 'Målkontonamn er eksakt ":value"',
+    'search_modifier_source_account_nr_starts'            => 'Kjeldekontonummer (IBAN) byrjar med ":value"',
+    'search_modifier_not_source_account_nr_starts'        => 'Kjeldekonto nummer (IBAN) byrjar ikkje med ":value"',
+    'search_modifier_source_account_nr_ends'              => 'Kjeldekonto nummer (IBAN) sluttar på ":value"',
+    'search_modifier_not_source_account_nr_ends'          => 'Kjeldekonto nummer (IBAN) sluttar ikkje på ":value"',
+    'search_modifier_destination_account_is'              => 'Målkontonamn er nøyaktig ":value"',
    'search_modifier_not_destination_account_is'          => 'Målkonto namn er ikkje ":value"',
    'search_modifier_destination_account_contains'        => 'Målkontonamnet inneheld ":value"',
    'search_modifier_not_destination_account_contains'    => 'Målkonto namn inneheld ikkje ":value"',
-    'search_modifier_destination_account_starts'          => 'Målkontonamnet starter med ":value"',
-    'search_modifier_not_destination_account_starts'      => 'Målkonto namn starter ikkje med ":value"',
-    'search_modifier_destination_account_ends'            => 'Målkonto namn slutter på ":value"',
-    'search_modifier_not_destination_account_ends'        => 'Målkonto namn slutter ikkje på ":value"',
+    'search_modifier_destination_account_starts'          => 'Målkontonamnet byrjar med ":value"',
+    'search_modifier_not_destination_account_starts'      => 'Målkonto namn byrjar ikkje med ":value"',
+    'search_modifier_destination_account_ends'            => 'Målkonto namn sluttar på ":value"',
+    'search_modifier_not_destination_account_ends'        => 'Målkonto namn sluttar ikkje på ":value"',
    'search_modifier_destination_account_id'              => 'Målkonto ID er :value',
    'search_modifier_not_destination_account_id'          => 'Målkonto ID er ikkje :value',
    'search_modifier_destination_is_cash'                 => 'Målkonto er "(cash)"-kontoen',
@ -453,9 +453,9 @@ return [
    'search_modifier_not_destination_account_nr_is'       => 'Målkonto nummer (IBAN) er ":value"',
    'search_modifier_destination_account_nr_contains'     => 'Målkontonummer (IBAN) inneheld ":value"',
    'search_modifier_not_destination_account_nr_contains' => 'Målkonto nummer (CIBAN) inneheld ikkje ":value"',
-    'search_modifier_destination_account_nr_starts'       => 'Målkontonummer (CIBAN) starter med ":value"',
-    'search_modifier_not_destination_account_nr_starts'   => 'Målkonto nummer (CIBAN) starter ikkje med ":value"',
-    'search_modifier_destination_account_nr_ends'         => 'Kjeldekontonummer (IBAN) slutter med ":value"',
+    'search_modifier_destination_account_nr_starts'       => 'Målkontonummer (CIBAN) byrjar med ":value"',
+    'search_modifier_not_destination_account_nr_starts'   => 'Målkonto nummer (CIBAN) byrjar ikkje med ":value"',
+    'search_modifier_destination_account_nr_ends'         => 'Kjeldekontonummer (IBAN) sluttar med ":value"',
    'search_modifier_not_destination_account_nr_ends'     => 'Målkonto nummer (CIBAN) ender ikkje med ":value"',
    'search_modifier_account_id'                          => 'Kjelde eller målkonto-IDer er: :value',
    'search_modifier_not_account_id'                      => 'Kjelde eller målkonto ID er/er ikkje: :value',
@ -490,56 +490,56 @@ return [
    'search_modifier_not_account_is'                      => 'Ingen av kontoane er ":value"',
    'search_modifier_account_contains'                    => 'Alle kontoane inneheld ":value"',
    'search_modifier_not_account_contains'                => 'Ingen av kontoane inneheld ":value"',
-    'search_modifier_account_ends'                        => 'Alle kontoane slutter med ":value"',
-    'search_modifier_not_account_ends'                    => 'Ingen av kontoane slutter med ":value"',
-    'search_modifier_account_starts'                      => 'Alle kontoane starter med ":value"',
-    'search_modifier_not_account_starts'                  => 'Ingen av kontoane begynner med ":value"',
+    'search_modifier_account_ends'                        => 'Alle kontoane sluttar med ":value"',
+    'search_modifier_not_account_ends'                    => 'Ingen av kontoane sluttar med ":value"',
+    'search_modifier_account_starts'                      => 'Alle kontoane byrjar med ":value"',
+    'search_modifier_not_account_starts'                  => 'Ingen av kontoane byrjar med ":value"',
    'search_modifier_account_nr_is'                       => 'Alle kontonummer / IBAN er ":value"',
    'search_modifier_not_account_nr_is'                   => 'Ingen kontonummer / IBAN er ":value"',
    'search_modifier_account_nr_contains'                 => 'Alle kontonummer / IBAN inneheld ":value"',
    'search_modifier_not_account_nr_contains'             => 'Ingen kontonummer / IBAN inneheld ":value"',
-    'search_modifier_account_nr_ends'                     => 'Alle kontonummer / IBAN slutter med ":value"',
-    'search_modifier_not_account_nr_ends'                 => 'Ingen kontonummer / IBAN slutter med ":value"',
-    'search_modifier_account_nr_starts'                   => 'Alle kontonummer / IBAN starter med ":value"',
-    'search_modifier_not_account_nr_starts'               => 'Ingen kontonummer / IBAN starter med ":value"',
+    'search_modifier_account_nr_ends'                     => 'Alle kontonummer / IBAN sluttar med ":value"',
+    'search_modifier_not_account_nr_ends'                 => 'Ingen kontonummer / IBAN sluttar med ":value"',
+    'search_modifier_account_nr_starts'                   => 'Alle kontonummer / IBAN byrjar med ":value"',
+    'search_modifier_not_account_nr_starts'               => 'Ingen kontonummer / IBAN byrjar med ":value"',
    'search_modifier_category_contains'                   => 'Kategorien inneheld ":value"',
    'search_modifier_not_category_contains'               => 'Kategorien inneheld ikkje ":value"',
-    'search_modifier_category_ends'                       => 'Kategorien slutter på ":value"',
-    'search_modifier_not_category_ends'                   => 'Kategorien slutter ikkje på ":value"',
-    'search_modifier_category_starts'                     => 'Kategorien starter med ":value"',
-    'search_modifier_not_category_starts'                 => 'Kategorien starter ikkje med ":value"',
+    'search_modifier_category_ends'                       => 'Kategorien sluttar på ":value"',
+    'search_modifier_not_category_ends'                   => 'Kategorien sluttar ikkje på ":value"',
+    'search_modifier_category_starts'                     => 'Kategorien byrjar med ":value"',
+    'search_modifier_not_category_starts'                 => 'Kategorien byrjar ikkje med ":value"',
    'search_modifier_budget_contains'                     => 'Budsjettet inneheld ":value"',
    'search_modifier_not_budget_contains'                 => 'Budsjettet inneheld ikkje ":value"',
-    'search_modifier_budget_ends'                         => 'Budsjettet slutter med ":value"',
-    'search_modifier_not_budget_ends'                     => 'Budsjettet slutter ikkje på ":value"',
-    'search_modifier_budget_starts'                       => 'Budsjettet begynner med ":value"',
-    'search_modifier_not_budget_starts'                   => 'Budsjettet starter ikkje med ":value"',
+    'search_modifier_budget_ends'                         => 'Budsjettet sluttar med ":value"',
+    'search_modifier_not_budget_ends'                     => 'Budsjettet sluttar ikkje på ":value"',
+    'search_modifier_budget_starts'                       => 'Budsjettet byrjar med ":value"',
+    'search_modifier_not_budget_starts'                   => 'Budsjettet byrjar ikkje med ":value"',
    'search_modifier_bill_contains'                       => 'Rekninga inneheld ":value"',
    'search_modifier_not_bill_contains'                   => 'Rekninga inneheld ikkje ":value"',
-    'search_modifier_bill_ends'                           => 'Rekning slutter med ":value"',
-    'search_modifier_not_bill_ends'                       => 'Rekninga slutter ikkje på ":value"',
-    'search_modifier_bill_starts'                         => 'Rekning begynner med ":value"',
-    'search_modifier_not_bill_starts'                     => 'Rekninga starter ikkje med ":value"',
+    'search_modifier_bill_ends'                           => 'Rekning sluttar med ":value"',
+    'search_modifier_not_bill_ends'                       => 'Rekning sluttar ikkje på ":value"',
+    'search_modifier_bill_starts'                         => 'Rekning byrjar med ":value"',
+    'search_modifier_not_bill_starts'                     => 'Rekninga byrjar ikkje med ":value"',
    'search_modifier_external_id_contains'                => 'Ekstern ID inneheld ":value"',
    'search_modifier_not_external_id_contains'            => 'Ekstern ID inneheld ikkje ":value"',
-    'search_modifier_external_id_ends'                    => 'Ekstern ID slutter med ":value"',
-    'search_modifier_not_external_id_ends'                => 'Ekstern ID slutter ikkje med ":value"',
-    'search_modifier_external_id_starts'                  => 'Ekstern ID starter med ":value"',
-    'search_modifier_not_external_id_starts'              => 'Ekstern ID starter ikkje med ":value"',
+    'search_modifier_external_id_ends'                    => 'Ekstern ID sluttar med ":value"',
+    'search_modifier_not_external_id_ends'                => 'Ekstern ID sluttar ikkje med ":value"',
+    'search_modifier_external_id_starts'                  => 'Ekstern ID byrjar med ":value"',
+    'search_modifier_not_external_id_starts'              => 'Ekstern ID byrjar ikkje med ":value"',
    'search_modifier_internal_reference_contains'         => 'Intern referanse inneheld ":value"',
    'search_modifier_not_internal_reference_contains'     => 'Intern referanse inneheld ikkje ":value"',
-    'search_modifier_internal_reference_ends'             => 'Intern referanse slutter med ":value"',
-    'search_modifier_internal_reference_starts'           => 'Intern referanse starter med ":value"',
-    'search_modifier_not_internal_reference_ends'         => 'Intern referanse slutter ikkje med ":value"',
-    'search_modifier_not_internal_reference_starts'       => 'Intern referanse begynner ikkje med ":value"',
+    'search_modifier_internal_reference_ends'             => 'Intern referanse sluttar med ":value"',
+    'search_modifier_internal_reference_starts'           => 'Intern referanse byrjar med ":value"',
+    'search_modifier_not_internal_reference_ends'         => 'Intern referanse sluttar ikkje med ":value"',
+    'search_modifier_not_internal_reference_starts'       => 'Intern referanse byrjar ikkje med ":value"',
    'search_modifier_external_url_is'                     => 'Ekstern URL er ":value"',
    'search_modifier_not_external_url_is'                 => 'Ekstern URL er ikkje ":value"',
    'search_modifier_external_url_contains'               => 'Ekstern URL inneheld ":value"',
    'search_modifier_not_external_url_contains'           => 'Ekstern URL inneheld ikkje ":value"',
-    'search_modifier_external_url_ends'                   => 'Ekstern URL slutter med ":value"',
-    'search_modifier_not_external_url_ends'               => 'Ekstern URL slutter ikkje med ":value"',
-    'search_modifier_external_url_starts'                 => 'Ekstern URL starter med ":value"',
-    'search_modifier_not_external_url_starts'             => 'Ekstern URL starter ikkje med ":value"',
+    'search_modifier_external_url_ends'                   => 'Ekstern URL sluttar med ":value"',
+    'search_modifier_not_external_url_ends'               => 'Ekstern URL sluttar ikkje med ":value"',
+    'search_modifier_external_url_starts'                 => 'Ekstern URL byrjar med ":value"',
+    'search_modifier_not_external_url_starts'             => 'Ekstern URL byrjar ikkje med ":value"',
    'search_modifier_has_no_attachments'                  => 'Transaksjonen har ingen vedlegg',
    'search_modifier_not_has_no_attachments'              => 'Transaksjonen har vedlegg',
    'search_modifier_not_has_attachments'                 => 'Transaksjonen har ingen vedlegg',
@ -691,20 +691,20 @@ return [

    'search_modifier_attachment_name_is'                  => 'Namn på vedlegg er ":value"',
    'search_modifier_attachment_name_contains'            => 'Namn på vedlegg inneheld ":value"',
-    'search_modifier_attachment_name_starts'              => 'Namn på vedlegg starter med ":value"',
-    'search_modifier_attachment_name_ends'                => 'Namn på vedlegg slutter med ":value"',
-    'search_modifier_attachment_notes_are'                => 'Notater på vedlegg er ":value"',
-    'search_modifier_attachment_notes_contains'           => 'Notater på vedlegg inneheld ":value"',
-    'search_modifier_attachment_notes_starts'             => 'Notater på vedlegg starter med ":value"',
-    'search_modifier_attachment_notes_ends'               => 'Notater på vedlegg slutter med ":value"',
+    'search_modifier_attachment_name_starts'              => 'Namn på vedlegg byrjar med ":value"',
+    'search_modifier_attachment_name_ends'                => 'Namn på vedlegg sluttar med ":value"',
+    'search_modifier_attachment_notes_are'                => 'Notat på eventuelle vedlegg er ":value"',
+    'search_modifier_attachment_notes_contains'           => 'Notat på eventuelle vedlegg inneheld ":value"',
+    'search_modifier_attachment_notes_starts'             => 'Notat på eventuelle vedlegg byrjar med ":value"',
+    'search_modifier_attachment_notes_ends'               => 'Notat på eventuelle vedlegg sluttar med ":value"',
    'search_modifier_not_attachment_name_is'              => 'Namn på vedlegg er ikkje ":value"',
    'search_modifier_not_attachment_name_contains'        => 'Namn på vedlegg inneheld ikkje ":value"',
-    'search_modifier_not_attachment_name_starts'          => 'Namn på vedlegg starter ikkje med ":value"',
-    'search_modifier_not_attachment_name_ends'            => 'Namn på vedlegg slutter ikkje med ":value"',
-    'search_modifier_not_attachment_notes_are'            => 'Notater på vedlegg er ikkje ":value"',
-    'search_modifier_not_attachment_notes_contains'       => 'Notater på vedlegg inneheld ikkje ":value"',
-    'search_modifier_not_attachment_notes_starts'         => 'Notater på vedlegg starter med ":value"',
-    'search_modifier_not_attachment_notes_ends'           => 'Notater på vedlegg slutter ikkje med ":value"',
+    'search_modifier_not_attachment_name_starts'          => 'Namn på vedlegg byrjar ikkje med ":value"',
+    'search_modifier_not_attachment_name_ends'            => 'Namn på vedlegg sluttar ikkje med ":value"',
+    'search_modifier_not_attachment_notes_are'            => 'Notat på eventuelle vedlegg er ikkje ":value"',
+    'search_modifier_not_attachment_notes_contains'       => 'Notat på eventuelle vedlegg inneheld ikkje ":value"',
+    'search_modifier_not_attachment_notes_starts'         => 'Notat på eventuelle vedlegg byrjar med ":value"',
+    'search_modifier_not_attachment_notes_ends'           => 'Notat på eventuelle vedlegg sluttar ikkje med ":value"',
    'search_modifier_sepa_ct_is'                          => 'SEPA CT er ":value"',
    'update_rule_from_query'                              => 'Oppdater regel ":rule" frå søk',
    'create_rule_from_query'                              => 'Lag ny regel frå søk',
@ -733,7 +733,7 @@ return [

    // repeat frequencies:
    'repeat_freq_yearly'                                  => 'årlig',
-    'repeat_freq_half-year'                               => 'hvert halvår',
+    'repeat_freq_half-year'                               => 'kvart halvår',
    'repeat_freq_quarterly'                               => 'kvartalsvis',
    'repeat_freq_monthly'                                 => 'månedlig',
    'repeat_freq_weekly'                                  => 'ukentlig',
@ -741,7 +741,7 @@ return [
    'daily'                                               => 'daglig',
    'weekly'                                              => 'ukentlig',
    'quarterly'                                           => 'kvartalsvis',
-    'half-year'                                           => 'hvert halvår',
+    'half-year'                                           => 'kvart halvår',
    'yearly'                                              => 'årlig',

    // rules
@ -816,10 +816,10 @@ return [


    // OLD values (remove non-doubles later):
-    'rule_trigger_source_account_starts_choice'           => 'Kjeldekonto namn starter med..',
-    'rule_trigger_source_account_starts'                  => 'Kjeldenamnet starter med ":trigger_value"',
-    'rule_trigger_source_account_ends_choice'             => 'Kjeldenamnet slutter med..',
-    'rule_trigger_source_account_ends'                    => 'Kjeldekontonamnet slutter med ":trigger_value"',
+    'rule_trigger_source_account_starts_choice'           => 'Kjeldekonto namn byrjar med..',
+    'rule_trigger_source_account_starts'                  => 'Kjeldenamnet byrjar med ":trigger_value"',
+    'rule_trigger_source_account_ends_choice'             => 'Kjeldenamnet sluttar med..',
+    'rule_trigger_source_account_ends'                    => 'Kjeldekontonamnet sluttar med ":trigger_value"',
    'rule_trigger_source_account_is_choice'               => 'Kjeldekonto namn er..',
    'rule_trigger_source_account_is'                      => 'Kjeldekonto namnet er ":trigger_value"',
    'rule_trigger_source_account_contains_choice'         => 'Kjeldekonto namn inneheld..',
@ -836,26 +836,26 @@ return [
    'rule_trigger_source_is_cash'                         => 'Kjeldekonto er (kontant) konto',
    'rule_trigger_destination_is_cash_choice'             => 'Målkonto er (kontant) konto',
    'rule_trigger_destination_is_cash'                    => 'Målkonto er (kontant) konto',
-    'rule_trigger_source_account_nr_starts_choice'        => 'Kjeldekontonummer / IBAN starter med..',
-    'rule_trigger_source_account_nr_starts'               => 'Kjeldekontoummer / IBAN starter med ":trigger_value"',
-    'rule_trigger_source_account_nr_ends_choice'          => 'Kjeldekontonummer / IBAN slutter med..',
-    'rule_trigger_source_account_nr_ends'                 => 'Kjeldekontoummer / IBAN slutter med ":trigger_value"',
+    'rule_trigger_source_account_nr_starts_choice'        => 'Kjeldekontonummer / IBAN byrjar med..',
+    'rule_trigger_source_account_nr_starts'               => 'Kjeldekontoummer / IBAN byrjar med ":trigger_value"',
+    'rule_trigger_source_account_nr_ends_choice'          => 'Kjeldekontonummer / IBAN sluttar med..',
+    'rule_trigger_source_account_nr_ends'                 => 'Kjeldekontoummer / IBAN sluttar med ":trigger_value"',
    'rule_trigger_source_account_nr_is_choice'            => 'Kjeldekontonummer / IBAN er..',
    'rule_trigger_source_account_nr_is'                   => 'Kjeldekontoummer / IBAN er ":trigger_value"',
-    'rule_trigger_source_account_nr_contains_choice'      => 'Kjelde kontonummer / IBAN inneheld..',
-    'rule_trigger_source_account_nr_contains'             => 'Kjelde kontonummer / IBAN inneheld ":trigger_value"',
-    'rule_trigger_destination_account_starts_choice'      => 'Målkontonamnet begynner med..',
-    'rule_trigger_destination_account_starts'             => 'Målkontonamnet starter med ":trigger_value"',
-    'rule_trigger_destination_account_ends_choice'        => 'Målkontonamnet slutter med..',
-    'rule_trigger_destination_account_ends'               => 'Målkonto namn slutter med ":trigger_value"',
-    'rule_trigger_destination_account_is_choice'          => 'Målkonto namn slutter med..',
+    'rule_trigger_source_account_nr_contains_choice'      => 'Kjeldekontonummer / IBAN inneheld..',
+    'rule_trigger_source_account_nr_contains'             => 'Kjeldekontonummer / IBAN inneheld ":trigger_value"',
+    'rule_trigger_destination_account_starts_choice'      => 'Målkontonamnet byrjar med..',
+    'rule_trigger_destination_account_starts'             => 'Målkontonamnet byrjar med ":trigger_value"',
+    'rule_trigger_destination_account_ends_choice'        => 'Målkontonamnet sluttar med..',
+    'rule_trigger_destination_account_ends'               => 'Målkonto namn sluttar med ":trigger_value"',
+    'rule_trigger_destination_account_is_choice'          => 'Målkonto namn sluttar med..',
    'rule_trigger_destination_account_is'                 => 'Målkontonamn er ":trigger_value"',
    'rule_trigger_destination_account_contains_choice'    => 'Målkontonamn inneheld..',
    'rule_trigger_destination_account_contains'           => 'Målkontonamnet inneheld ":trigger_value"',
-    'rule_trigger_destination_account_nr_starts_choice'   => 'Målkontonummer / IBAN starter med..',
-    'rule_trigger_destination_account_nr_starts'          => 'Målkontonummer / IBAN starter med ":trigger_value"',
-    'rule_trigger_destination_account_nr_ends_choice'     => 'Målkontonummer / IBAN slutter med..',
-    'rule_trigger_destination_account_nr_ends'            => 'Målkontonummer / IBAN slutter med ":trigger_value"',
+    'rule_trigger_destination_account_nr_starts_choice'   => 'Målkontonummer / IBAN byrjar med..',
+    'rule_trigger_destination_account_nr_starts'          => 'Målkontonummer / IBAN byrjar med ":trigger_value"',
+    'rule_trigger_destination_account_nr_ends_choice'     => 'Målkontonummer / IBAN sluttar med..',
+    'rule_trigger_destination_account_nr_ends'            => 'Målkontonummer / IBAN sluttar med ":trigger_value"',
    'rule_trigger_destination_account_nr_is_choice'       => 'Målkontonummer / IBAN er..',
    'rule_trigger_destination_account_nr_is'              => 'Målkontonummer / IBAN er ":trigger_value"',
    'rule_trigger_destination_account_nr_contains_choice' => 'Målkontonummer / IBAN inneheld..',
@ -870,14 +870,14 @@ return [
    'rule_trigger_amount_is'                              => 'Beløpet er :trigger_value',
    'rule_trigger_amount_more_choice'                     => 'Beløpet er meir enn..',
    'rule_trigger_amount_more'                            => 'Beløpet er meir enn :trigger_value',
-    'rule_trigger_description_starts_choice'              => 'Beskrivelse starter med..',
-    'rule_trigger_description_starts'                     => 'Beskrivelse starter med ":trigger_value"',
-    'rule_trigger_description_ends_choice'                => 'Beskrivelse slutter med..',
-    'rule_trigger_description_ends'                       => 'Beskrivelse slutter med ":trigger_value"',
-    'rule_trigger_description_contains_choice'            => 'Beskrivelse inneheld..',
-    'rule_trigger_description_contains'                   => 'Beskrivelse inneheld ":trigger_value"',
-    'rule_trigger_description_is_choice'                  => 'Beskrivelse er..',
-    'rule_trigger_description_is'                         => 'Beskrivelse er ":trigger_value"',
+    'rule_trigger_description_starts_choice'              => 'Beskrivinga byrjar med..',
+    'rule_trigger_description_starts'                     => 'Beskrivinga byrjar med ":trigger_value"',
+    'rule_trigger_description_ends_choice'                => 'Beskrivinga sluttar med..',
+    'rule_trigger_description_ends'                       => 'Beskrivinga sluttar med ":trigger_value"',
+    'rule_trigger_description_contains_choice'            => 'Beskrivinga inneheld..',
+    'rule_trigger_description_contains'                   => 'Beskrivinga inneheld ":trigger_value"',
+    'rule_trigger_description_is_choice'                  => 'Beskrivinga er..',
+    'rule_trigger_description_is'                         => 'Beskrivinga er ":trigger_value"',
    'rule_trigger_date_on_choice'                         => 'Transaksjonsdato er..',
    'rule_trigger_date_on'                                => 'Transaksjons dato er ":trigger_value"',
    'rule_trigger_date_before_choice'                     => 'Transaksjons dato er før..',
@ -914,18 +914,18 @@ return [
    'rule_trigger_has_no_tag'                             => 'Transaksjonen har ingen tagger',
    'rule_trigger_has_any_tag_choice'                     => 'Har ein eller fleire tagger',
    'rule_trigger_has_any_tag'                            => 'Transaksjonen har ein eller fleire tagger',
-    'rule_trigger_any_notes_choice'                       => 'Har ett eller fleire notater',
-    'rule_trigger_any_notes'                              => 'Transaksjonen har ett eller fleire notater',
-    'rule_trigger_no_notes_choice'                        => 'Har ingen notater',
-    'rule_trigger_no_notes'                               => 'Transaksjonen har ingen notater',
-    'rule_trigger_notes_is_choice'                        => 'Notater er..',
-    'rule_trigger_notes_is'                               => 'Notater er ":trigger_value"',
-    'rule_trigger_notes_contains_choice'                  => 'Notater inneheld..',
-    'rule_trigger_notes_contains'                         => 'Notater inneheld ":trigger_value"',
-    'rule_trigger_notes_starts_choice'                    => 'Notater begynner med..',
-    'rule_trigger_notes_starts'                           => 'Notater som starter med ":trigger_value"',
-    'rule_trigger_notes_ends_choice'                      => 'Notater som slutter med..',
-    'rule_trigger_notes_ends'                             => 'Notater som slutter med ":trigger_value"',
+    'rule_trigger_any_notes_choice'                       => 'Har notat',
+    'rule_trigger_any_notes'                              => 'Transaksjonen har notat',
+    'rule_trigger_no_notes_choice'                        => 'Har ikkje notat',
+    'rule_trigger_no_notes'                               => 'Transaksjonen har ikkje notat',
+    'rule_trigger_notes_is_choice'                        => 'Notat er..',
+    'rule_trigger_notes_is'                               => 'Notat er ":trigger_value"',
+    'rule_trigger_notes_contains_choice'                  => 'Notat inneheld..',
+    'rule_trigger_notes_contains'                         => 'Notat inneheld ":trigger_value"',
+    'rule_trigger_notes_starts_choice'                    => 'Notat byrjar med..',
+    'rule_trigger_notes_starts'                           => 'Notat byrjar med ":trigger_value"',
+    'rule_trigger_notes_ends_choice'                      => 'Notat sluttar med..',
+    'rule_trigger_notes_ends'                             => 'Notat sluttar med ":trigger_value"',
    'rule_trigger_bill_is_choice'                         => 'Rekning er..',
    'rule_trigger_bill_is'                                => 'Rekning er ":trigger_value"',
    'rule_trigger_external_id_is_choice'                  => 'Ekstern ID er..',
@ -948,63 +948,63 @@ return [
    'rule_trigger_tag_is_not_choice'                      => 'Ingen tag er..',
    'rule_trigger_tag_is_not'                             => 'Ingen tag er ":trigger_value"',
    'rule_trigger_account_is_choice'                      => 'Ein av kontoane er nøyaktig..',
-    'rule_trigger_account_is'                             => 'Ein av kontoane er eksakt ":trigger_value"',
+    'rule_trigger_account_is'                             => 'Ein av kontoane er nøyaktig ":trigger_value"',
    'rule_trigger_account_contains_choice'                => 'Ein av kontoane inneheld..',
    'rule_trigger_account_contains'                       => 'Ein av kontoane inneheld ":trigger_value"',
-    'rule_trigger_account_ends_choice'                    => 'Ein av kontoane slutter med..',
-    'rule_trigger_account_ends'                           => 'Beskrivelse slutter med ":trigger_value"',
-    'rule_trigger_account_starts_choice'                  => 'Ein av kontoane starter med..',
-    'rule_trigger_account_starts'                         => 'Ein av kontoane starter med ":trigger_value"',
+    'rule_trigger_account_ends_choice'                    => 'Ein av kontoane sluttar med..',
+    'rule_trigger_account_ends'                           => 'Beskrivinga sluttar med ":trigger_value"',
+    'rule_trigger_account_starts_choice'                  => 'Ein av kontoane byrjar med..',
+    'rule_trigger_account_starts'                         => 'Ein av kontoane byrjar med ":trigger_value"',
    'rule_trigger_account_nr_is_choice'                   => 'Ein av kontoanes nummer / IBAN er..',
    'rule_trigger_account_nr_is'                          => 'Kontonummer / IBAN er ":trigger_value"',
    'rule_trigger_account_nr_contains_choice'             => 'Kontonummer / IBAN inneheld..',
    'rule_trigger_account_nr_contains'                    => 'Alle kontonummer / IBAN inneheld ":trigger_value"',
-    'rule_trigger_account_nr_ends_choice'                 => 'Alle kontonummer / IBAN slutter med..',
-    'rule_trigger_account_nr_ends'                        => 'Alle kontonummer / IBAN slutter med ":trigger_value"',
-    'rule_trigger_account_nr_starts_choice'               => 'Alle kontonummer / IBAN starter med..',
-    'rule_trigger_account_nr_starts'                      => 'Alle kontonummer / IBAN starter med ":trigger_value"',
+    'rule_trigger_account_nr_ends_choice'                 => 'Alle kontonummer / IBAN sluttar med..',
+    'rule_trigger_account_nr_ends'                        => 'Alle kontonummer / IBAN sluttar med ":trigger_value"',
+    'rule_trigger_account_nr_starts_choice'               => 'Alle kontonummer / IBAN byrjar med..',
+    'rule_trigger_account_nr_starts'                      => 'Alle kontonummer / IBAN byrjar med ":trigger_value"',
    'rule_trigger_category_contains_choice'               => 'Kategori inneheld..',
    'rule_trigger_category_contains'                      => 'Kategorien inneheld ":trigger_value"',
    'rule_trigger_category_ends_choice'                   => 'Kategori slutter med..',
-    'rule_trigger_category_ends'                          => 'Kategorien slutter med ":trigger_value',
-    'rule_trigger_category_starts_choice'                 => 'Kategori starter med..',
-    'rule_trigger_category_starts'                        => 'Kategorien starter med ":trigger_value',
+    'rule_trigger_category_ends'                          => 'Kategorien sluttar med ":trigger_value',
+    'rule_trigger_category_starts_choice'                 => 'Kategori byrjar med..',
+    'rule_trigger_category_starts'                        => 'Kategorien byrjar med ":trigger_value',
    'rule_trigger_budget_contains_choice'                 => 'Budsjett inneheld..',
    'rule_trigger_budget_contains'                        => 'Budsjettet inneheld ":trigger_value',
-    'rule_trigger_budget_ends_choice'                     => 'Budsjettet slutter med..',
-    'rule_trigger_budget_ends'                            => 'Budsjettet slutter med ":trigger_value"',
-    'rule_trigger_budget_starts_choice'                   => 'Budsjettet starter med..',
-    'rule_trigger_budget_starts'                          => 'Budsjettet begynner med ":trigger_value"',
+    'rule_trigger_budget_ends_choice'                     => 'Budsjettet sluttar med..',
+    'rule_trigger_budget_ends'                            => 'Budsjettet sluttar med ":trigger_value"',
+    'rule_trigger_budget_starts_choice'                   => 'Budsjettet byrjar med..',
+    'rule_trigger_budget_starts'                          => 'Budsjettet byrjar med ":trigger_value"',
    'rule_trigger_bill_contains_choice'                   => 'Rekning inneheld..',
    'rule_trigger_bill_contains'                          => 'Rekninga inneheld ":trigger_value"',
-    'rule_trigger_bill_ends_choice'                       => 'Rekninga slutter med..',
-    'rule_trigger_bill_ends'                              => 'Rekning slutter med ":trigger_value"',
-    'rule_trigger_bill_starts_choice'                     => 'Rekninga starter med..',
-    'rule_trigger_bill_starts'                            => 'Rekning begynner med ":trigger_value"',
+    'rule_trigger_bill_ends_choice'                       => 'Rekninga sluttar med..',
+    'rule_trigger_bill_ends'                              => 'Rekning sluttar med ":trigger_value"',
+    'rule_trigger_bill_starts_choice'                     => 'Rekninga byrjar med..',
+    'rule_trigger_bill_starts'                            => 'Rekning byrjar med ":trigger_value"',
    'rule_trigger_external_id_contains_choice'            => 'Ekstern ID inneheld..',
    'rule_trigger_external_id_contains'                   => 'Ekstern ID inneheld ":trigger_value"',
-    'rule_trigger_external_id_ends_choice'                => 'Ekstern ID slutter med..',
-    'rule_trigger_external_id_ends'                       => 'Ekstern ID slutter med ":trigger_value"',
-    'rule_trigger_external_id_starts_choice'              => 'Ekstern ID starter med..',
-    'rule_trigger_external_id_starts'                     => 'Ekstern ID starter med ":trigger_value"',
+    'rule_trigger_external_id_ends_choice'                => 'Ekstern ID sluttar med..',
+    'rule_trigger_external_id_ends'                       => 'Ekstern ID sluttar med ":trigger_value"',
+    'rule_trigger_external_id_starts_choice'              => 'Ekstern ID byrjar med..',
+    'rule_trigger_external_id_starts'                     => 'Ekstern ID byrjar med ":trigger_value"',
    'rule_trigger_internal_reference_contains_choice'     => 'Intern referanse inneheld..',
    'rule_trigger_internal_reference_contains'            => 'Ekstern referanse ":trigger_value"',
    'rule_trigger_internal_reference_ends_choice'         => 'Intern referanse ender med..',
    'rule_trigger_internal_reference_ends'                => 'Intern referanse ender med ":trigger_value"',
-    'rule_trigger_internal_reference_starts_choice'       => 'Intern referanse begynner med..',
-    'rule_trigger_internal_reference_starts'              => 'Intern referanse starter med ":trigger_value"',
+    'rule_trigger_internal_reference_starts_choice'       => 'Intern referanse byrjar med..',
+    'rule_trigger_internal_reference_starts'              => 'Intern referanse byrjar med ":trigger_value"',
    'rule_trigger_external_url_is_choice'                 => 'Ekstern URL er..',
    'rule_trigger_external_url_is'                        => 'Ekstern URL er ":trigger_value"',
    'rule_trigger_external_url_contains_choice'           => 'Ekstern URL inneheld..',
    'rule_trigger_external_url_contains'                  => 'Ekstern URL inneheld ":trigger_value"',
-    'rule_trigger_external_url_ends_choice'               => 'Ekstern URL slutter med..',
-    'rule_trigger_external_url_ends'                      => 'Ekstern URL slutter med ":trigger_value"',
-    'rule_trigger_external_url_starts_choice'             => 'Ekstern URL starter med..',
-    'rule_trigger_external_url_starts'                    => 'Ekstern URL starter med ":trigger_value"',
+    'rule_trigger_external_url_ends_choice'               => 'Ekstern URL sluttar med..',
+    'rule_trigger_external_url_ends'                      => 'Ekstern URL sluttar med ":trigger_value"',
+    'rule_trigger_external_url_starts_choice'             => 'Ekstern URL byrjar med..',
+    'rule_trigger_external_url_starts'                    => 'Ekstern URL byrjar med ":trigger_value"',
    'rule_trigger_has_no_attachments_choice'              => 'Har ingen vedlegg',
    'rule_trigger_has_no_attachments'                     => 'Transaksjonen har ingen vedlegg',
-    'rule_trigger_recurrence_id_choice'                   => 'Gjentakende transaksjons ID er..',
-    'rule_trigger_recurrence_id'                          => 'Gjentakende transaksjons ID er ":trigger_value"',
+    'rule_trigger_recurrence_id_choice'                   => 'Gjentakande transaksjons ID er..',
+    'rule_trigger_recurrence_id'                          => 'Gjentakande transaksjons ID er ":trigger_value"',
    'rule_trigger_interest_date_on_choice'                => 'Rentedato er..',
    'rule_trigger_interest_date_on'                       => 'Rentedato er ":trigger_value"',
    'rule_trigger_interest_date_before_choice'            => 'Rentedato er før..',
@ -1055,22 +1055,22 @@ return [
    'rule_trigger_foreign_amount_less'                    => 'Utenlandske beløpet er mindre enn ":trigger_value"',
    'rule_trigger_foreign_amount_more_choice'             => 'Utenlandske beløpet er meir enn..',
    'rule_trigger_foreign_amount_more'                    => 'Utenlandske beløpet er meir enn ":trigger_value',
-    'rule_trigger_attachment_name_is_choice'              => 'Ethvert vedlagte namn er..',
-    'rule_trigger_attachment_name_is'                     => 'Ethvert vedlagte namn er ":trigger_value"',
+    'rule_trigger_attachment_name_is_choice'              => 'Eventuelle vedlagte namn er..',
+    'rule_trigger_attachment_name_is'                     => 'Namn på eventuelle vedlegg er ":trigger_value"',
    'rule_trigger_attachment_name_contains_choice'        => 'Eventuelle vedlagte namn inneheld..',
    'rule_trigger_attachment_name_contains'               => 'Eventuelle vedlagte namn inneheld ":trigger_value"',
-    'rule_trigger_attachment_name_starts_choice'          => 'Ethvert vedlagte namn starter med..',
-    'rule_trigger_attachment_name_starts'                 => 'Eventuelle vedlagte namn starter med ":trigger_value"',
-    'rule_trigger_attachment_name_ends_choice'            => 'Eventuelle vedlegg slutter med..',
-    'rule_trigger_attachment_name_ends'                   => 'Eventuelle vedlagte namn slutter med ":trigger_value"',
-    'rule_trigger_attachment_notes_are_choice'            => 'Eventuelle vedlagte notater er..',
-    'rule_trigger_attachment_notes_are'                   => 'Eventuelle vedlagte notater er ":trigger_value"',
-    'rule_trigger_attachment_notes_contains_choice'       => 'Eventuelle vedlagte notater inneheld..',
-    'rule_trigger_attachment_notes_contains'              => 'Eventuelle vedlagte notater inneheld ":trigger_value"',
-    'rule_trigger_attachment_notes_starts_choice'         => 'Eventuelle vedlagte notater starter med..',
-    'rule_trigger_attachment_notes_starts'                => 'Eventuelle vedlagte notater starter med ":trigger_value"',
-    'rule_trigger_attachment_notes_ends_choice'           => 'Eventuelle vedlagte notater slutter med..',
-    'rule_trigger_attachment_notes_ends'                  => 'Eventuelle vedlagte notater ferdig med ":trigger_value"',
+    'rule_trigger_attachment_name_starts_choice'          => 'Namn på eventuelle vedlegg byrjar med..',
+    'rule_trigger_attachment_name_starts'                 => 'Eventuelle vedlagte namn byrjar med ":trigger_value"',
+    'rule_trigger_attachment_name_ends_choice'            => 'Eventuelle vedlegg sluttar med..',
+    'rule_trigger_attachment_name_ends'                   => 'Eventuelle vedlagte namn sluttar med ":trigger_value"',
+    'rule_trigger_attachment_notes_are_choice'            => 'Notat på eventuelle vedlegg er..',
+    'rule_trigger_attachment_notes_are'                   => 'Notat på eventuelle vedlegg er ":trigger_value"',
+    'rule_trigger_attachment_notes_contains_choice'       => 'Notat på eventuelle vedlegg inneheld..',
+    'rule_trigger_attachment_notes_contains'              => 'Notat på eventuelle vedlegg inneheld ":trigger_value"',
+    'rule_trigger_attachment_notes_starts_choice'         => 'Notat på eventuelle vedlegg byrjar med..',
+    'rule_trigger_attachment_notes_starts'                => 'Notat på eventuelle vedlegg byrjar med ":trigger_value"',
+    'rule_trigger_attachment_notes_ends_choice'           => 'Notat på eventuelle vedlegg sluttar med..',
+    'rule_trigger_attachment_notes_ends'                  => 'Notat på eventuelle vedlegg sluttar med ":trigger_value"',
    'rule_trigger_reconciled_choice'                      => 'Transaksjonen er avstemt',
    'rule_trigger_reconciled'                             => 'Transaksjonen er avstemt',
    'rule_trigger_exists_choice'                          => 'Alle transaksjonar matcher(!)',
@ -1083,67 +1083,67 @@ return [
    'rule_trigger_not_transaction_type'                   => 'Transaksjonstype er ikkje ":trigger_value"',
    'rule_trigger_not_tag_is'                             => 'Taggen er ikkje ":trigger_value"',
    'rule_trigger_not_tag_is_not'                         => 'Taggen er ":trigger_value"',
-    'rule_trigger_not_description_is'                     => 'Beskrivelsen er ikkje ":trigger_value"',
-    'rule_trigger_not_description_contains'               => 'Beskrivelsen inneheld ikkje',
-    'rule_trigger_not_description_ends'                   => 'Beskrivelsen slutter ikkje med ":trigger_value"',
-    'rule_trigger_not_description_starts'                 => 'Beskrivelsen starter ikkje med ":trigger_value"',
+    'rule_trigger_not_description_is'                     => 'Beskrivinga er ikkje ":trigger_value"',
+    'rule_trigger_not_description_contains'               => 'Beskrivinga inneheld ikkje',
+    'rule_trigger_not_description_ends'                   => 'Beskrivinga sluttar ikkje med ":trigger_value"',
+    'rule_trigger_not_description_starts'                 => 'Beskrivinga byrjar ikkje med ":trigger_value"',
    'rule_trigger_not_notes_is'                           => 'Notata er ikkje ":trigger_value"',
    'rule_trigger_not_notes_contains'                     => 'Notata inneheld ikkje ":trigger_value"',
-    'rule_trigger_not_notes_ends'                         => 'Notata slutter ikkje på ":trigger_value"',
-    'rule_trigger_not_notes_starts'                       => 'Notata begynner ikkje med ":trigger_value"',
+    'rule_trigger_not_notes_ends'                         => 'Notata sluttar ikkje på ":trigger_value"',
+    'rule_trigger_not_notes_starts'                       => 'Notata byrjar ikkje med ":trigger_value"',
    'rule_trigger_not_source_account_is'                  => 'Kjeldekonto er ikkje ":trigger_value"',
    'rule_trigger_not_source_account_contains'            => 'Kjeldekonto inneheld ikkje ":trigger_value"',
    'rule_trigger_not_source_account_ends'                => 'Kjeldekontoen inneheld ":trigger_value"',
-    'rule_trigger_not_source_account_starts'              => 'Kjeldekontoen starter ikkje med ":trigger_value"',
-    'rule_trigger_not_source_account_nr_is'               => 'Kjelde kontonummer / IBAN er ikkje ":trigger_value"',
-    'rule_trigger_not_source_account_nr_contains'         => 'Kjelde kontonummer / IBAN inneheld ikkje ":trigger_value"',
-    'rule_trigger_not_source_account_nr_ends'             => 'Kjelde kontonummer / IBAN slutter ikkje på ":trigger_value"',
-    'rule_trigger_not_source_account_nr_starts'           => 'Kjelde kontoummer / IBAN starter ikkje med ":trigger_value"',
+    'rule_trigger_not_source_account_starts'              => 'Kjeldekontoen byrjar ikkje med ":trigger_value"',
+    'rule_trigger_not_source_account_nr_is'               => 'Kjeldekontonummer / IBAN er ikkje ":trigger_value"',
+    'rule_trigger_not_source_account_nr_contains'         => 'Kjeldekontonummer / IBAN inneheld ikkje ":trigger_value"',
+    'rule_trigger_not_source_account_nr_ends'             => 'Kjeldekontonummer / IBAN sluttar ikkje på ":trigger_value"',
+    'rule_trigger_not_source_account_nr_starts'           => 'Kjeldekontoummer / IBAN byrjar ikkje med ":trigger_value"',
    'rule_trigger_not_destination_account_is'             => 'Målkonto er ikkje ":trigger_value"',
    'rule_trigger_not_destination_account_contains'       => 'Målkonto inneheld ikkje ":trigger_value"',
-    'rule_trigger_not_destination_account_ends'           => 'Målkonto slutter ikkje på ":trigger_value"',
-    'rule_trigger_not_destination_account_starts'         => 'Målkonto starter ikkje med ":trigger_value"',
+    'rule_trigger_not_destination_account_ends'           => 'Målkonto sluttar ikkje på ":trigger_value"',
+    'rule_trigger_not_destination_account_starts'         => 'Målkonto byrjar ikkje med ":trigger_value"',
    'rule_trigger_not_destination_account_nr_is'          => 'Målkonto nummer / IBAN er ikkje ":trigger_value"',
    'rule_trigger_not_destination_account_nr_contains'    => 'Målkonto nummer / IBAN inneheld ikkje ":trigger_value"',
-    'rule_trigger_not_destination_account_nr_ends'        => 'Målkonto nummer / IBAN slutter ikkje på ":trigger_value"',
-    'rule_trigger_not_destination_account_nr_starts'      => 'Målkonto nummer / IBAN begynner ikkje med ":trigger_value"',
+    'rule_trigger_not_destination_account_nr_ends'        => 'Målkonto nummer / IBAN sluttar ikkje på ":trigger_value"',
+    'rule_trigger_not_destination_account_nr_starts'      => 'Målkonto nummer / IBAN byrjar ikkje med ":trigger_value"',
    'rule_trigger_not_account_is'                         => 'Ingen konto er ":trigger_value"',
    'rule_trigger_not_account_contains'                   => 'Ingen konto inneheld ":trigger_value"',
-    'rule_trigger_not_account_ends'                       => 'Ingen konto slutter på ":trigger_value"',
-    'rule_trigger_not_account_starts'                     => 'Ingen konto begynner med ":trigger_value"',
+    'rule_trigger_not_account_ends'                       => 'Ingen konto sluttar på ":trigger_value"',
+    'rule_trigger_not_account_starts'                     => 'Ingen konto byrjar med ":trigger_value"',
    'rule_trigger_not_account_nr_is'                      => 'Ingen kontonummer / IBAN er ":trigger_value"',
    'rule_trigger_not_account_nr_contains'                => 'Ingen kontonummer / IBAN inneheld ":trigger_value"',
-    'rule_trigger_not_account_nr_ends'                    => 'Ingen kontonummer / IBAN slutter på":trigger_value"',
-    'rule_trigger_not_account_nr_starts'                  => 'Ingen kontonummer / IBAN starter med ":trigger_value"',
+    'rule_trigger_not_account_nr_ends'                    => 'Ingen kontonummer / IBAN sluttar på":trigger_value"',
+    'rule_trigger_not_account_nr_starts'                  => 'Ingen kontonummer / IBAN byrjar med ":trigger_value"',
    'rule_trigger_not_category_is'                        => 'Kategori er ikkje ":trigger_value"',
    'rule_trigger_not_category_contains'                  => 'Kategori inneheld ikkje ":trigger_value"',
-    'rule_trigger_not_category_ends'                      => 'Kategori slutter ikkje på ":trigger_value"',
-    'rule_trigger_not_category_starts'                    => 'Kategori starter ikkje med ":trigger_value"',
+    'rule_trigger_not_category_ends'                      => 'Kategori sluttar ikkje på ":trigger_value"',
+    'rule_trigger_not_category_starts'                    => 'Kategori byrjar ikkje med ":trigger_value"',
    'rule_trigger_not_budget_is'                          => 'Budsjett er ikkje ":trigger_value"',
    'rule_trigger_not_budget_contains'                    => 'Budsjett inneheld ikkje ":trigger_value"',
-    'rule_trigger_not_budget_ends'                        => 'Budsjett slutter ikkje på ":trigger_value"',
-    'rule_trigger_not_budget_starts'                      => 'Budsjettet starter ikkje med ":trigger_value"',
+    'rule_trigger_not_budget_ends'                        => 'Budsjett sluttar ikkje på ":trigger_value"',
+    'rule_trigger_not_budget_starts'                      => 'Budsjettet byrjar ikkje med ":trigger_value"',
    'rule_trigger_not_bill_is'                            => 'Rekninga er ikkje ":trigger_value"',
    'rule_trigger_not_bill_contains'                      => 'Rekninga inneheld ikkje ":trigger_value"',
-    'rule_trigger_not_bill_ends'                          => 'Rekninga slutter ikkje på ":trigger_value"',
-    'rule_trigger_not_bill_starts'                        => 'Rekninga slutter ikkje med ":trigger_value"',
+    'rule_trigger_not_bill_ends'                          => 'Rekninga sluttar ikkje på ":trigger_value"',
+    'rule_trigger_not_bill_starts'                        => 'Rekninga sluttar ikkje med ":trigger_value"',
    'rule_trigger_not_external_id_is'                     => 'Ekstern ID er ikkje ":trigger_value"',
    'rule_trigger_not_external_id_contains'               => 'Ekstern ID inneheld ikkje ":trigger_value"',
-    'rule_trigger_not_external_id_ends'                   => 'Ekstern ID slutter ikkje på ":trigger_value"',
-    'rule_trigger_not_external_id_starts'                 => 'Ekstern ID starter ikkje med ":trigger_value"',
+    'rule_trigger_not_external_id_ends'                   => 'Ekstern ID sluttar ikkje på ":trigger_value"',
+    'rule_trigger_not_external_id_starts'                 => 'Ekstern ID byrjar ikkje med ":trigger_value"',
    'rule_trigger_not_internal_reference_is'              => 'Intern referanse er ikkje ":trigger_value"',
    'rule_trigger_not_internal_reference_contains'        => 'Intern referanse inneheld ikkje ":trigger_value"',
-    'rule_trigger_not_internal_reference_ends'            => 'Intern referanse slutter ikkje på ":trigger_value"',
-    'rule_trigger_not_internal_reference_starts'          => 'Intern referanse begynner ikkje med ":trigger_value"',
+    'rule_trigger_not_internal_reference_ends'            => 'Intern referanse sluttar ikkje på ":trigger_value"',
+    'rule_trigger_not_internal_reference_starts'          => 'Intern referanse byrjar ikkje med ":trigger_value"',
    'rule_trigger_not_external_url_is'                    => 'Ekstern URL er ikkje ":trigger_value"',
    'rule_trigger_not_external_url_contains'              => 'Ekstern URL inneheld ikkje ":trigger_value"',
-    'rule_trigger_not_external_url_ends'                  => 'Ekstern URL slutter ikkje på ":trigger_value"',
-    'rule_trigger_not_external_url_starts'                => 'Ekstern URL starter ikkje med ":trigger_value"',
+    'rule_trigger_not_external_url_ends'                  => 'Ekstern URL sluttar ikkje på ":trigger_value"',
+    'rule_trigger_not_external_url_starts'                => 'Ekstern URL byrjar ikkje med ":trigger_value"',
    'rule_trigger_not_currency_is'                        => 'Valuta er ikkje ":trigger_value"',
    'rule_trigger_not_foreign_currency_is'                => 'Fremmed valuta er ikkje ":trigger_value"',
    'rule_trigger_not_id'                                 => 'Transaksjons ID er ikkje ":trigger_value"',
    'rule_trigger_not_journal_id'                         => 'Transaksjonens journal ID er ikkje ":trigger_value"',
-    'rule_trigger_not_recurrence_id'                      => 'Gjentakende ID er ikkje ":trigger_value"',
+    'rule_trigger_not_recurrence_id'                      => 'Gjentakande ID er ikkje ":trigger_value"',
    'rule_trigger_not_date_on'                            => 'Datoen er ikkje på ":trigger_value"',
    'rule_trigger_not_date_before'                        => 'Dato er ikkje før ":trigger_value"',
    'rule_trigger_not_date_after'                         => 'Datoen er ikkje etter ":trigger_value"',
@ -1179,12 +1179,12 @@ return [
    'rule_trigger_not_foreign_amount_more'                => 'Utenlandsk transaksjonsbeløp er mindre enn ":trigger_value"',
    'rule_trigger_not_attachment_name_is'                 => 'Ingen vedlegg heter ":trigger_value"',
    'rule_trigger_not_attachment_name_contains'           => 'Intet vedleggsnamn inneheld ":trigger_value"',
-    'rule_trigger_not_attachment_name_starts'             => 'Ingen vedleggsnamn starter med ":trigger_value"',
-    'rule_trigger_not_attachment_name_ends'               => 'Ingen vedleggsnamn slutter på ":trigger_value"',
-    'rule_trigger_not_attachment_notes_are'               => 'Ingen vedlagte notater er ":trigger_value"',
-    'rule_trigger_not_attachment_notes_contains'          => 'Ingen vedlagte notater inneheld ":trigger_value"',
-    'rule_trigger_not_attachment_notes_starts'            => 'Ingen vedlagte notater starter med ":trigger_value"',
-    'rule_trigger_not_attachment_notes_ends'              => 'Ingen vedlagte notater slutter på ":trigger_value"',
+    'rule_trigger_not_attachment_name_starts'             => 'Ingen vedleggsnamn byrjar med ":trigger_value"',
+    'rule_trigger_not_attachment_name_ends'               => 'Ingen vedleggsnamn sluttar på ":trigger_value"',
+    'rule_trigger_not_attachment_notes_are'               => 'Ingen vedlagte notat er ":trigger_value"',
+    'rule_trigger_not_attachment_notes_contains'          => 'Ingen vedlagte notat inneheld ":trigger_value"',
+    'rule_trigger_not_attachment_notes_starts'            => 'Ingen vedlagte notat byrjar med ":trigger_value"',
+    'rule_trigger_not_attachment_notes_ends'              => 'Ingen vedlagte notat sluttar på ":trigger_value"',
    'rule_trigger_not_reconciled'                         => 'Transaksjonen er ikkje avstemt',
    'rule_trigger_not_exists'                             => 'Transaksjonen eksisterer ikkje',
    'rule_trigger_not_has_attachments'                    => 'Transaksjonen har ingen vedlegg',
@ -1192,14 +1192,14 @@ return [
    'rule_trigger_not_has_any_budget'                     => 'Transaksjonen har ingen kategori',
    'rule_trigger_not_has_any_bill'                       => 'Transaksjonen har ingen rekningar',
    'rule_trigger_not_has_any_tag'                        => 'Transaksjonen har ingen tagger',
-    'rule_trigger_not_any_notes'                          => 'Transaksjonen har ingen notater',
+    'rule_trigger_not_any_notes'                          => 'Transaksjonen har ingen notat',
    'rule_trigger_not_any_external_url'                   => 'Transaksjonen har ingen ekstern URL',
    'rule_trigger_not_has_no_attachments'                 => 'Transaksjonen har eit (kva som helst) vedlegg',
    'rule_trigger_not_has_no_category'                    => 'Transaksjonen har ein (hvem som helst) kategori',
    'rule_trigger_not_has_no_budget'                      => 'Transaksjonen har eit (kva som helst) budsjett',
    'rule_trigger_not_has_no_bill'                        => 'Transaksjonen har ein (hvilen som helst) rekning',
    'rule_trigger_not_has_no_tag'                         => 'Transaksjonen har ein (hvilken som helst) tagg',
-    'rule_trigger_not_no_notes'                           => 'Transaksjonen har notater',
+    'rule_trigger_not_no_notes'                           => 'Transaksjonen har notat',
    'rule_trigger_not_no_external_url'                    => 'Transaksjonen har ein ekstern URL',
    'rule_trigger_not_source_is_cash'                     => 'Kjeldekonto er ikkje ein kontantkonto',
    'rule_trigger_not_destination_is_cash'                => 'Målkonto er ikkje ein kontantkonto',
@ -1246,16 +1246,16 @@ return [
    'rule_action_set_source_account'                      => 'Sett kjeldekonto til :action_value',
    'rule_action_set_destination_account_choice'          => 'Sett målkonto til ..',
    'rule_action_set_destination_account'                 => 'Sett målkonto til :action_value',
-    'rule_action_append_notes_choice'                     => 'Legg til i notater med ..',
-    'rule_action_append_notes'                            => 'Legg til notater med ":action_value"',
-    'rule_action_prepend_notes_choice'                    => 'Legg til foran i notater med ..',
-    'rule_action_prepend_notes'                           => 'Legg til notater med ":action_value"',
-    'rule_action_clear_notes_choice'                      => 'Fjern notater',
-    'rule_action_clear_notes'                             => 'Fjern notater',
-    'rule_action_set_notes_choice'                        => 'Sett notater til ..',
+    'rule_action_append_notes_choice'                     => 'Legg til notat med ..',
+    'rule_action_append_notes'                            => 'Legg til notat med ":action_value"',
+    'rule_action_prepend_notes_choice'                    => 'Legg følgande framfor notat ..',
+    'rule_action_prepend_notes'                           => 'Legg ":action_value" framfor notatet',
+    'rule_action_clear_notes_choice'                      => 'Fjern notat',
+    'rule_action_clear_notes'                             => 'Fjern notat',
+    'rule_action_set_notes_choice'                        => 'Sett notat til ..',
    'rule_action_link_to_bill_choice'                     => 'Koble til ein rekning ..',
    'rule_action_link_to_bill'                            => 'Link til rekning ":action_value"',
-    'rule_action_set_notes'                               => 'Sett notater til ":action_value"',
+    'rule_action_set_notes'                               => 'Sett notat til ":action_value"',
    'rule_action_convert_deposit_choice'                  => 'Konverter transaksjonen til eit innskot',
    'rule_action_convert_deposit'                         => 'Konverter transaksjonen til eit innskot frå ":action_value"',
    'rule_action_convert_withdrawal_choice'               => 'Konverter denne transaksjonen til eit uttak',
@ -1263,13 +1263,13 @@ return [
    'rule_action_convert_transfer_choice'                 => 'Konverter transaksjonen til ein overføring',
    'rule_action_convert_transfer'                        => 'Konverter transaksjonen til ein overføring med ":action_value"',
    'rule_action_append_descr_to_notes_choice'            => 'Legg til beskrivinga på transaksjonsnotata',
-    'rule_action_append_notes_to_descr_choice'            => 'Legg transaksjonsnotater til beskrivinga',
-    'rule_action_move_descr_to_notes_choice'              => 'Erstatt gjeldande transaksjonsnotater med beskrivinga',
+    'rule_action_append_notes_to_descr_choice'            => 'Legg transaksjonsnotatet til beskrivinga',
+    'rule_action_move_descr_to_notes_choice'              => 'Erstatt gjeldande transaksjonsnotat med beskrivinga',
    'rule_action_move_notes_to_descr_choice'              => 'Erstatt gjeldande beskriving med transaksjonsnotata',
    'rule_action_append_descr_to_notes'                   => 'Legg beskrivinga til notata',
-    'rule_action_append_notes_to_descr'                   => 'Legg notater til beskrivinga',
-    'rule_action_move_descr_to_notes'                     => 'Erstatt notater med beskriving',
-    'rule_action_move_notes_to_descr'                     => 'Erstatt beskriving med notater',
+    'rule_action_append_notes_to_descr'                   => 'Legg notat til beskrivinga',
+    'rule_action_move_descr_to_notes'                     => 'Erstatt notat med beskriving',
+    'rule_action_move_notes_to_descr'                     => 'Erstatt beskriving med notat',
    'rulegroup_for_bills_title'                           => 'Regelgruppe for rekningar',
    'rulegroup_for_bills_description'                     => 'Ein spesiell regelgruppe for alle reglane som involverer rekningar.',
    'rule_for_bill_title'                                 => 'Automatisk generert regel for rekning ":name"',
@ -1374,7 +1374,7 @@ return [
    'pref_optional_tj_payment_date'             => 'Betalingsdato',
    'pref_optional_tj_invoice_date'             => 'Fakturadato',
    'pref_optional_tj_internal_reference'       => 'Intern referanse',
-    'pref_optional_tj_notes'                    => 'Notater',
+    'pref_optional_tj_notes'                    => 'Notat',
    'pref_optional_tj_attachments'              => 'Vedlegg',
    'pref_optional_tj_external_url'             => 'Ekstern URL',
    'pref_optional_tj_location'                 => 'Sted',
@ -1464,7 +1464,7 @@ return [
    'secure_pw_title'                           => 'Korleis velga eit sikkert passord',
    'forgot_password_response'                  => 'Takk skal du ha. Om det eksisterar ein konto med denne e-postadressa, finn du instruksjonar i innboksen din.',
    'secure_pw_history'                         => 'Ikke ein veke går uten at du leser i nyheitene om eit nettsted som har mistet passord for brukarane sine. Hackere og tyver brukar desse passorda for å prøve å stjela din private informasjon. Denne informasjonen er verdifull.',
-    'secure_pw_ff'                              => 'Brukar du det samme passordet over alt på Internett? Om berre ett nettsted mister passordet, har hackere tilgang til alle dataa dine. Firefly III er avhengig av at du velgar eit sterkt og unikt passord for å beskytte dine finansielle data.',
+    'secure_pw_ff'                              => 'Brukar du det same passordet over alt på Internett? Om berre ein nettstad mistar passordet, har datasnokar tilgang til alle dine data. Firefly III er avhengig av at du vel eit sterkt og unikt passord for å beskytta dine finansielle data.',
    'secure_pw_check_box'                       => 'For å hjelpa deg kan Firefly III sjekke om passordet du vil bruka har vorte stjålet tidligere. Om dette er tilfelle, råder Firefly III deg til ikkje å bruka dette passordet.',
    'secure_pw_working_title'                   => 'Korleis virker det?',
    'secure_pw_working'                         => 'Ved å huke av denne boksen vil Firefly III sende dei fem første teikna til SHA1-hashen av passordet ditt til <a href="https://www.troyhunt.com/introducing-306-million-freely-downloadable-pwned-passwords/">nettsida til Troy Hunt</a> for å sjå om det er på lista hans. Dette vil stoppe deg frå å bruka usikre passord som anbefalt i den siste <a href="https://pages.nist.gov/800-63-3/sp800-63b.html">spesialpublikasjonen frå NIST</a> om dette emnet.',
@ -1711,7 +1711,7 @@ return [
    'auto_budget_period_weekly'                 => 'Ukentlig',
    'auto_budget_period_monthly'                => 'Månedlig',
    'auto_budget_period_quarterly'              => 'Kvartalsvis',
-    'auto_budget_period_half_year'              => 'Hvert halvår',
+    'auto_budget_period_half_year'              => 'Kvart halvår',
    'auto_budget_period_yearly'                 => 'Årlig',
    'auto_budget_help'                          => 'Du kan lesa meir om denne funksjonen under hjelp. Klikk ikonet øvst til høgre (?).',
    'auto_budget_reset_icon'                    => 'Budsjettet blir fastsatt periodisk',
@ -1761,7 +1761,7 @@ return [
    'bill_repeats_weekly'                       => 'Gjentas ukentlig',
    'bill_repeats_monthly'                      => 'Gjentas månedlig',
    'bill_repeats_quarterly'                    => 'Gjentas kvartalsvis',
-    'bill_repeats_half-year'                    => 'Gjentas hvert halvår',
+    'bill_repeats_half-year'                    => 'Gjentas kvart halvår',
    'bill_repeats_yearly'                       => 'Gjentas årlig',
    'bill_repeats_weekly_other'                 => 'Gjentas annankvar veke',
    'bill_repeats_monthly_other'                => 'Gjentas annankvar månad',
@ -1771,8 +1771,8 @@ return [
    'bill_repeats_weekly_skip'                  => 'Gjentas kvar {skip} veke',
    'bill_repeats_monthly_skip'                 => 'Gjentas kvar {skip} månad',
    'bill_repeats_quarterly_skip'               => 'Gjentas annankvar {skip} kvartal',
-    'bill_repeats_half-year_skip'               => 'Gjentas hvert {skip} halvår',
-    'bill_repeats_yearly_skip'                  => 'Gjentas hvert {skip} år',
+    'bill_repeats_half-year_skip'               => 'Gjentas kvart {skip} halvår',
+    'bill_repeats_yearly_skip'                  => 'Gjentas kvart {skip} år',
    'subscriptions'                             => 'Abonnementer',
    'forever'                                   => 'For alltid',
    'extension_date_is'                         => 'Forlengelsesdato er {date}',
@ -1860,7 +1860,7 @@ return [
    'no_data_for_chart'                         => 'Det er ikkje nok informasjon (enda) til å generera dette diagrammet.',
    'select_at_least_one_account'               => 'Vel minst ein brukskonto',
    'select_at_least_one_category'              => 'Vel minst ein kategori',
-    'select_at_least_one_budget'                => 'Vel minst ett budsjett',
+    'select_at_least_one_budget'                => 'Vel minst eit budsjett',
    'select_at_least_one_tag'                   => 'Vel minst ein tag',
    'select_at_least_one_expense'               => 'Vel minst ein kombinasjon av utgift/inntekts konto. Om du ikkje har ein (lista er tom) så vil ikkje denne rapporten vera tilgjengelig.',
    'account_default_currency'                  => 'Dette blir standard valuta for denne kontoen.',
@ -2009,7 +2009,7 @@ return [
    'opt_group_l_Debt'                          => 'Gjeld: Gjeld',
    'opt_group_l_Mortgage'                      => 'Gjeld: Huslån',
    'opt_group_l_Credit card'                   => 'Gjeld: Kredittkort',
-    'notes'                                     => 'Notater',
+    'notes'                                     => 'Notat',
    'unknown_journal_error'                     => 'Kunne ikkje lagra transaksjonen. Vennligst sjekk loggfilene.',
    'attachment_not_found'                      => 'Finner ikkje dette vedlegget.',
    'journal_link_bill'                         => 'Denne transaksjonen er knytt til rekning <a href=":route">:name</a>. Om du vil fjerna knytningen, fjerner du avmerkingen. Bruka reglar for å koble den til ein annan rekning.',
@ -2239,7 +2239,7 @@ return [
    'average_spending_per_account'              => 'Gjennomsnittlig bruk per konto',
    'average_income_per_account'                => 'Gjennomsnittlig inntekt per konto',
    'total'                                     => 'Totalt',
-    'description'                               => 'Beskrivelse',
+    'description'                               => 'Beskriving',
    'sum_of_period'                             => 'Sum for perioden',
    'average_in_period'                         => 'Gjennomsnitt for periode',
    'account_role_defaultAsset'                 => 'Standard aktivakonto',
@ -2431,7 +2431,7 @@ return [
    'notification_settings_saved'              => 'Varslingsinnstillingane har vorte lagra',


-    'split_transaction_title'               => 'Beskrivelse av den splittende transaksjon',
+    'split_transaction_title'               => 'Beskrivinga av den splitta transaksjonen',
    'split_transaction_title_help'          => 'Om du oppretter ein splittet transaksjon, må du ha ein hoved beskriving for alle deler av transaksjonen.',
    'split_title_help'                      => 'Om du oppretter ein splittet transaksjon, må du ha ein global beskriving for alle deler av transaksjonen.',
    'you_create_transfer'                   => 'Du lager ein overføring.',
@ -2473,7 +2473,7 @@ return [
    'this_transfer'                         => 'Denne overføringen',
    'overview_for_link'                     => 'Oversikt for linktype ":name"',
    'source_transaction'                    => 'Kjeldetransaksjon',
-    'link_description'                      => 'Lenkjebeskrivelse',
+    'link_description'                      => 'Lenkjebeskriving',
    'destination_transaction'               => 'Destinasjonstransaksjon',
    'delete_journal_link'                   => 'Slett koblingen mellom <a href=":source_link">:source</a> og <a href=":destination_link">:destination</a>',
    'deleted_link'                          => 'Sletta kobling',
@ -2577,7 +2577,7 @@ return [
    // recurring transactions
    'create_right_now'                      => 'Opprett med ein gang',
    'no_new_transaction_in_recurrence'      => 'No new transaction was created. Perhaps it was already fired for this date?',
-    'recurrences'                           => 'Gjentakende transaksjonar',
+    'recurrences'                           => 'Gjentakande transaksjonar',
    'repeat_until_in_past'                  => 'Denne gjentakande transaksjonen slutta å gjenta :date.',
    'recurring_calendar_view'               => 'Kalender',
    'no_recurring_title_default'            => 'La oss oppretta ein gjentakande transaksjon!',
@ -2591,7 +2591,7 @@ return [
    'recurring_monthly'                     => 'Kvar månad på :dayOfMonth :weekday',
    'recurring_monthly_skip'                => 'Every :skip(st/nd/rd/th) month on the :dayOfMonth(st/nd/rd/th) day',
    'recurring_ndom'                        => 'Kvar månad på :dayOfMonth :weekday',
-    'recurring_yearly'                      => 'Hvert år den :date',
+    'recurring_yearly'                      => 'Kvart år den :date',
    'overview_for_recurrence'               => 'Oversikt for gjentakande transaksjon ":title"',
    'warning_duplicates_repetitions'        => 'I sjeldne tilfeller datoane vist to gonger i lista. Dette kan skje når fleire gjentakingar kolliderer. Firefly III genererer alltid ein transaksjon per dag.',
    'created_transactions'                  => 'Relaterte transaksjonar',
@ -2623,7 +2623,7 @@ return [
    'recurring_skips_one'                => 'Annankvar',
    'recurring_skips_more'               => 'Hopper over :count forekomster',
    'store_new_recurrence'               => 'Lagra gjentakande transaksjon',
-    'stored_new_recurrence'              => 'Gjentakende transaksjon ":title" lagra.',
+    'stored_new_recurrence'              => 'Gjentakande transaksjon ":title" lagra.',
    'edit_recurrence'                    => 'Rediger gjentakande transaksjon ":title"',
    'recurring_repeats_until'            => 'Gjenta til :date',
    'recurring_repeats_forever'          => 'Gjenta for alltid',
@ -2641,7 +2641,7 @@ return [
    'will_jump_friday'                   => 'Opprettes på Fredag i staden for i helgane.',
    'will_jump_monday'                   => 'Opprettes på Mandag i staden for i helgane.',
    'except_weekends'                    => 'Unntatt helger',
-    'recurrence_deleted'                 => 'Gjentakende transaksjon ":title" sletta',
+    'recurrence_deleted'                 => 'Gjentakande transaksjon ":title" sletta',

 /*
 * PLEASE DO NOT EDIT THIS FILE DIRECTLY.
--- a/resources/lang/nn_NO/form.php
+++ b/resources/lang/nn_NO/form.php
@ -66,7 +66,7 @@ return [
    'include_net_worth'         => 'Inkluder i formue',
    'asset_source_account'      => 'Kjeldekonto',
    'journal_description'       => 'Beskrivelse',
-    'note'                      => 'Notater',
+    'note'                      => 'Notat',
    'currency'                  => 'Valuta',
    'account_id'                => 'Aktivakonto',
    'budget_id'                 => 'Budsjett',
@ -96,7 +96,7 @@ return [
    'returnHere'                  => 'Gå tilbake hit',
    'returnHereExplanation'       => 'Gå tilbake hit etter lagring for å legga til på nytt.',
    'returnHereUpdateExplanation' => 'Gå tilbake hit etter endring.',
-    'description'                 => 'Beskrivelse',
+    'description'                 => 'Beskriving',
    'expense_account'             => 'Utgiftskonto',
    'revenue_account'             => 'Inntektskonto',
    'decimal_places'              => 'Desimaler',
@ -138,7 +138,7 @@ return [
    'specifix'                    => 'Bank- eller filspesifikke rettelser',
    'attachments[]'               => 'Vedlegg',
    'title'                       => 'Tittel',
-    'notes'                       => 'Notater',
+    'notes'                       => 'Notat',
    'filename'                    => 'Filnamn',
    'mime'                        => 'Mime-type',
    'size'                        => 'Størrelse',
@ -276,14 +276,14 @@ return [
    'inward'                    => 'Innvendig beskriving',
    'outward'                   => 'Utvendig beskriving',
    'rule_group_id'             => 'Regelgruppe',
-    'transaction_description'   => 'Transaksjonsbeskrivelse',
+    'transaction_description'   => 'Transaksjonsbeskriving',
    'first_date'                => 'Første dato',
    'transaction_type'          => 'Transaksjonstype',
    'repeat_until'              => 'Gjenta til',
-    'recurring_description'     => 'Gjentakende transaksjonsbeskrivelse',
+    'recurring_description'     => 'Gjentakande transaksjonsbeskriving',
    'repetition_type'           => 'Type repetisjon',
    'foreign_currency_id'       => 'Utenlandsk valuta',
-    'repetition_end'            => 'Repetisjon slutter',
+    'repetition_end'            => 'Repetisjon avsluttar',
    'repetitions'               => 'Repetisjoner',
    'calendar'                  => 'Kalender',
    'weekend'                   => 'Helg',
--- a/resources/lang/nn_NO/intro.php
+++ b/resources/lang/nn_NO/intro.php
@ -62,7 +62,7 @@ return [
    'budgets_index_see_expenses_bar'        => 'Når du brukar pengar vil denne linja fyllast opp.',
    'budgets_index_navigate_periods'        => 'Naviger gjennom perioder for å enkelt definera budsjett på førehand.',
    'budgets_index_new_budget'              => 'Opprett nye budsjett etter behov.',
-    'budgets_index_list_of_budgets'         => 'Bruk denne tabellen til å angi beløp for hvert budsjett og sjå korleis du klarar deg.',
+    'budgets_index_list_of_budgets'         => 'Bruk denne tabellen til å angi beløp for kvart budsjett og sjå korleis du klarar deg.',
    'budgets_index_outro'                   => 'Om du vil vita meir om budsjettering, trykk på hjelp-ikonet øvst til høgre.',

 /*
@ -97,7 +97,7 @@ return [
    'reports_report_tag_pieCharts'              => 'Desse diagramma gir deg innblikk i utgifter og inntekter per tagg, konto, kategori eller budsjett.',
    'reports_report_tag_incomeAndExpensesChart' => 'Dette diagrammet visar dine utgifter og inntekter per tagg.',

-    'reports_report_budget_intro'                             => 'Denne rapporten gir deg innblikk i ett eller fleire budsjett.',
+    'reports_report_budget_intro'                             => 'Denne rapporten gjer deg innblikk i eit eller fleire budsjett.',
    'reports_report_budget_pieCharts'                         => 'Desse diagramma gir deg innblikk i utgifter og inntekter per budsjett eller per konto.',
    'reports_report_budget_incomeAndExpensesChart'            => 'Dette diagrammet visar dine utgifter per budsjett.',

--- a/resources/lang/nn_NO/list.php
+++ b/resources/lang/nn_NO/list.php
@ -49,7 +49,7 @@ return [
    'linked_to_rules'       => 'Relevante reglar',
    'active'                => 'Er aktiv?',
    'percentage'            => 'pst.',
-    'recurring_transaction' => 'Gjentakende transaksjon',
+    'recurring_transaction' => 'Gjentakande transaksjon',
    'next_due'              => 'Neste frist',
    'transaction_type'      => 'Type',
    'lastActivity'          => 'Siste aktivitet',
@ -82,7 +82,7 @@ return [


    'repeat_freq'             => 'Gjentas',
-    'description'             => 'Beskrivelse',
+    'description'             => 'Beskriving',
    'amount'                  => 'Beløp',
    'date'                    => 'Dato',
    'interest_date'           => 'Rentedato',
@ -92,7 +92,7 @@ return [
    'payment_date'            => 'Betalingsdato',
    'invoice_date'            => 'Fakturadato',
    'internal_reference'      => 'Intern referanse',
-    'notes'                   => 'Notater',
+    'notes'                   => 'Notat',
    'from'                    => 'Fra',
    'piggy_bank'              => 'Sparegris',
    'to'                      => 'Til',
--- a/resources/lang/nn_NO/validation.php
+++ b/resources/lang/nn_NO/validation.php
@ -73,7 +73,7 @@ return [
    'require_foreign_currency'       => 'Dette feltet krever eit tal',
    'require_foreign_dest'           => 'Denne feltverdien må samsvare med valutaen til målkontoen.',
    'require_foreign_src'            => 'Denne feltverdien må samsvare med valutaen til kildekontoen.',
-    'equal_description'              => 'Transaksjonsbeskrivelsen bør ikkje vera lik global beskriving.',
+    'equal_description'              => 'Transaksjonsbeskrivinga bør ikkje vera lik global beskriving.',
    'file_invalid_mime'              => 'Kan ikkje akseptere fil ":name" av typen ":mime" for opplasting.',
    'file_too_large'                 => '":name"-filen er for stor.',
    'belongs_to_user'                => 'Verdien av :attribute er ukjent.',
@ -209,7 +209,7 @@ return [
        'amount_max'              => 'maksimumsbeløp',
        'title'                   => 'tittel',
        'tag'                     => 'tag',
-        'transaction_description' => 'transaksjonsbeskrivelse',
+        'transaction_description' => 'transaksjonsbeskriving',
        'rule-action-value.1'     => 'regel aksjonsverdi #1',
        'rule-action-value.2'     => 'regel aksjonsverdi #2',
        'rule-action-value.3'     => 'regel aksjonsverdi #3',
--- a/tests/unit/Support/Calendar/CalculatorProvider.php
+++ b/tests/unit/Support/Calendar/CalculatorProvider.php
@ -37,14 +37,16 @@ readonly class CalculatorProvider
    public Periodicity      $periodicity;
    public int              $skip;

-    private function __construct(IntervalProvider $intervalProvider, Periodicity $periodicity, int $skip = 0) {
+    private function __construct(IntervalProvider $intervalProvider, Periodicity $periodicity, int $skip = 0)
+    {
        $this->skip             = $skip;
        $this->intervalProvider = $intervalProvider;
        $this->periodicity      = $periodicity;
        $this->label            = "{$periodicity->name} {$intervalProvider->label}";
    }

-    public static function providePeriodicityWithSkippedIntervals(): Generator {
+    public static function providePeriodicityWithSkippedIntervals(): Generator
+    {
        $intervals = [
            CalculatorProvider::from(Periodicity::Daily, new IntervalProvider(Carbon::now(), Carbon::now()->addDays(2)), 1),
            CalculatorProvider::from(Periodicity::Daily, new IntervalProvider(Carbon::now(), Carbon::now()->addDays(3)), 2),
@ -117,15 +119,18 @@ readonly class CalculatorProvider
        }
    }

-    public static function from(Periodicity $periodicity, IntervalProvider $interval, int $skip = 0): CalculatorProvider {
+    public static function from(Periodicity $periodicity, IntervalProvider $interval, int $skip = 0): CalculatorProvider
+    {
        return new self($interval, $periodicity, $skip);
    }

-    public function epoch(): Carbon {
+    public function epoch(): Carbon
+    {
        return $this->intervalProvider->epoch;
    }

-    public function expected(): Carbon {
+    public function expected(): Carbon
+    {
        return $this->intervalProvider->expected;
    }
 }
--- a/tests/unit/Support/Calendar/CalculatorTest.php
+++ b/tests/unit/Support/Calendar/CalculatorTest.php
@ -48,7 +48,8 @@ use Tests\unit\Support\Calendar\Periodicity\YearlyTest;
 */
 class CalculatorTest extends TestCase
 {
-    public static function provideAllPeriodicity(): Generator {
+    public static function provideAllPeriodicity(): Generator
+    {
        $intervals = [];
        $intervals = array_merge($intervals, self::convert(Periodicity::Daily, DailyTest::provideIntervals()));
        $intervals = array_merge($intervals, self::convert(Periodicity::Weekly, WeeklyTest::provideIntervals()));
@ -65,7 +66,8 @@ class CalculatorTest extends TestCase
        }
    }

-    private static function convert(Periodicity $periodicity, array $intervals): array {
+    private static function convert(Periodicity $periodicity, array $intervals): array
+    {
        $periodicityIntervals = [];
        /** @var IntervalProvider $interval */
        foreach ($intervals as $index => $interval) {
@ -76,7 +78,8 @@ class CalculatorTest extends TestCase
        return $periodicityIntervals;
    }

-    public static function provideSkippedIntervals(): Generator {
+    public static function provideSkippedIntervals(): Generator
+    {
        return CalculatorProvider::providePeriodicityWithSkippedIntervals();
    }

@ -84,7 +87,8 @@ class CalculatorTest extends TestCase
     * @dataProvider provideAllPeriodicity
     * @throws IntervalException
     */
-    public function testGivenADailyPeriodicityWhenCallTheNextDateByIntervalMethodThenReturnsTheExpectedDateSuccessful(CalculatorProvider $provider) {
+    public function testGivenADailyPeriodicityWhenCallTheNextDateByIntervalMethodThenReturnsTheExpectedDateSuccessful(CalculatorProvider $provider)
+    {
        $calculator = new Calculator();
        $period     = $calculator->nextDateByInterval($provider->epoch(), $provider->periodicity);
        $this->assertEquals($provider->expected()->toDateString(), $period->toDateString());
@ -94,7 +98,8 @@ class CalculatorTest extends TestCase
     * @dataProvider provideSkippedIntervals
     * @throws IntervalException
     */
-    public function testGivenAnEpochWithSkipIntervalNumberWhenCallTheNextDateBySkippedIntervalMethodThenReturnsTheExpectedDateSuccessful(CalculatorProvider $provider) {
+    public function testGivenAnEpochWithSkipIntervalNumberWhenCallTheNextDateBySkippedIntervalMethodThenReturnsTheExpectedDateSuccessful(CalculatorProvider $provider)
+    {
        $calculator = new Calculator();
        $period     = $calculator->nextDateByInterval($provider->epoch(), $provider->periodicity, $provider->skip);
        $this->assertEquals($provider->expected()->toDateString(), $period->toDateString());
--- a/tests/unit/Support/Calendar/Periodicity/MonthlyTest.php
+++ b/tests/unit/Support/Calendar/Periodicity/MonthlyTest.php
@ -37,11 +37,13 @@ use FireflyIII\Support\Calendar\Periodicity\Interval;
 */
 class MonthlyTest extends IntervalTestCase
 {
-    public static function factory(): Interval {
+    public static function factory(): Interval
+    {
        return new Periodicity\Monthly();
    }

-    public static function provideIntervals(): array {
+    public static function provideIntervals(): array
+    {
        return [
            new IntervalProvider(Carbon::now(), Carbon::now()->addMonth(1)),
            new IntervalProvider(Carbon::parse('2019-01-01'), Carbon::parse('2019-02-01')),
--- a/tests/unit/Support/Calendar/Periodicity/QuarterlyTest.php
+++ b/tests/unit/Support/Calendar/Periodicity/QuarterlyTest.php
@ -37,11 +37,13 @@ use FireflyIII\Support\Calendar\Periodicity\Interval;
 */
 class QuarterlyTest extends IntervalTestCase
 {
-    public static function factory(): Interval {
+    public static function factory(): Interval
+    {
        return new Periodicity\Quarterly();
    }

-    public static function provideIntervals(): array {
+    public static function provideIntervals(): array
+    {
        return [
            new IntervalProvider(Carbon::now(), Carbon::now()->addMonths(3)),
            new IntervalProvider(Carbon::parse('2019-01-29'), Carbon::parse('2019-04-29')),
--- a/tests/unit/Support/Calendar/Periodicity/WeeklyTest.php
+++ b/tests/unit/Support/Calendar/Periodicity/WeeklyTest.php
@ -37,11 +37,13 @@ use FireflyIII\Support\Calendar\Periodicity\Interval;
 */
 class WeeklyTest extends IntervalTestCase
 {
-    public static function factory(): Interval {
+    public static function factory(): Interval
+    {
        return new Periodicity\Weekly();
    }

-    public static function provideIntervals(): array {
+    public static function provideIntervals(): array
+    {
        return [
            new IntervalProvider(Carbon::now(), Carbon::now()->addWeek()),
            new IntervalProvider(Carbon::parse('2023-01-31'), Carbon::parse('2023-02-07')),
--- a/tests/unit/Support/Calendar/Periodicity/YearlyTest.php
+++ b/tests/unit/Support/Calendar/Periodicity/YearlyTest.php
@ -37,11 +37,13 @@ use FireflyIII\Support\Calendar\Periodicity\Interval;
 */
 class YearlyTest extends IntervalTestCase
 {
-    public static function factory(): Interval {
+    public static function factory(): Interval
+    {
        return new Periodicity\Yearly();
    }

-    public static function provideIntervals(): array {
+    public static function provideIntervals(): array
+    {
        return [
            new IntervalProvider(Carbon::now(), Carbon::now()->addYears(1)),
            new IntervalProvider(Carbon::parse('2019-01-29'), Carbon::parse('2020-01-29')),
--- a/tests/unit/Support/NavigationAddPeriodTest.php
+++ b/tests/unit/Support/NavigationAddPeriodTest.php
@ -39,12 +39,14 @@ class NavigationAddPeriodTest extends TestCase
 {
    private Navigation $navigation;

-    public function __construct(string $name) {
+    public function __construct(string $name)
+    {
        parent::__construct($name);
        $this->navigation = new Navigation();
    }

-    public static function provideFrequencies(): array {
+    public static function provideFrequencies(): array
+    {
        return [
            Periodicity::Daily->name       => ['periodicity' => Periodicity::Daily, 'from' => Carbon::now(), 'expected' => Carbon::tomorrow()],
            Periodicity::Weekly->name      => ['periodicity' => Periodicity::Weekly, 'from' => Carbon::now(), 'expected' => Carbon::now()->addWeeks(1)],
@ -71,7 +73,8 @@ class NavigationAddPeriodTest extends TestCase
        ];
    }

-    public static function provideMonthPeriods(): array {
+    public static function provideMonthPeriods(): array
+    {
        return [
            '1M'                       => ['frequency' => '1M', 'from' => Carbon::parse('2023-06-25'), 'expected' => Carbon::parse('2023-06-25')->addMonths(1)],
            'month'                    => ['frequency' => 'month', 'from' => Carbon::parse('2023-06-25'), 'expected' => Carbon::parse('2023-06-25')->addMonths(1)],
@ -86,7 +89,8 @@ class NavigationAddPeriodTest extends TestCase
        ];
    }

-    public static function providePeriods(): array {
+    public static function providePeriods(): array
+    {
        return [
            '1D'        => ['frequency' => '1D', 'from' => Carbon::now(), 'expected' => Carbon::tomorrow()],
            'daily'     => ['frequency' => 'daily', 'from' => Carbon::now(), 'expected' => Carbon::tomorrow()],
@ -111,7 +115,8 @@ class NavigationAddPeriodTest extends TestCase
        ];
    }

-    public static function providePeriodsWithSkippingParam(): Generator {
+    public static function providePeriodsWithSkippingParam(): Generator
+    {
        $intervals = [
            '2019-01-31 to 2019-02-11' => ['skip' => 10, 'frequency' => 'daily', 'from' => Carbon::parse('2019-01-31'), 'expected' => Carbon::parse('2019-02-11')],
            '1D'                       => ['skip' => 1, 'frequency' => '1D', 'from' => Carbon::now(), 'expected' => Carbon::now()->addDays(2)],
@ -155,7 +160,8 @@ class NavigationAddPeriodTest extends TestCase
    /**
     * @dataProvider providePeriodsWithSkippingParam
     */
-    public function testGivenAFrequencyAndSkipIntervalWhenCalculateTheDateThenReturnsTheSkippedDateSuccessful(int $skip, string $frequency, Carbon $from, Carbon $expected) {
+    public function testGivenAFrequencyAndSkipIntervalWhenCalculateTheDateThenReturnsTheSkippedDateSuccessful(int $skip, string $frequency, Carbon $from, Carbon $expected)
+    {
        $period = $this->navigation->addPeriod($from, $frequency, $skip);
        $this->assertEquals($expected->toDateString(), $period->toDateString());
    }
@ -163,7 +169,8 @@ class NavigationAddPeriodTest extends TestCase
    /**
     * @dataProvider providePeriods
     */
-    public function testGivenAFrequencyWhenCalculateTheDateThenReturnsTheExpectedDateSuccessful(string $frequency, Carbon $from, Carbon $expected) {
+    public function testGivenAFrequencyWhenCalculateTheDateThenReturnsTheExpectedDateSuccessful(string $frequency, Carbon $from, Carbon $expected)
+    {
        $period = $this->navigation->addPeriod($from, $frequency, 0);
        $this->assertEquals($expected->toDateString(), $period->toDateString());
    }
@ -171,7 +178,8 @@ class NavigationAddPeriodTest extends TestCase
    /**
     * @dataProvider provideFrequencies
     */
-    public function testGivenAIntervalWhenCallTheNextDateByIntervalMethodThenReturnsTheExpectedDateSuccessful(Periodicity $periodicity, Carbon $from, Carbon $expected) {
+    public function testGivenAIntervalWhenCallTheNextDateByIntervalMethodThenReturnsTheExpectedDateSuccessful(Periodicity $periodicity, Carbon $from, Carbon $expected)
+    {
        $period = $this->navigation->nextDateByInterval($from, $periodicity);
        $this->assertEquals($expected->toDateString(), $period->toDateString());
    }
@ -179,7 +187,8 @@ class NavigationAddPeriodTest extends TestCase
    /**
     * @dataProvider provideMonthPeriods
     */
-    public function testGivenAMonthFrequencyWhenCalculateTheDateThenReturnsTheLastDayOfMonthSuccessful(string $frequency, Carbon $from, Carbon $expected) {
+    public function testGivenAMonthFrequencyWhenCalculateTheDateThenReturnsTheLastDayOfMonthSuccessful(string $frequency, Carbon $from, Carbon $expected)
+    {
        $period = $this->navigation->addPeriod($from, $frequency, 0);
        $this->assertEquals($expected->toDateString(), $period->toDateString());
    }
--- a/tests/unit/Support/NavigationStartOfPeriodTest.php
+++ b/tests/unit/Support/NavigationStartOfPeriodTest.php
@ -38,12 +38,14 @@ class NavigationStartOfPeriodTest extends TestCase
 {
    private Navigation $navigation;

-    public function __construct(string $name) {
+    public function __construct(string $name)
+    {
        parent::__construct($name);
        $this->navigation = new Navigation();
    }

-    public static function provideDates(): array {
+    public static function provideDates(): array
+    {
        return [
            'custom'    => ['frequency' => 'custom', 'from' => Carbon::now(), 'expected' => Carbon::now()],
            '1D'        => ['frequency' => '1D', 'from' => Carbon::now(), 'expected' => Carbon::now()->startOfDay()],
@ -72,7 +74,8 @@ class NavigationStartOfPeriodTest extends TestCase
        ];
    }

-    public static function provideUnknownFrequencies(): array {
+    public static function provideUnknownFrequencies(): array
+    {
        return [
            '1day'    => ['frequency' => '1day', 'from' => Carbon::now(), 'expected' => Carbon::now()],
            'unknown' => ['frequency' => 'unknown', 'from' => Carbon::now(), 'expected' => Carbon::now()->startOfDay()],
@ -83,7 +86,8 @@ class NavigationStartOfPeriodTest extends TestCase
    /**
     * @dataProvider provideDates
     */
-    public function testGivenADateAndFrequencyWhenCalculateTheDateThenReturnsTheExpectedDateSuccessful(string $frequency, Carbon $from, Carbon $expected) {
+    public function testGivenADateAndFrequencyWhenCalculateTheDateThenReturnsTheExpectedDateSuccessful(string $frequency, Carbon $from, Carbon $expected)
+    {
        $period = $this->navigation->startOfPeriod($from, $frequency);
        $this->assertEquals($expected->toDateString(), $period->toDateString());
    }
@ -91,7 +95,8 @@ class NavigationStartOfPeriodTest extends TestCase
    /**
     * @dataProvider provideUnknownFrequencies
     */
-    public function testGivenADateAndUnknownFrequencyWhenCalculateTheDateThenReturnsTheSameDateSuccessful(string $frequency, Carbon $from, Carbon $expected) {
+    public function testGivenADateAndUnknownFrequencyWhenCalculateTheDateThenReturnsTheSameDateSuccessful(string $frequency, Carbon $from, Carbon $expected)
+    {
        Log::shouldReceive('error')
           ->with(sprintf('Cannot do startOfPeriod for $repeat_freq "%s"', $frequency))
           ->andReturnNull();
--- a/yarn.lock
+++ b/yarn.lock
@ -2583,9 +2583,9 @@ ee-first@1.1.1:
  integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==

 electron-to-chromium@^1.4.431:
-  version "1.4.461"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.461.tgz#6b14af66042732bf883ab63a4d82cac8f35eb252"
-  integrity sha512-1JkvV2sgEGTDXjdsaQCeSwYYuhLRphRpc+g6EHTFELJXEiznLt3/0pZ9JuAOQ5p2rI3YxKTbivtvajirIfhrEQ==
+  version "1.4.463"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.463.tgz#8eb04355f24fef5c8097661d14e143f6d8554055"
+  integrity sha512-fT3hvdUWLjDbaTGzyOjng/CQhQJSQP8ThO3XZAoaxHvHo2kUXiRQVMj9M235l8uDFiNPsPa6KHT1p3RaR6ugRw==

 elliptic@^6.5.3:
  version "6.5.4"
@ -5035,9 +5035,9 @@ terser@^4.6.3:
    source-map-support "~0.5.12"

 terser@^5.16.8, terser@^5.9.0:
-  version "5.19.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.19.0.tgz#7b3137b01226bdd179978207b9c8148754a6da9c"
-  integrity sha512-JpcpGOQLOXm2jsomozdMDpd5f8ZHh1rR48OFgWUH3QsyZcfPgv2qDCYbcDEAYNd4OZRj2bWYKpwdll/udZCk/Q==
+  version "5.19.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.19.1.tgz#dbd7231f224a9e2401d0f0959542ed74d76d340b"
+  integrity sha512-27hxBUVdV6GoNg1pKQ7Z5cbR6V9txPVyBA+FQw3BaZ1Wuzvztce5p156DaP0NVZNrMZZ+6iG9Syf7WgMNKDg2Q==
  dependencies:
    "@jridgewell/source-map" "^0.3.3"
    acorn "^8.8.2"
@ -5364,9 +5364,9 @@ webpack-sources@^3.2.3:
  integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==

 webpack@^5.60.0:
-  version "5.88.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.88.1.tgz#21eba01e81bd5edff1968aea726e2fbfd557d3f8"
-  integrity sha512-FROX3TxQnC/ox4N+3xQoWZzvGXSuscxR32rbzjpXgEzWudJFEJBpdlkkob2ylrv5yzzufD1zph1OoFsLtm6stQ==
+  version "5.88.2"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.88.2.tgz#f62b4b842f1c6ff580f3fcb2ed4f0b579f4c210e"
+  integrity sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==
  dependencies:
    "@types/eslint-scope" "^3.7.3"
    "@types/estree" "^1.0.0"
				`@ -1 +0,0 @@`
				"use strict";(globalThis["webpackChunkfirefly_iii"]=globalThis["webpackChunkfirefly_iii"]\|\|[]).push([[2769],{2769:(e,t,l)=>{l.r(t),l.d(t,{default:()=>d});var n=l(9835);const i={class:"fullscreen bg-blue text-white text-center q-pa-md flex flex-center"},o=(0,n._)("div",{style:{"font-size":"30vh"}}," 404 ",-1),s=(0,n._)("div",{class:"text-h2",style:{opacity:".4"}}," Oops. Nothing here... ",-1);function c(e,t,l,c,r,a){const u=(0,n.up)("q-btn");return(0,n.wg)(),(0,n.iD)("div",i,[(0,n._)("div",null,[o,s,(0,n.Wm)(u,{class:"q-mt-xl",color:"white",label:"Go Home","no-caps":"","text-color":"blue",to:"/",unelevated:""})])])}const r=(0,n.aZ)({name:"Error404"});var a=l(1639),u=l(8879),h=l(9984),f=l.n(h);const b=(0,a.Z)(r,[["render",c]]),d=b;f()(r,"components",{QBtn:u.Z})}}]);
				`@ -0,0 +1 @@`
				"use strict";(globalThis["webpackChunkfirefly_iii"]=globalThis["webpackChunkfirefly_iii"]\|\|[]).push([[2769],{855:(e,t,l)=>{l.r(t),l.d(t,{default:()=>d});var n=l(9835);const i={class:"fullscreen bg-blue text-white text-center q-pa-md flex flex-center"},o=(0,n._)("div",{style:{"font-size":"30vh"}}," 404 ",-1),s=(0,n._)("div",{class:"text-h2",style:{opacity:".4"}}," Oops. Nothing here... ",-1);function c(e,t,l,c,r,a){const u=(0,n.up)("q-btn");return(0,n.wg)(),(0,n.iD)("div",i,[(0,n._)("div",null,[o,s,(0,n.Wm)(u,{class:"q-mt-xl",color:"white",label:"Go Home","no-caps":"","text-color":"blue",to:"/",unelevated:""})])])}const r=(0,n.aZ)({name:"Error404"});var a=l(1639),u=l(8879),h=l(9984),f=l.n(h);const b=(0,a.Z)(r,[["render",c]]),d=b;f()(r,"components",{QBtn:u.Z})}}]);