Merge branch 'release/5.2.0'

app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * CorrectOpeningBalanceCurrencies.php
  * Copyright (c) 2020 james@firefly-iii.org

app/Console/Commands/Correction/FixLongDescriptions.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * FixLongDescriptions.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -65,7 +66,7 @@ class FixLongDescriptions extends Command
         $groups = TransactionGroup::get(['id', 'title']);
         /** @var TransactionGroup $group */
         foreach ($groups as $group) {
-            if (strlen($group->title) > self::MAX_LENGTH) {
+            if (strlen((string)$group->title) > self::MAX_LENGTH) {
                 $group->title = substr($group->title, 0, self::MAX_LENGTH);
                 $group->save();
                 $this->line(sprintf('Truncated description of transaction group #%d', $group->id));

app/Console/Commands/Correction/FixRecurringTransactions.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * FixRecurringTransactions.php
  * Copyright (c) 2020 james@firefly-iii.org

app/Console/Commands/CreateDatabase.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 
 /**

app/Console/Commands/Export/ExportData.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * ExportData.php
  * Copyright (c) 2020 james@firefly-iii.org

app/Console/Commands/Integrity/RestoreOAuthKeys.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * RestoreOAuthKeys.php
  * Copyright (c) 2020 james@firefly-iii.org

app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * MigrateRecurrenceMeta.php
  * Copyright (c) 2020 james@firefly-iii.org

app/Console/Commands/Upgrade/MigrateTagLocations.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * MigrateTagLocations.php
  * Copyright (c) 2020 james@firefly-iii.org

app/Exceptions/DuplicateTransactionException.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * DuplicateTransactionException.php
  * Copyright (c) 2019 james@firefly-iii.org

app/Http/Controllers/Admin/TelemetryController.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * TelemetryController.php
  * Copyright (c) 2020 thegrumpydictator@gmail.com

app/Http/Controllers/Auth/ConfirmPasswordController.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 
 /**

app/Http/Controllers/Chart/TagReportController.php

@@ -450,8 +450,6 @@ class TagReportController extends Controller
         $data = $this->generator->multiCurrencyPieChart($result);
 
         return response()->json($data);
-
-        return response()->json($data);
     }
 
 

app/Http/Controllers/Chart/TransactionController.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * TransactionController.php
  * Copyright (c) 2020 thegrumpydictator@gmail.com
@@ -204,6 +205,7 @@ class TransactionController extends Controller
                 $collector->setTypes([TransactionType::DEPOSIT]);
                 break;
             case 'transfers':
+            case 'transfer':
                 $collector->setTypes([TransactionType::TRANSFER]);
                 break;
         }
@@ -270,6 +272,7 @@ class TransactionController extends Controller
                 $collector->setTypes([TransactionType::DEPOSIT]);
                 break;
             case 'transfers':
+            case 'transfer':
                 $collector->setTypes([TransactionType::TRANSFER]);
                 break;
         }

app/Http/Controllers/Export/IndexController.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * IndexController.php
  * Copyright (c) 2019 james@firefly-iii.org

app/Http/Controllers/Profile/DataController.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * DataController.php
  * Copyright (c) 2019 james@firefly-iii.org

app/Http/Controllers/Transaction/ShowController.php

@@ -108,6 +108,7 @@ class ShowController extends Controller
             if (!Str::contains($transaction['notes'], $search)) {
                 $groupArray['transactions'][$index]['notes'] = e($transaction['notes']);
             }
+            $groupArray['transactions'][$index]['tags'] = $this->repository->getTagObjects($groupArray['transactions'][$index]['transaction_journal_id']);
         }
 
         $events      = $this->repository->getPiggyEvents($transactionGroup);

app/Models/Account.php

@@ -94,6 +94,12 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @property-read int|null                                              $notes_count
  * @property-read int|null                                              $piggy_banks_count
  * @property-read int|null                                              $transactions_count
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property int $account_type_id
+ * @property bool $encrypted
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\AccountMeta[] $accountMeta
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBank[] $piggyBanks
  */
 class Account extends Model
 {

app/Models/AutoBudget.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * AutoBudget.php
  * Copyright (c) 2020 thegrumpydictator@gmail.com

app/Models/Bill.php

@@ -89,6 +89,8 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @property-read int|null $attachments_count
  * @property-read int|null $notes_count
  * @property-read int|null $transaction_journals_count
+ * @property bool $name_encrypted
+ * @property bool $match_encrypted
  */
 class Bill extends Model
 {

app/Models/Category.php

@@ -70,6 +70,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @property-read int|null                $attachments_count
  * @property-read int|null                $transaction_journals_count
  * @property-read int|null                $transactions_count
+ * @property bool $encrypted
  */
 class Category extends Model
 {

app/Models/ImportJob.php

@@ -35,8 +35,8 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * Class ImportJob.
  *
- * @codeCoverageIgnore
- * @deprecated
+ * @codeCoverageIgnore 
+ * @deprecated 
  * @property array                                                      $transactions
  * @property array                                                      $configuration
  * @property User                                                       $user
@@ -73,6 +73,8 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @method static Builder|ImportJob whereUserId($value)
  * @mixin Eloquent
  * @property-read int|null                                              $attachments_count
+ * @property int $id
+ * @property array|null $extended_status
  */
 class ImportJob extends Model
 {

app/Models/Location.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * Location.php
  * Copyright (c) 2019 james@firefly-iii.org

app/Models/PiggyBank.php

@@ -78,6 +78,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @property-read int|null                $notes_count
  * @property-read int|null                $piggy_bank_events_count
  * @property-read int|null                $piggy_bank_repetitions_count
+ * @property bool $encrypted
  */
 class PiggyBank extends Model
 {

app/Models/PiggyBankEvent.php

@@ -51,6 +51,10 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
  * @method static Builder|PiggyBankEvent whereTransactionJournalId($value)
  * @method static Builder|PiggyBankEvent whereUpdatedAt($value)
  * @mixin Eloquent
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property \Illuminate\Support\Carbon $date
+ * @property-read \FireflyIII\Models\TransactionJournal|null $transactionJournal
  */
 class PiggyBankEvent extends Model
 {

app/Models/Preference.php

@@ -50,6 +50,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @method static Builder|Preference whereUpdatedAt($value)
  * @method static Builder|Preference whereUserId($value)
  * @mixin Eloquent
+ * @property-read \FireflyIII\User $user
  */
 class Preference extends Model
 {

app/Models/RecurrenceTransaction.php

@@ -76,6 +76,7 @@ use Illuminate\Support\Collection;
  * @method static Builder|RecurrenceTransaction withoutTrashed()
  * @mixin Eloquent
  * @property-read int|null $recurrence_transaction_meta_count
+ * @property int $transaction_currency_id
  */
 class RecurrenceTransaction extends Model
 {

app/Models/RuleGroup.php

@@ -69,6 +69,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @mixin Eloquent
  * @property-read int|null                   $rules_count
  * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup whereStopProcessing($value)
+ * @property string|null $description
  */
 class RuleGroup extends Model
 {

app/Models/Tag.php

@@ -78,6 +78,13 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @property-read \Illuminate\Database\Eloquent\Collection|Location[]   $locations
  * @property-read int|null                                              $locations_count
  * @property-read int|null                                              $transaction_journals_count
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property string $tagMode
+ * @property string|null $description
+ * @property float|null $latitude
+ * @property float|null $longitude
+ * @property int|null $zoomLevel
  */
 class Tag extends Model
 {

app/Models/Telemetry.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * Telemetry.php
  * Copyright (c) 2020 thegrumpydictator@gmail.com

app/Models/Transaction.php

@@ -132,6 +132,9 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @mixin Eloquent
  * @property-read int|null $budgets_count
  * @property-read int|null $categories_count
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property bool $reconciled
  */
 class Transaction extends Model
 {

app/Models/TransactionCurrency.php

@@ -67,6 +67,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @property-read int|null                        $budget_limits_count
  * @property-read int|null                        $transaction_journals_count
  * @property-read int|null                        $transactions_count
+ * @property string $name
  */
 class TransactionCurrency extends Model
 {

app/Models/TransactionJournal.php

@@ -121,6 +121,18 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @property-read int|null                                                          $transaction_journal_meta_count
  * @property-read int|null                                                          $transactions_count
  * @method static EloquentBuilder|TransactionJournal whereTransactionGroupId($value)
+ * @property int $user_id
+ * @property int|null $transaction_group_id
+ * @property int|null $transaction_currency_id
+ * @property \Illuminate\Support\Carbon|null $interest_date
+ * @property \Illuminate\Support\Carbon|null $book_date
+ * @property \Illuminate\Support\Carbon|null $process_date
+ * @property int $order
+ * @property bool $encrypted
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Budget[] $budgets
+ * @property-read \FireflyIII\Models\TransactionGroup|null $transactionGroup
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournalMeta[] $transactionJournalMeta
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions
  */
 class TransactionJournal extends Model
 {

app/Repositories/Category/CategoryRepository.php

@@ -267,6 +267,7 @@ class CategoryRepository implements CategoryRepositoryInterface
     {
         /** @var CategoryUpdateService $service */
         $service = app(CategoryUpdateService::class);
+        $service->setUser($this->user);
 
         return $service->update($category, $data);
     }

app/Repositories/TransactionGroup/TransactionGroupRepository.php

@@ -45,6 +45,7 @@ use FireflyIII\Services\Internal\Update\GroupUpdateService;
 use FireflyIII\Support\NullArrayObject;
 use FireflyIII\User;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Collection;
 use Log;
 
 /**
@@ -468,4 +469,15 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface
 
         return $return;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function getTagObjects(int $journalId): Collection
+    {
+        /** @var TransactionJournal $journal */
+        $journal = $this->user->transactionJournals()->find($journalId);
+
+        return $journal->tags()->get();
+    }
 }

app/Repositories/TransactionGroup/TransactionGroupRepositoryInterface.php

@@ -28,6 +28,7 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Support\NullArrayObject;
 use FireflyIII\User;
+use Illuminate\Support\Collection;
 
 /**
  * Interface TransactionGroupRepositoryInterface
@@ -122,6 +123,15 @@ interface TransactionGroupRepositoryInterface
      */
     public function getTags(int $journalId): array;
 
+    /**
+     * Get the tags for a journal (by ID) as Tag objects.
+     *
+     * @param int $journalId
+     *
+     * @return Collection
+     */
+    public function getTagObjects(int $journalId): Collection;
+
     /**
      * Set the user.
      *

app/Rules/IsTransferAccount.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * IsTransferAccount.php
  * Copyright (c) 2019 james@firefly-iii.org

app/Rules/LessThanPiggyTarget.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * LessThanPiggyTarget.php
  * Copyright (c) 2019 james@firefly-iii.org

app/Services/FireflyIIIOrg/Update/UpdateRequest.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * UpdateRequest.php
  * Copyright (c) 2019 james@firefly-iii.org

app/Services/FireflyIIIOrg/Update/UpdateRequestInterface.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * UpdateRequestInterface.php
  * Copyright (c) 2019 james@firefly-iii.org

app/Services/Internal/Support/JournalServiceTrait.php

@@ -367,13 +367,13 @@ trait JournalServiceTrait
             if (null !== $data['bic']) {
                 /** @var AccountMetaFactory $metaFactory */
                 $metaFactory = app(AccountMetaFactory::class);
-                $metaFactory->create(['account_id' => $result->id, 'name' => 'BIC', 'data' => $data['bic']]);
+                $metaFactory->create(['account_id' => $account->id, 'name' => 'BIC', 'data' => $data['bic']]);
             }
             // store account number
             if (null !== $data['number']) {
                 /** @var AccountMetaFactory $metaFactory */
                 $metaFactory = app(AccountMetaFactory::class);
-                $metaFactory->create(['account_id' => $result->id, 'name' => 'account_number', 'data' => $data['bic']]);
+                $metaFactory->create(['account_id' => $account->id, 'name' => 'account_number', 'data' => $data['bic']]);
             }
         }
 

app/Services/Internal/Support/LocationServiceTrait.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * LocationServiceTrait.php
  * Copyright (c) 2019 james@firefly-iii.org

app/Services/Internal/Update/CategoryUpdateService.php

@@ -35,6 +35,9 @@ use Log;
  */
 class CategoryUpdateService
 {
+    private $user;
+
+
     /**
      * Constructor.
      */
@@ -43,6 +46,9 @@ class CategoryUpdateService
         if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', get_class($this)));
         }
+        if(auth()->check()) {
+            $this->user = auth()->user();
+        }
     }
 
     /**
@@ -106,4 +112,12 @@ class CategoryUpdateService
         }
     }
 
+    /**
+     * @param mixed $user
+     */
+    public function setUser($user): void
+    {
+        $this->user = $user;
+    }
+
 }

app/Support/Cronjobs/AutoBudgetCronjob.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * AutoBudgetCronjob.php
  * Copyright (c) 2020 thegrumpydictator@gmail.com

app/Support/Export/ExportDataGenerator.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * ExportDataGenerator.php
  * Copyright (c) 2019 james@firefly-iii.org
@@ -659,7 +660,7 @@ class ExportDataGenerator
         $collector = app(GroupCollectorInterface::class);
         $collector->setUser($this->user);
         $collector->setRange($this->start, $this->end)->withAccountInformation()->withCategoryInformation()->withBillInformation()
-                  ->withBudgetInformation();
+                  ->withBudgetInformation()->withTagInformation();
         $journals = $collector->getExtractedJournals();
 
         $records = [];
@@ -689,8 +690,9 @@ class ExportDataGenerator
                 $journal['category_name'],
                 $journal['budget_name'],
                 $journal['bill_name'],
-                implode(',', $journal['tags']),
+                $this->mergeTags($journal['tags']),
             ];
+
         }
 
         //load the CSV document from a string
@@ -705,4 +707,22 @@ class ExportDataGenerator
         return $csv->getContent(); //returns the CSV document as a string
     }
 
+    /**
+     * @param array $tags
+     *
+     * @return string
+     */
+    private function mergeTags(array $tags): string
+    {
+        if (0 === count($tags)) {
+            return '';
+        }
+        $smol = [];
+        foreach ($tags as $tag) {
+            $smol[] = $tag['name'];
+        }
+
+        return implode(',', $smol);
+    }
+
 }

app/Support/Import/Routine/Spectre/StageImportDataHandler.php

@@ -171,6 +171,9 @@ class StageImportDataHandler
                         $foreignCurrencyCode = $value;
                         Log::debug(sprintf('Foreign currency code is now %s', $value));
                         break;
+                    case 'time':
+                        // ignore time because it breaks the duplicate detector.
+                        break;
                     default:
                         $notes .= $key . ': ' . $value . '  ' . "\n"; // for newline in Markdown.
                 }

app/Support/Search/AccountSearch.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * AccountSearch.php
  * Copyright (c) 2019 james@firefly-iii.org

app/Support/Search/GenericSearchInterface.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * GenericSearchInterface.php
  * Copyright (c) 2019 james@firefly-iii.org

app/Support/Search/TransactionSearch.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * TransactionSearch.php
  * Copyright (c) 2019 james@firefly-iii.org

app/Support/Search/TransferSearch.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * TransferSearch.php
  * Copyright (c) 2019 james@firefly-iii.org

app/Support/System/OAuthKeys.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * OAuthKeys.php
  * Copyright (c) 2019 james@firefly-iii.org

app/Support/Telemetry.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * Telemetry.php
  * Copyright (c) 2020 thegrumpydictator@gmail.com

app/User.php

@@ -138,6 +138,10 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @property-read int|null $transactions_count
  * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\User whereMfaSecret($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\User whereObjectguid($value)
+ * @property string $password
+ * @property bool $blocked
+ * @property string|null $blocked_code
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Role[] $roles
  */
 class User extends Authenticatable
 {

changelog.md

@@ -3,7 +3,10 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 
-## [5.2.0 (API 1.1.0)] - 2020-xx-xx
+## [5.2.0 (API 1.1.0)] - 2020-04-11
+
+- ⚠️ This will be the last version to support PHP version 7.3. The next release will require PHP **7.4**
+- ⚠️ The bunq and CSV import routines have been disabled and replaced by their stand alone variants: [bunq](https://github.com/firefly-iii/bunq-importer), [CSV](https://github.com/firefly-iii/csv-importer).
 
 This release was preceded by a number of test versions:
 
@@ -28,6 +31,7 @@ This release was preceded by a number of test versions:
 - [Issue 2997](https://github.com/firefly-iii/firefly-iii/issues/2997) The tag list has categories.
 - [Issue 3122](https://github.com/firefly-iii/firefly-iii/issues/3122) Buttons on the top of lists.
 - The Docker maximum file attachment size has been increased to 64M.
+- The CSV file importer has been disabled. Find the [new CSV importer on GitHub](https://github.com/firefly-iii/csv-importer).
 
 ### Fixed
 - [Issue 3154](https://github.com/firefly-iii/firefly-iii/issues/3154) `bcadd()` problems for users who were already running PHP7.4.
@@ -36,13 +40,14 @@ This release was preceded by a number of test versions:
 - [Issue 3202](https://github.com/firefly-iii/firefly-iii/issues/3202) A bug in the frontpage budget chart is fixed.
 - [Issue 3203](https://github.com/firefly-iii/firefly-iii/issues/3203) Firefly III won't complain when using a locale that uses comma's as decimal separators.
 - [Issue 3212](https://github.com/firefly-iii/firefly-iii/issues/3212) Issue with ING imports.
-- [Issue 3210](https://github.com/firefly-iii/firefly-iii/issues/3210) Could not create rule based on a transaction from a dropdown menu. 
+- [Issue 3210](https://github.com/firefly-iii/firefly-iii/issues/3210) Could not create rule based on a transaction from a dropdown menu.
+- [Issue 3234](https://github.com/firefly-iii/firefly-iii/issues/3234) Export didn't export tags. 
 
 ### API
 - [Issue 2828](https://github.com/firefly-iii/firefly-iii/issues/2828) Appropriate endpoints for new transaction possibilities.
 - [Issue 2958](https://github.com/firefly-iii/firefly-iii/issues/2958) A new default currency endpoint.
 
-## [5.1.1 (API 1.0.2)] - 2020-03-xx
+## [5.1.1 (API 1.0.2)] - 2020-03-13
 
 ### Added
 - [Issue 2672](https://github.com/firefly-iii/firefly-iii/issues/2672) Buttons to create transactions from the list of accounts is back.
@@ -2214,4 +2219,4 @@ An intermediate release because something in the Twig and Twigbridge libraries i
 - Initial release.
 
 ### API
-- Initial release
+- Initial release

composer.lock

@@ -171,12 +171,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/bunq/sdk_php.git",
-                "reference": "7771fd0ab15402df1f06efba220847b7ee4ac861"
+                "reference": "d97d2a710038d183b711825864584e2d31e30e35"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bunq/sdk_php/zipball/7771fd0ab15402df1f06efba220847b7ee4ac861",
-                "reference": "7771fd0ab15402df1f06efba220847b7ee4ac861",
+                "url": "https://api.github.com/repos/bunq/sdk_php/zipball/d97d2a710038d183b711825864584e2d31e30e35",
+                "reference": "d97d2a710038d183b711825864584e2d31e30e35",
                 "shasum": ""
             },
             "require": {
@@ -227,7 +227,7 @@
                 "payment",
                 "sepa"
             ],
-            "time": "2020-02-19T10:34:14+00:00"
+            "time": "2020-04-03T15:48:46+00:00"
         },
         {
             "name": "davejamesmiller/laravel-breadcrumbs",
@@ -1342,16 +1342,16 @@
         },
         {
             "name": "laminas/laminas-zendframework-bridge",
-            "version": "1.0.2",
+            "version": "1.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-zendframework-bridge.git",
-                "reference": "faf68f6109ceeff24241226033ab59640c7eb63b"
+                "reference": "bfbbdb6c998d50dbf69d2187cb78a5f1fa36e1e9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/faf68f6109ceeff24241226033ab59640c7eb63b",
-                "reference": "faf68f6109ceeff24241226033ab59640c7eb63b",
+                "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/bfbbdb6c998d50dbf69d2187cb78a5f1fa36e1e9",
+                "reference": "bfbbdb6c998d50dbf69d2187cb78a5f1fa36e1e9",
                 "shasum": ""
             },
             "require": {
@@ -1390,20 +1390,26 @@
                 "laminas",
                 "zf"
             ],
-            "time": "2020-03-26T16:07:12+00:00"
+            "funding": [
+                {
+                    "url": "https://funding.communitybridge.org/projects/laminas-project",
+                    "type": "community_bridge"
+                }
+            ],
+            "time": "2020-04-03T16:01:00+00:00"
         },
         {
             "name": "laravel/framework",
-            "version": "v6.18.3",
+            "version": "v6.18.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "4e48acfaba87f08320a2764d36c3b6a4a4112ccf"
+                "reference": "4ef5f9612c2694c915f53f0cec3e4081e9bfc778"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/4e48acfaba87f08320a2764d36c3b6a4a4112ccf",
-                "reference": "4e48acfaba87f08320a2764d36c3b6a4a4112ccf",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/4ef5f9612c2694c915f53f0cec3e4081e9bfc778",
+                "reference": "4ef5f9612c2694c915f53f0cec3e4081e9bfc778",
                 "shasum": ""
             },
             "require": {
@@ -1536,7 +1542,7 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2020-03-24T16:37:50+00:00"
+            "time": "2020-04-08T15:51:23+00:00"
         },
         {
             "name": "laravel/passport",
@@ -1736,16 +1742,16 @@
         },
         {
             "name": "league/commonmark",
-            "version": "1.3.2",
+            "version": "1.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "75542a366ccbe1896ed79fcf3e8e68206d6c4257"
+                "reference": "5a67afc2572ec6d430526cdc9c637ef124812389"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/75542a366ccbe1896ed79fcf3e8e68206d6c4257",
-                "reference": "75542a366ccbe1896ed79fcf3e8e68206d6c4257",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/5a67afc2572ec6d430526cdc9c637ef124812389",
+                "reference": "5a67afc2572ec6d430526cdc9c637ef124812389",
                 "shasum": ""
             },
             "require": {
@@ -1820,7 +1826,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-03-25T19:55:28+00:00"
+            "time": "2020-04-05T16:01:48+00:00"
         },
         {
             "name": "league/csv",
@@ -2843,16 +2849,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "2.0.26",
+            "version": "2.0.27",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "09655fcc1f8bab65727be036b28f6f20311c126c"
+                "reference": "34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/09655fcc1f8bab65727be036b28f6f20311c126c",
-                "reference": "09655fcc1f8bab65727be036b28f6f20311c126c",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc",
+                "reference": "34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc",
                 "shasum": ""
             },
             "require": {
@@ -2945,7 +2951,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-03-13T04:15:39+00:00"
+            "time": "2020-04-04T23:17:33+00:00"
         },
         {
             "name": "pragmarx/google2fa",
@@ -5581,16 +5587,16 @@
         },
         {
             "name": "tightenco/collect",
-            "version": "v7.4.0",
+            "version": "v7.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/tightenco/collect.git",
-                "reference": "5024db45b1ec1956e6d5959cbb5cdf5f00f26f56"
+                "reference": "1f5f7a36657a126fa035c7cfaafd738391690967"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tightenco/collect/zipball/5024db45b1ec1956e6d5959cbb5cdf5f00f26f56",
-                "reference": "5024db45b1ec1956e6d5959cbb5cdf5f00f26f56",
+                "url": "https://api.github.com/repos/tightenco/collect/zipball/1f5f7a36657a126fa035c7cfaafd738391690967",
+                "reference": "1f5f7a36657a126fa035c7cfaafd738391690967",
                 "shasum": ""
             },
             "require": {
@@ -5627,7 +5633,7 @@
                 "collection",
                 "laravel"
             ],
-            "time": "2020-03-31T17:56:15+00:00"
+            "time": "2020-04-08T17:29:27+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -5816,16 +5822,16 @@
     "packages-dev": [
         {
             "name": "amphp/amp",
-            "version": "v2.4.1",
+            "version": "v2.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/amphp/amp.git",
-                "reference": "2ac3b550c4997f2ec304faa63c8b2885079a2dc4"
+                "reference": "feca077369a47263b22156b3c6389e55f3809f24"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/amphp/amp/zipball/2ac3b550c4997f2ec304faa63c8b2885079a2dc4",
-                "reference": "2ac3b550c4997f2ec304faa63c8b2885079a2dc4",
+                "url": "https://api.github.com/repos/amphp/amp/zipball/feca077369a47263b22156b3c6389e55f3809f24",
+                "reference": "feca077369a47263b22156b3c6389e55f3809f24",
                 "shasum": ""
             },
             "require": {
@@ -5835,14 +5841,15 @@
                 "amphp/php-cs-fixer-config": "dev-master",
                 "amphp/phpunit-util": "^1",
                 "ext-json": "*",
-                "phpstan/phpstan": "^0.8.5",
+                "jetbrains/phpstorm-stubs": "^2019.3",
                 "phpunit/phpunit": "^6.0.9 | ^7",
-                "react/promise": "^2"
+                "react/promise": "^2",
+                "vimeo/psalm": "^3.9@dev"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "2.x-dev"
                 }
             },
             "autoload": {
@@ -5889,20 +5896,20 @@
                 "non-blocking",
                 "promise"
             ],
-            "time": "2020-02-10T18:10:57+00:00"
+            "time": "2020-04-04T15:05:26+00:00"
         },
         {
             "name": "amphp/byte-stream",
-            "version": "v1.7.2",
+            "version": "v1.7.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/amphp/byte-stream.git",
-                "reference": "1e52f1752b2e20e2a7e464476ef887a2388e3832"
+                "reference": "b867505edb79dda8f253ca3c3a2bbadae4b16592"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/amphp/byte-stream/zipball/1e52f1752b2e20e2a7e464476ef887a2388e3832",
-                "reference": "1e52f1752b2e20e2a7e464476ef887a2388e3832",
+                "url": "https://api.github.com/repos/amphp/byte-stream/zipball/b867505edb79dda8f253ca3c3a2bbadae4b16592",
+                "reference": "b867505edb79dda8f253ca3c3a2bbadae4b16592",
                 "shasum": ""
             },
             "require": {
@@ -5912,10 +5919,16 @@
                 "amphp/php-cs-fixer-config": "dev-master",
                 "amphp/phpunit-util": "^1",
                 "friendsofphp/php-cs-fixer": "^2.3",
-                "infection/infection": "^0.9.3",
-                "phpunit/phpunit": "^6"
+                "jetbrains/phpstorm-stubs": "^2019.3",
+                "phpunit/phpunit": "^6 || ^7 || ^8",
+                "vimeo/psalm": "^3.9@dev"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Amp\\ByteStream\\": "lib"
@@ -5948,7 +5961,7 @@
                 "non-blocking",
                 "stream"
             ],
-            "time": "2020-01-29T18:22:23+00:00"
+            "time": "2020-04-04T16:56:54+00:00"
         },
         {
             "name": "barryvdh/laravel-ide-helper",
@@ -6072,16 +6085,16 @@
         },
         {
             "name": "composer/ca-bundle",
-            "version": "1.2.6",
+            "version": "1.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/ca-bundle.git",
-                "reference": "47fe531de31fca4a1b997f87308e7d7804348f7e"
+                "reference": "95c63ab2117a72f48f5a55da9740a3273d45b7fd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/47fe531de31fca4a1b997f87308e7d7804348f7e",
-                "reference": "47fe531de31fca4a1b997f87308e7d7804348f7e",
+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/95c63ab2117a72f48f5a55da9740a3273d45b7fd",
+                "reference": "95c63ab2117a72f48f5a55da9740a3273d45b7fd",
                 "shasum": ""
             },
             "require": {
@@ -6124,20 +6137,30 @@
                 "ssl",
                 "tls"
             ],
-            "time": "2020-01-13T10:02:55+00:00"
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-04-08T08:27:21+00:00"
         },
         {
             "name": "composer/composer",
-            "version": "1.10.1",
+            "version": "1.10.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/composer.git",
-                "reference": "b912a45da3e2b22f5cb5a23e441b697a295ba011"
+                "reference": "7a4d5b6aa30d2118af27c04f5e897b57156ccfa9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/b912a45da3e2b22f5cb5a23e441b697a295ba011",
-                "reference": "b912a45da3e2b22f5cb5a23e441b697a295ba011",
+                "url": "https://api.github.com/repos/composer/composer/zipball/7a4d5b6aa30d2118af27c04f5e897b57156ccfa9",
+                "reference": "7a4d5b6aa30d2118af27c04f5e897b57156ccfa9",
                 "shasum": ""
             },
             "require": {
@@ -6204,17 +6227,7 @@
                 "dependency",
                 "package"
             ],
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-03-13T19:34:27+00:00"
+            "time": "2020-04-10T09:44:22+00:00"
         },
         {
             "name": "composer/semver",
@@ -7899,16 +7912,6 @@
                 "testing",
                 "xunit"
             ],
-            "funding": [
-                {
-                    "url": "https://phpunit.de/donate.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-03-31T08:52:04+00:00"
         },
         {

config/firefly.php

@@ -138,7 +138,7 @@ return [
     ],
 
     'encryption'                   => null === env('USE_ENCRYPTION') || true === env('USE_ENCRYPTION'),
-    'version'                      => '5.2.0-beta.1',
+    'version'                      => '5.2.0',
     'api_version'                  => '1.1.0',
     'db_version'                   => 13,
     'maxUploadSize'                => 15242880,

config/import.php

@@ -44,7 +44,7 @@ return [
     // these import providers are available:
     'enabled'          => [
         'fake'    => true,
-        'file'    => true,
+        'file'    => false,
         'bunq'    => false,
         'spectre' => true,
         'ynab'    => true,

public/v1/css/daterangepicker.css

@@ -12,7 +12,7 @@
   left: 20px;
   z-index: 3001;
   display: none;
-  font-family: arial;
+  font-family: sans-serif, Arial;
   font-size: 15px;
   line-height: 1em;
 }
@@ -155,7 +155,6 @@
   font-size: 12px;
   border-radius: 4px;
   border: 1px solid transparent;
-  white-space: nowrap;
   cursor: pointer;
 }
 

readme.md

@@ -109,9 +109,12 @@ Many more features are listed in the [documentation](https://docs.firefly-iii.or
 Several users have built pretty awesome stuff around the Firefly III API. Check out these tools:
 
 * [An Android app by Mike Conway](https://play.google.com/store/apps/details?id=com.zerobyte.firefly)
-* [A Telegram bot by Igor Tsupko](https://github.com/may-cat/firefly-iii-telegram-bot)
+* [A Telegram bot by Valmik](https://github.com/vjFaLk/firefly-bot)
 * [An Android app by Daniel Quah](https://github.com/emansih/FireflyMobile)
 * [A tool to import from Plaid by George Hahn](https://gitlab.com/GeorgeHahn/firefly-plaid-connector)
+* [Firefly III CSV importer](http://github.com/firefly-iii/csv-importer)
+* [Firefly III bunq 🌈 importer](http://github.com/firefly-iii/bunq-importer)
+* [Firefly III YNAB importer](http://github.com/firefly-iii/ynab-importer)
 
 ## Getting Started
 

resources/assets/js/locales/ru.json

@@ -8,7 +8,7 @@
         "errors_submission": "\u041f\u0440\u0438 \u043e\u0442\u043f\u0440\u0430\u0432\u043a\u0435 \u043f\u0440\u043e\u0438\u0437\u043e\u0448\u043b\u0430 \u043e\u0448\u0438\u0431\u043a\u0430. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u043e\u0448\u0438\u0431\u043a\u0438 \u043d\u0438\u0436\u0435.",
         "split": "\u0420\u0430\u0437\u0434\u0435\u043b\u0438\u0442\u044c",
         "transaction_journal_information": "\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438",
-        "no_budget_pointer": "You seem to have no budgets yet. You should create some on the <a href=\"\/budgets\">budgets<\/a>-page. Budgets can help you keep track of expenses.",
+        "no_budget_pointer": "\u041f\u043e\u0445\u043e\u0436\u0435, \u0443 \u0432\u0430\u0441 \u043f\u043e\u043a\u0430 \u043d\u0435\u0442 \u0431\u044e\u0434\u0436\u0435\u0442\u043e\u0432. \u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0441\u043e\u0437\u0434\u0430\u0442\u044c \u0438\u0445 \u0432 \u0440\u0430\u0437\u0434\u0435\u043b\u0435 <a href=\"\/budgets\">\u0411\u044e\u0434\u0436\u0435\u0442\u044b<\/a>. \u0411\u044e\u0434\u0436\u0435\u0442\u044b \u043c\u043e\u0433\u0443\u0442 \u043f\u043e\u043c\u043e\u0447\u044c \u0432\u0430\u043c \u043e\u0442\u0441\u043b\u0435\u0436\u0438\u0432\u0430\u0442\u044c \u0440\u0430\u0441\u0445\u043e\u0434\u044b.",
         "source_account": "\u0421\u0447\u0451\u0442-\u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a",
         "hidden_fields_preferences": "You can enable more transaction options in your <a href=\"\/preferences\">settings<\/a>.",
         "destination_account": "\u0421\u0447\u0451\u0442 \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f",

resources/lang/cs_CZ/firefly.php

@@ -1451,6 +1451,7 @@ return [
     'tools_index_intro'                     => 'Several tools exist to import data into Firefly III. Check them out below. For more information, check out <a href="https://docs.firefly-iii.org/importing-data/introduction">this page</a>.',
     'firefly_iii_csv_importer_name'         => 'Firefly III CSV importer',
     'firefly_iii_bunq_importer_name'        => 'Firefly III bunq 🌈 importer',
+    'firefly_iii_ynab_importer_name'        => 'Firefly III YNAB importer',
     'ludo_revolut_importer_name'            => 'Ludo444\'s Revolut importer',
     //
     // sandstorm.io errors and messages:

resources/lang/de_DE/firefly.php

@@ -1451,6 +1451,7 @@ return [
     'tools_index_intro'                     => 'Es gibt mehrere Werkzeuge, um Daten in Firefly III zu importieren (Diese werden unten vorgestellt). Weitere Informationen finden Sie unter <a href="https://docs.firefly-iii.org/importing-data/introduction">hier auf dieser Seite</a>.',
     'firefly_iii_csv_importer_name'         => 'Firefly III CSV-Import',
     'firefly_iii_bunq_importer_name'        => 'Firefly III Bunq 🌈 importieren',
+    'firefly_iii_ynab_importer_name'        => 'Firefly III YNAB importer',
     'ludo_revolut_importer_name'            => 'Ludo444\'s Revolut-Importer',
     //
     // sandstorm.io errors and messages:
@@ -1604,7 +1605,7 @@ return [
     'telemetry_admin_overview'           => 'Telemetrieübersicht',
     'telemetry_back_to_index'            => 'Zurück zum Telemetrieindex',
     'not_yet_submitted'                  => 'Noch nicht übermittelt',
-    'telemetry_type_feature'             => 'Feature flag',
+    'telemetry_type_feature'             => 'Funktions-Flag',
     'telemetry_submit_all'               => 'Datensätze übermitteln',
     'telemetry_delete_submitted_records' => 'Übertragene Datensätze löschen',
     'telemetry_submission_executed'      => 'Datensätze wurden übermittelt. Überprüfen Sie Ihre Protokolldateien für weitere Informationen.',

resources/lang/el_GR/firefly.php

@@ -1451,6 +1451,7 @@ return [
     'tools_index_intro'                     => 'Υπάρχουν διάφορα εργαλεία για την εισαγωγή δεδομένων στο Firefly III. Δείτε τα παρακάτω. Για περισσότερες πληροφορίες, ανατρέξτε σε <a href="https://docs.firefly-iii.org/importing-data/introduction">αυτή τη σελίδα</a>.',
     'firefly_iii_csv_importer_name'         => 'Εργαλείο εισαγωγής CSV στο Firefly III',
     'firefly_iii_bunq_importer_name'        => 'Εργαλείο εισαγωγής bunq 🌈 στο Firefly III',
+    'firefly_iii_ynab_importer_name'        => 'Firefly III YNAB importer',
     'ludo_revolut_importer_name'            => 'Εισαγωγέας δεδομένων Revolut του Ludo444',
     //
     // sandstorm.io errors and messages:

resources/lang/en_US/firefly.php

@@ -1451,6 +1451,7 @@ return [
     'tools_index_intro'                     => 'Several tools exist to import data into Firefly III. Check them out below. For more information, check out <a href="https://docs.firefly-iii.org/importing-data/introduction">this page</a>.',
     'firefly_iii_csv_importer_name'         => 'Firefly III CSV importer',
     'firefly_iii_bunq_importer_name'        => 'Firefly III bunq 🌈 importer',
+    'firefly_iii_ynab_importer_name'        => 'Firefly III YNAB importer',
     'ludo_revolut_importer_name'            => 'Ludo444\'s Revolut importer',
     //
     // sandstorm.io errors and messages:

resources/lang/es_ES/firefly.php

@@ -1451,6 +1451,7 @@ return [
     'tools_index_intro'                     => 'Existen varias herramientas para importar datos en Firefly III. Reviselas a continuación. Para más información, consulte <a href="https://docs.firefly-iii.org/importing-data/introduction">esta página</a>.',
     'firefly_iii_csv_importer_name'         => 'Importador CSV de Firefly III',
     'firefly_iii_bunq_importer_name'        => 'Importador de Firefly III bunq',
+    'firefly_iii_ynab_importer_name'        => 'Firefly III YNAB importer',
     'ludo_revolut_importer_name'            => 'Importador Ludo444\'s Revolut',
     //
     // sandstorm.io errors and messages:

resources/lang/fi_FI/firefly.php

@@ -1451,6 +1451,7 @@ return [
     'tools_index_intro'                     => 'Tietojen tuomiseen Firefly III:een on olemassa useita työkaluja. Löydät ne alta. Lisätietoja on <a href="https://docs.firefly-iii.org/importing-data/introduction"> tällä sivulla </a>.',
     'firefly_iii_csv_importer_name'         => 'Firefly III CSV tuoja',
     'firefly_iii_bunq_importer_name'        => 'Firefly III bunq 🌈 tuoja',
+    'firefly_iii_ynab_importer_name'        => 'Firefly III YNAB importer',
     'ludo_revolut_importer_name'            => 'Ludo444:n Revolut-tuontityökalu',
     //
     // sandstorm.io errors and messages:

resources/lang/fr_FR/firefly.php

@@ -1149,7 +1149,7 @@ return [
     'accountBalances'                           => 'Soldes du compte',
     'balanceStart'                              => 'Solde au début de la période',
     'balanceEnd'                                => 'Solde à la fin de la période',
-    'splitByAccount'                            => 'Ventiler par compte',
+    'splitByAccount'                            => 'Ventilé par compte',
     'coveredWithTags'                           => 'Recouvert de tags',
     'leftInBudget'                              => 'Budget restant',
     'sumOfSums'                                 => 'Somme des montants',
@@ -1451,6 +1451,7 @@ return [
     'tools_index_intro'                     => 'Plusieurs outils permettent d\'importer des données dans Firefly III. Vous les retrouverez ci-dessous. Pour plus d\'informations, consultez <a href="https://docs.firefly-iii.org/importing-data/introduction">cette page</a> (en anglais).',
     'firefly_iii_csv_importer_name'         => 'Importation CSV Firefly III',
     'firefly_iii_bunq_importer_name'        => 'Importation Bunq Firefly III',
+    'firefly_iii_ynab_importer_name'        => 'Firefly III YNAB importer',
     'ludo_revolut_importer_name'            => 'Importation Revolut (Ludo444)',
     //
     // sandstorm.io errors and messages:

resources/lang/hu_HU/firefly.php

@@ -1451,6 +1451,7 @@ return [
     'tools_index_intro'                     => 'Several tools exist to import data into Firefly III. Check them out below. For more information, check out <a href="https://docs.firefly-iii.org/importing-data/introduction">this page</a>.',
     'firefly_iii_csv_importer_name'         => 'Firefly III CSV importáló',
     'firefly_iii_bunq_importer_name'        => 'Firefly III bunq 🌈 importáló',
+    'firefly_iii_ynab_importer_name'        => 'Firefly III YNAB importer',
     'ludo_revolut_importer_name'            => 'Ludo444\'s Revolut importáló',
     //
     // sandstorm.io errors and messages:

resources/lang/id_ID/firefly.php

@@ -1451,6 +1451,7 @@ return [
     'tools_index_intro'                     => 'Several tools exist to import data into Firefly III. Check them out below. For more information, check out <a href="https://docs.firefly-iii.org/importing-data/introduction">this page</a>.',
     'firefly_iii_csv_importer_name'         => 'Firefly III CSV importer',
     'firefly_iii_bunq_importer_name'        => 'Firefly III bunq 🌈 importer',
+    'firefly_iii_ynab_importer_name'        => 'Firefly III YNAB importer',
     'ludo_revolut_importer_name'            => 'Ludo444\'s Revolut importer',
     //
     // sandstorm.io errors and messages:

resources/lang/it_IT/firefly.php

@@ -1451,6 +1451,7 @@ return [
     'tools_index_intro'                     => 'Esistono diversi strumenti per importare dati in Firefly III. Controlla quelli qui sotto. Per ulteriori informazioni, consulta <a href="https://docs.firefly-iii.org/importing-data/introduction">questa pagina</a>.',
     'firefly_iii_csv_importer_name'         => 'Importatore CSV di Firefly III',
     'firefly_iii_bunq_importer_name'        => 'Importatore bunq🌈 di Firefly III',
+    'firefly_iii_ynab_importer_name'        => 'Firefly III YNAB importer',
     'ludo_revolut_importer_name'            => 'Importatore Revolut di Ludo444',
     //
     // sandstorm.io errors and messages:

resources/lang/nb_NO/firefly.php

@@ -1451,6 +1451,7 @@ return [
     'tools_index_intro'                     => 'Several tools exist to import data into Firefly III. Check them out below. For more information, check out <a href="https://docs.firefly-iii.org/importing-data/introduction">this page</a>.',
     'firefly_iii_csv_importer_name'         => 'Firefly III CSV importer',
     'firefly_iii_bunq_importer_name'        => 'Firefly III bunq 🌈 importer',
+    'firefly_iii_ynab_importer_name'        => 'Firefly III YNAB importer',
     'ludo_revolut_importer_name'            => 'Ludo444\'s Revolut importer',
     //
     // sandstorm.io errors and messages:

resources/lang/nl_NL/firefly.php

@@ -1451,6 +1451,7 @@ return [
     'tools_index_intro'                     => 'Er bestaan een paar tools om data te importeren in Firefly III. Zie hieronder voor de lijst. Check ook <a href="https://docs.firefly-iii.org/importing-data/introduction">deze pagina</a> voor meer info.',
     'firefly_iii_csv_importer_name'         => 'Firefly III CSV importer',
     'firefly_iii_bunq_importer_name'        => 'Firefly III bunq 🌈 importer',
+    'firefly_iii_ynab_importer_name'        => 'Firefly III YNAB importer',
     'ludo_revolut_importer_name'            => 'Ludo444\'s Revolut-import tool',
     //
     // sandstorm.io errors and messages:

resources/lang/pl_PL/firefly.php

@@ -1451,6 +1451,7 @@ return [
     'tools_index_intro'                     => 'Several tools exist to import data into Firefly III. Check them out below. For more information, check out <a href="https://docs.firefly-iii.org/importing-data/introduction">this page</a>.',
     'firefly_iii_csv_importer_name'         => 'Firefly III CSV importer',
     'firefly_iii_bunq_importer_name'        => 'Firefly III bunq 🌈 importer',
+    'firefly_iii_ynab_importer_name'        => 'Firefly III YNAB importer',
     'ludo_revolut_importer_name'            => 'Importer Revoult Ludo444',
     //
     // sandstorm.io errors and messages:

resources/lang/pt_BR/firefly.php

@@ -520,10 +520,10 @@ return [
     'mapbox_api_key'                  => 'Para usar o mapa, obtenha uma chave API do <a href="https://www.mapbox.com/">Mapbox</a>. Abra seu arquivo <code>.env</code> e insira este código <code>MAPBOX_API_KEY=</code>.',
     'press_object_location'              => 'Right click or long press to set the object\'s location.',
     'clear_location'                  => 'Limpar localização',
-    'delete_all_selected_tags'        => 'Delete all selected tags',
-    'select_tags_to_delete'           => 'Don\'t forget to select some tags.',
-    'deleted_x_tags'                  => 'Deleted :count tag(s).',
-    'create_rule_from_transaction'    => 'Create rule based on transaction',
+    'delete_all_selected_tags'        => 'Excluir todas as tags selecionadas',
+    'select_tags_to_delete'           => 'Não se esqueça de selecionar algumas tags.',
+    'deleted_x_tags'                  => 'Excluída(s) :count tag(s).',
+    'create_rule_from_transaction'    => 'Criar regra baseada na transação',
 
     // preferences
     'pref_home_screen_accounts'       => 'Conta da tela inicial',
@@ -589,7 +589,7 @@ return [
     'optional_field_meta_data'                  => 'Meta dados opcionais',
 
     // profile:
-    'permanent_delete_stuff'                    => 'Be careful with these buttons. Deleting stuff is permanent.',
+    'permanent_delete_stuff'                    => 'Tenha cuidado com estes botões. A exclusão de coisas é permanente.',
     'delete_all_budgets'                        => 'Excluir TODOS os seus orçamentos',
     'delete_all_categories'                     => 'Excluir TODAS as suas categorias',
     'delete_all_tags'                           => 'Excluir TODAS as suas tags',
@@ -633,11 +633,11 @@ return [
     'delete_local_info_only'        => 'Como você se autentica por meio de ":login_provider", isso irá apagar apenas informações locais do Firefly III.',
 
     // export data:
-    'import_and_export_menu'        => 'Import and export',
-    'export_data_title'             => 'Export data from Firefly III',
-    'export_data_menu'              => 'Export data',
-    'export_data_bc'                => 'Export data from Firefly III',
-    'export_data_main_title'        => 'Export data from Firefly III',
+    'import_and_export_menu'        => 'Importar e exportar',
+    'export_data_title'             => 'Exportar dados do Firefly III',
+    'export_data_menu'              => 'Exportar dados',
+    'export_data_bc'                => 'Exportar dados do Firefly III',
+    'export_data_main_title'        => 'Exportar dados do Firefly III',
     'export_data_expl'              => 'This link allows you to export all transactions + meta data from Firefly III. Please refer to the help (top right (?)-icon) for more information about the process.',
     'export_data_all_transactions'  => 'Export all transactions',
     'export_data_advanced_expl'     => 'If you need a more advanced or specific type of export, read the help on how to use the console command <code>php artisan help firefly-iii:export-data</code>.',
@@ -1451,6 +1451,7 @@ return [
     'tools_index_intro'                     => 'Existem várias ferramentas para importar dados para o Firefly III. Confira-as abaixo. Para obter mais informações, acesse <a href="https://docs.firefly-iii.org/importing-data/introduction">esta página</a>.',
     'firefly_iii_csv_importer_name'         => 'Importador CSV Firefly III',
     'firefly_iii_bunq_importer_name'        => 'Importador Firefly III bunq 🌈',
+    'firefly_iii_ynab_importer_name'        => 'Firefly III YNAB importer',
     'ludo_revolut_importer_name'            => 'Ludo444\'s Revolut importer',
     //
     // sandstorm.io errors and messages:

resources/lang/ro_RO/firefly.php

@@ -1451,6 +1451,7 @@ return [
     'tools_index_intro'                     => 'Several tools exist to import data into Firefly III. Check them out below. For more information, check out <a href="https://docs.firefly-iii.org/importing-data/introduction">this page</a>.',
     'firefly_iii_csv_importer_name'         => 'Firefly III CSV importer',
     'firefly_iii_bunq_importer_name'        => 'Firefly III bunq 🌈 importer',
+    'firefly_iii_ynab_importer_name'        => 'Firefly III YNAB importer',
     'ludo_revolut_importer_name'            => 'Ludo444\'s Revolut importer',
     //
     // sandstorm.io errors and messages:

resources/lang/ru_RU/firefly.php

@@ -95,7 +95,7 @@ return [
     'two_factor_forgot'                          => 'Я забыл свой ключ для двухфакторной авторизации.',
     'two_factor_lost_header'                     => 'Потеряли вашу двухфакторную аутентификацию?',
     'two_factor_lost_intro'                      => 'Если вы потеряли также и ваши резервные коды, вам не повезло. Эту проблему вы не сможете решить через веб-интерфейс. Теперь у вас есть два варианта.',
-    'two_factor_lost_fix_self'                   => 'If you run your own instance of Firefly III, read <a href="https://docs.firefly-iii.org/faq/other#i-lost-my-two-factor-authentication-codes-and-backup-codes">this entry in the FAQ</a> for instructions.',
+    'two_factor_lost_fix_self'                   => 'Если вы запускаете свой собственный экземпляр Firefly III, прочтите <a href="https://docs.firefly-iii.org/faq/other#i-lost-my-two-factor-authentication-codes-and-backup-codes">эту запись в FAQ</a> для получения инструкций.',
     'two_factor_lost_fix_owner'                  => 'Иначе, свяжитесь по email с владельцем сайта <a href="mailto::site_owner">:site_owner</a> и попросите сбросить вашу двухфакторную аутентификацию.',
     'mfa_backup_code'                            => 'Вы использовали резервный код для входа в Firefly III. Его нельзя использовать второй раз, поэтому вычеркните его из своего списка.',
     'pref_two_factor_new_backup_codes'           => 'Получить новые коды резервирования',
@@ -104,7 +104,7 @@ return [
     'warning_much_data'                          => 'Загрузка данных за :days дней может занять некоторое время.',
     'registered'                                 => 'Вы зарегистрировались успешно!',
     'Default asset account'                      => 'Счёт по умолчанию',
-    'no_budget_pointer'                          => 'You seem to have no budgets yet. You should create some on the <a href="/budgets">budgets</a>-page. Budgets can help you keep track of expenses.',
+    'no_budget_pointer'                          => 'Похоже, у вас пока нет бюджетов. Вы должны создать их в разделе <a href="/budgets">Бюджеты</a>. Бюджеты могут помочь вам отслеживать расходы.',
     'Savings account'                            => 'Сберегательный счет',
     'Credit card'                                => 'Кредитная карта',
     'source_accounts'                            => 'Исходный счет(а)',
@@ -224,7 +224,7 @@ return [
     // check for updates:
     'update_check_title'                         => 'Проверить обновления',
     'admin_update_check_title'                   => 'Автоматически проверять наличие обновлений',
-    'admin_update_check_explain'                 => 'Firefly III can check for updates automatically. When you enable this setting, it will contact the Firefly III update server to see if a new version of Firefly III is available. When it is, you will get a notification. You can test this notification using the button on the right. Please indicate below if you want Firefly III to check for updates.',
+    'admin_update_check_explain'                 => 'Firefly III может автоматически проверять наличие обновлений. После включения опции, он свяжется с сервером обновлений Firefly III, чтобы узнать, доступна ли новая версия Firefly III. Когда это произойдёт, вы получите уведомление. Вы можете проверить это уведомление, нажав кнопку справа. Пожалуйста, укажите ниже, если вы хотите, чтобы Firefly III проверял наличие обновлений.',
     'check_for_updates_permission'               => 'Firefly III может проверять наличие обновлений, но для этого требуется ваше разрешение. Перейдите в <a href=":link">администрирование</a>, чтобы указать, хотите ли вы включить эту функцию.',
     'updates_ask_me_later'                       => 'Спросить меня позже',
     'updates_do_not_check'                       => 'Не проверять наличие обновлений',
@@ -237,9 +237,9 @@ return [
     'update_version_alpha'                       => 'Эта версия является АЛЬФА-версией. Вы можете столкнуться с проблемами.',
     'update_current_version_alert'               => 'Вы используете v:version, которая является последним доступным релизом.',
     'update_newer_version_alert'                 => 'Вы используете версию v:your_version, которая новее последнего релиза (v:new_version).',
-    'update_check_error'                         => 'An error occurred while checking for updates: :error',
-    'unknown_error'                              => 'Unknown error. Sorry about that.',
-    'just_new_release'                           => 'A new version is available! Version :version was released :date. This release is very fresh. Wait a few days for the new release to stabilize.',
+    'update_check_error'                         => 'Произошла ошибка при проверке обновлений: :error',
+    'unknown_error'                              => 'Неизвестная ошибка. Извините за это.',
+    'just_new_release'                           => 'Доступна новая версия! Версия :version была выпущена :date. Этот релиз очень свежий. Подождите несколько дней, пока этот релиз стабилизируется.',
     'admin_update_channel_title'                 => 'Канал обновлений',
     'admin_update_channel_explain'               => 'Firefly III может использовать три "канала" обновлений, которые различаются наборами новых функций и ошибок. Используйте "бета"-канал, если вы любите приключения и "альфа", если вам нравится жить с чувством постоянной опасности.',
     'update_channel_stable'                      => 'Стабильный. Всё должно работать, как вы ожидаете.',
@@ -307,9 +307,9 @@ return [
     'created_new_rule_group'                     => 'Новая группа правил ":title" сохранена!',
     'updated_rule_group'                         => 'Группа правил ":title" успешно обновлена.',
     'edit_rule_group'                            => 'Изменить группу правил ":title"',
-    'duplicate_rule'                             => 'Duplicate rule ":title"',
-    'rule_copy_of'                               => 'Copy of ":title"',
-    'duplicated_rule'                            => 'Duplicated rule ":title" into ":newTitle"',
+    'duplicate_rule'                             => 'Дублировать правило ":title"',
+    'rule_copy_of'                               => 'Копия ":title"',
+    'duplicated_rule'                            => 'Дублированное правило ":title" в ":newTitle"',
     'delete_rule_group'                          => 'Удалить группу правил ":title"',
     'deleted_rule_group'                         => 'Группа правил ":title" удалена',
     'update_rule_group'                          => 'Обновление группы правил',
@@ -367,39 +367,39 @@ return [
 
     'rule_trigger_from_account_starts_choice'    => 'Счёт-источник начинается с..',
     'rule_trigger_from_account_starts'           => 'Source account name starts with ":trigger_value"',
-    'rule_trigger_from_account_ends_choice'      => 'Source account name ends with..',
-    'rule_trigger_from_account_ends'             => 'Source account name ends with ":trigger_value"',
-    'rule_trigger_from_account_is_choice'        => 'Source account name is..',
-    'rule_trigger_from_account_is'               => 'Source account name is ":trigger_value"',
+    'rule_trigger_from_account_ends_choice'      => 'Название счёта-источника заканчивается на..',
+    'rule_trigger_from_account_ends'             => 'Название счёта-источника заканчивается на ":trigger_value"',
+    'rule_trigger_from_account_is_choice'        => 'Название счёта-источника..',
+    'rule_trigger_from_account_is'               => 'Название счёта-источника ":trigger_value"',
     'rule_trigger_from_account_contains_choice'  => 'Счёт-источник содержит...',
-    'rule_trigger_from_account_contains'         => 'Source account name contains ":trigger_value"',
+    'rule_trigger_from_account_contains'         => 'Название счёта-источника содержит ":trigger_value"',
 
-    'rule_trigger_from_account_nr_starts_choice'    => 'Source account number / IBAN starts with..',
-    'rule_trigger_from_account_nr_starts'           => 'Source account number / IBAN starts with ":trigger_value"',
-    'rule_trigger_from_account_nr_ends_choice'      => 'Source account number / IBAN ends with..',
-    'rule_trigger_from_account_nr_ends'             => 'Source account number / IBAN ends with ":trigger_value"',
-    'rule_trigger_from_account_nr_is_choice'        => 'Source account number / IBAN is..',
-    'rule_trigger_from_account_nr_is'               => 'Source account number / IBAN is ":trigger_value"',
-    'rule_trigger_from_account_nr_contains_choice'  => 'Source account number / IBAN contains..',
-    'rule_trigger_from_account_nr_contains'         => 'Source account number / IBAN contains ":trigger_value"',
+    'rule_trigger_from_account_nr_starts_choice'    => 'Номер исходного счета / IBAN начинается с..',
+    'rule_trigger_from_account_nr_starts'           => 'Номер счёта-источника / IBAN начинается с ":trigger_value"',
+    'rule_trigger_from_account_nr_ends_choice'      => 'Номер исходного счета / IBAN заканчивается на..',
+    'rule_trigger_from_account_nr_ends'             => 'Номер исходного счета / IBAN заканчивается на ":trigger_value"',
+    'rule_trigger_from_account_nr_is_choice'        => 'Номер исходного счета / IBAN..',
+    'rule_trigger_from_account_nr_is'               => 'Номер исходного счета / IBAN - ":trigger_value"',
+    'rule_trigger_from_account_nr_contains_choice'  => 'Номер исходного счета / IBAN содержит..',
+    'rule_trigger_from_account_nr_contains'         => 'Номер исходного счета / IBAN содержит ":trigger_value"',
 
-    'rule_trigger_to_account_starts_choice'      => 'Destination account name starts with..',
-    'rule_trigger_to_account_starts'             => 'Destination account name starts with ":trigger_value"',
-    'rule_trigger_to_account_ends_choice'        => 'Destination account name ends with..',
-    'rule_trigger_to_account_ends'               => 'Destination account name ends with ":trigger_value"',
-    'rule_trigger_to_account_is_choice'          => 'Destination account name is..',
-    'rule_trigger_to_account_is'                 => 'Destination account name is ":trigger_value"',
-    'rule_trigger_to_account_contains_choice'    => 'Destination account name contains..',
-    'rule_trigger_to_account_contains'           => 'Destination account name contains ":trigger_value"',
+    'rule_trigger_to_account_starts_choice'      => 'Название счёта назначения начинается с..',
+    'rule_trigger_to_account_starts'             => 'Название счёта назначения начинается с ":trigger_value"',
+    'rule_trigger_to_account_ends_choice'        => 'Название счёта назначения заканчивается на..',
+    'rule_trigger_to_account_ends'               => 'Название счёта назначения заканчивается на ":trigger_value"',
+    'rule_trigger_to_account_is_choice'          => 'Название счёта назначения..',
+    'rule_trigger_to_account_is'                 => 'Название счёта назначения ":trigger_value"',
+    'rule_trigger_to_account_contains_choice'    => 'Название счёта назначения содержит..',
+    'rule_trigger_to_account_contains'           => 'Название счёта назначения содержит ":trigger_value"',
 
-    'rule_trigger_to_account_nr_starts_choice'      => 'Destination account number / IBAN starts with..',
-    'rule_trigger_to_account_nr_starts'             => 'Destination account number / IBAN starts with ":trigger_value"',
-    'rule_trigger_to_account_nr_ends_choice'        => 'Destination account number / IBAN ends with..',
-    'rule_trigger_to_account_nr_ends'               => 'Destination account number / IBAN ends with ":trigger_value"',
-    'rule_trigger_to_account_nr_is_choice'          => 'Destination account number / IBAN is..',
-    'rule_trigger_to_account_nr_is'                 => 'Destination account number / IBAN is ":trigger_value"',
-    'rule_trigger_to_account_nr_contains_choice'    => 'Destination account number / IBAN contains..',
-    'rule_trigger_to_account_nr_contains'           => 'Destination account number / IBAN contains ":trigger_value"',
+    'rule_trigger_to_account_nr_starts_choice'      => 'Номер целевого счета / IBAN начинается с..',
+    'rule_trigger_to_account_nr_starts'             => 'Номер целевого счета / IBAN начинается с ":trigger_value"',
+    'rule_trigger_to_account_nr_ends_choice'        => 'Номер счета назначения / IBAN заканчивается на..',
+    'rule_trigger_to_account_nr_ends'               => 'Номер счета назначения / IBAN заканчивается ":trigger_value"',
+    'rule_trigger_to_account_nr_is_choice'          => 'Номер целевого счета / IBAN..',
+    'rule_trigger_to_account_nr_is'                 => 'Номер счета назначения / IBAN ":trigger_value"',
+    'rule_trigger_to_account_nr_contains_choice'    => 'Номер счета назначения / IBAN содержит..',
+    'rule_trigger_to_account_nr_contains'           => 'Номер счёта назначения / IBAN содержит ":trigger_value"',
 
     'rule_trigger_transaction_type_choice'       => 'Тип транзакции = ',
     'rule_trigger_transaction_type'              => 'Тип транзакции = ":trigger_value"',
@@ -505,8 +505,8 @@ return [
     'new_rule_for_bill_title'         => 'Правило для счёта на оплату ":name"',
     'new_rule_for_bill_description'   => 'Это правило помечает транзакции для счёта на оплату ":name".',
 
-    'new_rule_for_journal_title'         => 'Rule based on transaction ":description"',
-    'new_rule_for_journal_description'   => 'This rule is based on transaction ":description". It will match transactions that are exactly the same.',
+    'new_rule_for_journal_title'         => 'Правило основано на транзакции ":description"',
+    'new_rule_for_journal_description'   => 'Это правило основано на транзакции ":description". Под него будут подпадать транзакции, которые точно совпадают.',
 
     // tags
     'store_new_tag'                   => 'Сохранить новую метку',
@@ -518,11 +518,11 @@ return [
     'result'                          => 'Результат',
     'sums_apply_to_range'             => 'Все суммы относятся к выбранному диапазону',
     'mapbox_api_key'                  => 'Чтобы использовать карту, получите ключ API от сервиса <a href="https://www.mapbox.com/">Mapbox</a>. Откройте файл <code>.env</code> и введите этот код в строке <code>MAPBOX_API_KEY = </code>.',
-    'press_object_location'              => 'Right click or long press to set the object\'s location.',
+    'press_object_location'              => 'Щёлкните правой кнопкой мыши или надолго нажмите на сенсорный экран, чтобы установить местоположение объекта.',
     'clear_location'                  => 'Очистить местоположение',
-    'delete_all_selected_tags'        => 'Delete all selected tags',
-    'select_tags_to_delete'           => 'Don\'t forget to select some tags.',
-    'deleted_x_tags'                  => 'Deleted :count tag(s).',
+    'delete_all_selected_tags'        => 'Удалить все выбранные метки',
+    'select_tags_to_delete'           => 'Не забудьте выбрать несколько меток.',
+    'deleted_x_tags'                  => 'Удалено :count меток.',
     'create_rule_from_transaction'    => 'Создать правило на основе транзакции',
 
     // preferences
@@ -788,7 +788,7 @@ return [
     'over_budget_warn'                          => '<i class="fa fa-money"></i> Обычно ваш бюджет - около :amount в день. Сейчас - :over_amount в день. Вы уверены?',
     'transferred_in'                            => 'Переведено (в)',
     'transferred_away'                          => 'Переведено (из)',
-    'auto_budget_none'                          => 'No auto-budget',
+    'auto_budget_none'                          => 'Без автобюджета',
     'auto_budget_reset'                         => 'Set a fixed amount every period',
     'auto_budget_rollover'                      => 'Add an amount every period',
     'auto_budget_period_daily'                  => 'Ежедневно',
@@ -1451,6 +1451,7 @@ return [
     'tools_index_intro'                     => 'Several tools exist to import data into Firefly III. Check them out below. For more information, check out <a href="https://docs.firefly-iii.org/importing-data/introduction">this page</a>.',
     'firefly_iii_csv_importer_name'         => 'Импортер CSV Firefly III',
     'firefly_iii_bunq_importer_name'        => 'Импортёр Firefly III bunq 🌈',
+    'firefly_iii_ynab_importer_name'        => 'Firefly III YNAB importer',
     'ludo_revolut_importer_name'            => 'Импортер Ludo444\'s Revolut',
     //
     // sandstorm.io errors and messages:
@@ -1589,25 +1590,25 @@ return [
 
     // telemetry
     'telemetry_admin_index'              => 'Телеметрия',
-    'telemetry_intro'                    => 'Firefly III supports the collection and sending of usage telemetry. This means that Firefly III will try to collect info on how you use Firefly III, and send it to the developer of Firefly III. This is always opt-in, and is disabled by default. Firefly III will never collect or send financial information. Firefly III will also never collect or send financial meta-information, like sums or calculations. The collected data will never be made publicly accessible.',
-    'telemetry_what_collected'           => 'What Firefly III collects and sends exactly is different for each version. You are running version :version. What Firefly III collects in version :version is something you can read in the help pages. Click the (?)-icon in the top-right corner <a href="https://docs.firefly-iii.org/support/telemetry">or visit the documentation page</a>.',
+    'telemetry_intro'                    => 'Firefly III поддерживает сбор и отправку телеметрии. Это означает, что Firefly III попытается собрать информацию о том, как вы используете Firefly III, и отправить её разработчику Firefly III. Эту возможность можно включить в любой момент, но по-умолчанию она отключена. Firefly III никогда не будет собирать и отправлять финансовую информацию. Firefly III также никогда не будет собирать и передавать финансовую метаинформацию, например суммы или расчёты. Собранные данные никогда не станут общедоступными.',
+    'telemetry_what_collected'           => 'Конкретные данные, которые Firefly III собирает и отправляет, могут отличаться в разных версиях. Вы используете версию :version. Узнать, что именно Firefly III собирает в версии :version можно на странице со справкой. Нажмите значок (?) в правом верхнем углу или посетите <a href="https://docs.firefly-iii.org/support/telemetry"> страницу документации</a>.',
     'telemetry_is_enabled_yes_no'        => 'Включена ли телеметрия Firefly III?',
     'telemetry_disabled_no'              => 'Телеметрия НЕ включена',
     'telemetry_disabled_yes'             => 'Телеметрия включена',
-    'telemetry_enabled_now_what'         => 'You can disable telemetry the same way you enabled it: in your .env file or in your Docker configuration.',
-    'telemetry_disabled_now_what'        => 'If you want to, you can enable telemetry in your .env file or in your Docker configuration.',
+    'telemetry_enabled_now_what'         => 'Вы можете отключить телеметрию так же, как включили её: в файле .env или в конфигурации Docker.',
+    'telemetry_disabled_now_what'        => 'Если вы хотите, вы можете включить телеметрию в своём .env-файле или в конфигурации Docker.',
     'telemetry_collected_info'           => 'Собранная информация',
-    'no_telemetry_present'               => 'Firefly III has collected zero telemetry records.',
-    'records_telemetry_present'          => 'Firefly III has collected :count telemetry record(s).',
+    'no_telemetry_present'               => 'Firefly III не собрал ни одной записи телеметрии.',
+    'records_telemetry_present'          => 'Firefly III собрал :count записей телеметрии.',
     'telemetry_button_view'              => 'Просмотр телеметрии',
     'telemetry_button_delete'            => 'Удалить всю телеметрию',
     'telemetry_admin_overview'           => 'Обзор телеметрии',
     'telemetry_back_to_index'            => 'Вернуться к списку телеметрии',
-    'not_yet_submitted'                  => 'Not yet submitted',
+    'not_yet_submitted'                  => 'Ещё не отправлено',
     'telemetry_type_feature'             => 'Feature flag',
     'telemetry_submit_all'               => 'Отправить записи',
     'telemetry_delete_submitted_records' => 'Delete submitted records',
     'telemetry_submission_executed'      => 'Records have been submitted. Check your log files for more info.',
-    'telemetry_all_deleted'              => 'All telemetry records have been deleted.',
-    'telemetry_submitted_deleted'        => 'All submitted telemetry records have been deleted.'
+    'telemetry_all_deleted'              => 'Все записи телеметрии были удалены.',
+    'telemetry_submitted_deleted'        => 'Все отправленные телеметрические записи были удалены.'
 ];

resources/lang/sv_SE/firefly.php

@@ -1451,6 +1451,7 @@ return [
     'tools_index_intro'                     => 'Several tools exist to import data into Firefly III. Check them out below. For more information, check out <a href="https://docs.firefly-iii.org/importing-data/introduction">this page</a>.',
     'firefly_iii_csv_importer_name'         => 'Firefly III CSV importer',
     'firefly_iii_bunq_importer_name'        => 'Firefly III bunq 🌈 importer',
+    'firefly_iii_ynab_importer_name'        => 'Firefly III YNAB importer',
     'ludo_revolut_importer_name'            => 'Ludo444\'s Revolut importer',
     //
     // sandstorm.io errors and messages:

resources/lang/tr_TR/firefly.php

@@ -1453,6 +1453,7 @@ işlemlerin kontrol edildiğini lütfen unutmayın.',
     'tools_index_intro'                     => 'Several tools exist to import data into Firefly III. Check them out below. For more information, check out <a href="https://docs.firefly-iii.org/importing-data/introduction">this page</a>.',
     'firefly_iii_csv_importer_name'         => 'Firefly III CSV importer',
     'firefly_iii_bunq_importer_name'        => 'Firefly III bunq 🌈 importer',
+    'firefly_iii_ynab_importer_name'        => 'Firefly III YNAB importer',
     'ludo_revolut_importer_name'            => 'Ludo444\'s Revolut importer',
     //
     // sandstorm.io errors and messages:

resources/lang/vi_VN/firefly.php

@@ -1451,6 +1451,7 @@ return [
     'tools_index_intro'                     => 'Một số công cụ tồn tại để nhập dữ liệu vào Firefly III. Kiểm tra chúng dưới đây. Để biết thêm thông tin, hãy xem <a href="https://docs.firefly-iii.org/importing-data/introduction">this page</a>.',
     'firefly_iii_csv_importer_name'         => 'Firefly III CSV importer',
     'firefly_iii_bunq_importer_name'        => 'Firefly III bunq 🌈 importer',
+    'firefly_iii_ynab_importer_name'        => 'Firefly III YNAB importer',
     'ludo_revolut_importer_name'            => 'Ludo444\'s Revolut importer',
     //
     // sandstorm.io errors and messages:

resources/lang/zh_CN/firefly.php

@@ -1451,6 +1451,7 @@ return [
     'tools_index_intro'                     => 'Several tools exist to import data into Firefly III. Check them out below. For more information, check out <a href="https://docs.firefly-iii.org/importing-data/introduction">this page</a>.',
     'firefly_iii_csv_importer_name'         => 'Firefly III CSV importer',
     'firefly_iii_bunq_importer_name'        => 'Firefly III bunq 🌈 importer',
+    'firefly_iii_ynab_importer_name'        => 'Firefly III YNAB importer',
     'ludo_revolut_importer_name'            => 'Ludo444\'s Revolut importer',
     //
     // sandstorm.io errors and messages:

resources/lang/zh_TW/firefly.php

@@ -1451,6 +1451,7 @@ return [
     'tools_index_intro'                     => 'Several tools exist to import data into Firefly III. Check them out below. For more information, check out <a href="https://docs.firefly-iii.org/importing-data/introduction">this page</a>.',
     'firefly_iii_csv_importer_name'         => 'Firefly III CSV importer',
     'firefly_iii_bunq_importer_name'        => 'Firefly III bunq 🌈 importer',
+    'firefly_iii_ynab_importer_name'        => 'Firefly III YNAB importer',
     'ludo_revolut_importer_name'            => 'Ludo444\'s Revolut importer',
     //
     // sandstorm.io errors and messages:

resources/views/v1/import/index.twig

@@ -54,6 +54,9 @@
                         <li>
                             <a href="http://github.com/firefly-iii/bunq-importer" title="{{ 'firefly_iii_bunq_importer_name'|_ }}">{{ 'firefly_iii_bunq_importer_name'|_ }}</a>
                         </li>
+                        <li>
+                            <a href="http://github.com/firefly-iii/ynab-importer" title="{{ 'firefly_iii_ynab_importer_name'|_ }}">{{ 'firefly_iii_ynab_importer_name'|_ }}</a>
+                        </li>
                         <li>
                             <a href="https://gitlab.com/ludo444/fireflyrevoluttransactions" title="{{ 'ludo_revolut_importer_name'|_ }}">{{ 'ludo_revolut_importer_name'|_ }}</a>
                         </li>

resources/views/v1/transactions/show.twig

@@ -260,8 +260,8 @@
                                     <td>{{ 'tags'|_ }}</td>
                                     <td>
                                         {% for tag in journal.tags %}
-                                            <h4 style="display: inline;"><a class="label label-success" href="{{ route('tags.show', tag) }}">
-                                                    <i class="fa fa-fw fa-tag"></i>{{ tag }}</a>
+                                            <h4 style="display: inline;"><a class="label label-success" href="{{ route('tags.show', tag.id) }}">
+                                                    <i class="fa fa-fw fa-tag"></i>{{ tag.tag }}</a>
                                             </h4>
                                         {% endfor %}
                                     </td>

yarn.lock

@@ -40,12 +40,12 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.9.0":
-  version "7.9.4"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.4.tgz#12441e90c3b3c4159cdecf312075bf1a8ce2dbce"
-  integrity sha512-rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA==
+"@babel/generator@^7.9.0", "@babel/generator@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.5.tgz#27f0917741acc41e6eaaced6d68f96c3fa9afaf9"
+  integrity sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==
   dependencies:
-    "@babel/types" "^7.9.0"
+    "@babel/types" "^7.9.5"
     jsesc "^2.5.1"
     lodash "^4.17.13"
     source-map "^0.5.0"
@@ -102,14 +102,14 @@
     "@babel/traverse" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/helper-function-name@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz#eeeb665a01b1f11068e9fb86ad56a1cb1a824cca"
-  integrity sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==
+"@babel/helper-function-name@^7.8.3", "@babel/helper-function-name@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz#2b53820d35275120e1874a82e5aabe1376920a5c"
+  integrity sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==
   dependencies:
     "@babel/helper-get-function-arity" "^7.8.3"
     "@babel/template" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.9.5"
 
 "@babel/helper-get-function-arity@^7.8.3":
   version "7.8.3"
@@ -207,10 +207,10 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
-"@babel/helper-validator-identifier@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz#ad53562a7fc29b3b9a91bbf7d10397fd146346ed"
-  integrity sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw==
+"@babel/helper-validator-identifier@^7.9.0", "@babel/helper-validator-identifier@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80"
+  integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==
 
 "@babel/helper-wrap-function@^7.8.3":
   version "7.8.3"
@@ -286,13 +286,14 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-numeric-separator" "^7.8.3"
 
-"@babel/plugin-proposal-object-rest-spread@^7.2.0", "@babel/plugin-proposal-object-rest-spread@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.0.tgz#a28993699fc13df165995362693962ba6b061d6f"
-  integrity sha512-UgqBv6bjq4fDb8uku9f+wcm1J7YxJ5nT7WO/jBr0cl0PLKb7t1O6RNR1kZbjgx2LQtsDI9hwoQVmn0yhXeQyow==
+"@babel/plugin-proposal-object-rest-spread@^7.2.0", "@babel/plugin-proposal-object-rest-spread@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.5.tgz#3fd65911306d8746014ec0d0cf78f0e39a149116"
+  integrity sha512-VP2oXvAf7KCYTthbUHwBlewbl1Iq059f6seJGsxMizaCdgHIeczOr7FBqELhSqfkIl04Fi8okzWzl63UKbQmmg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
+    "@babel/plugin-transform-parameters" "^7.9.5"
 
 "@babel/plugin-proposal-optional-catch-binding@^7.8.3":
   version "7.8.3"
@@ -412,14 +413,14 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     lodash "^4.17.13"
 
-"@babel/plugin-transform-classes@^7.9.0":
-  version "7.9.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.2.tgz#8603fc3cc449e31fdbdbc257f67717536a11af8d"
-  integrity sha512-TC2p3bPzsfvSsqBZo0kJnuelnoK9O3welkUpqSqBQuBF6R5MN2rysopri8kNvtlGIb2jmUO7i15IooAZJjZuMQ==
+"@babel/plugin-transform-classes@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz#800597ddb8aefc2c293ed27459c1fcc935a26c2c"
+  integrity sha512-x2kZoIuLC//O5iA7PEvecB105o7TLzZo8ofBVhP79N+DO3jaX+KYfww9TQcfBEZD0nikNyYcGB1IKtRq36rdmg==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.8.3"
     "@babel/helper-define-map" "^7.8.3"
-    "@babel/helper-function-name" "^7.8.3"
+    "@babel/helper-function-name" "^7.9.5"
     "@babel/helper-optimise-call-expression" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/helper-replace-supers" "^7.8.6"
@@ -433,10 +434,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-destructuring@^7.8.3":
-  version "7.8.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.8.tgz#fadb2bc8e90ccaf5658de6f8d4d22ff6272a2f4b"
-  integrity sha512-eRJu4Vs2rmttFCdhPUM3bV0Yo/xPSdPw6ML9KHs/bjB4bLA5HXlbvYXPOD5yASodGod+krjYx21xm1QmL8dCJQ==
+"@babel/plugin-transform-destructuring@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz#72c97cf5f38604aea3abf3b935b0e17b1db76a50"
+  integrity sha512-j3OEsGel8nHL/iusv/mRd5fYZ3DrOxWC82x0ogmdN/vHfAP4MYw+AFKYanzWlktNwikKvlzUV//afBW5FTp17Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
@@ -551,10 +552,10 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/helper-replace-supers" "^7.8.3"
 
-"@babel/plugin-transform-parameters@^7.8.7":
-  version "7.9.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.3.tgz#3028d0cc20ddc733166c6e9c8534559cee09f54a"
-  integrity sha512-fzrQFQhp7mIhOzmOtPiKffvCYQSK10NR8t6BBz2yPbeUHb9OLW8RZGtgDRBn8z2hGcwvKDL3vC7ojPTLNxmqEg==
+"@babel/plugin-transform-parameters@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz#173b265746f5e15b2afe527eeda65b73623a0795"
+  integrity sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA==
   dependencies:
     "@babel/helper-get-function-arity" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
@@ -636,9 +637,9 @@
     "@babel/helper-plugin-utils" "^7.8.3"
 
 "@babel/preset-env@^7.2.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.0.tgz#a5fc42480e950ae8f5d9f8f2bbc03f52722df3a8"
-  integrity sha512-712DeRXT6dyKAM/FMbQTV/FvRCms2hPCx+3weRjZ8iQVQWZejWWk1wwG6ViWMyqb/ouBbGOl5b6aCk0+j1NmsQ==
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.5.tgz#8ddc76039bc45b774b19e2fc548f6807d8a8919f"
+  integrity sha512-eWGYeADTlPJH+wq1F0wNfPbVS1w1wtmMJiYk55Td5Yu28AsdR9AsC97sZ0Qq8fHqQuslVSIYSGJMcblr345GfQ==
   dependencies:
     "@babel/compat-data" "^7.9.0"
     "@babel/helper-compilation-targets" "^7.8.7"
@@ -649,7 +650,7 @@
     "@babel/plugin-proposal-json-strings" "^7.8.3"
     "@babel/plugin-proposal-nullish-coalescing-operator" "^7.8.3"
     "@babel/plugin-proposal-numeric-separator" "^7.8.3"
-    "@babel/plugin-proposal-object-rest-spread" "^7.9.0"
+    "@babel/plugin-proposal-object-rest-spread" "^7.9.5"
     "@babel/plugin-proposal-optional-catch-binding" "^7.8.3"
     "@babel/plugin-proposal-optional-chaining" "^7.9.0"
     "@babel/plugin-proposal-unicode-property-regex" "^7.8.3"
@@ -666,9 +667,9 @@
     "@babel/plugin-transform-async-to-generator" "^7.8.3"
     "@babel/plugin-transform-block-scoped-functions" "^7.8.3"
     "@babel/plugin-transform-block-scoping" "^7.8.3"
-    "@babel/plugin-transform-classes" "^7.9.0"
+    "@babel/plugin-transform-classes" "^7.9.5"
     "@babel/plugin-transform-computed-properties" "^7.8.3"
-    "@babel/plugin-transform-destructuring" "^7.8.3"
+    "@babel/plugin-transform-destructuring" "^7.9.5"
     "@babel/plugin-transform-dotall-regex" "^7.8.3"
     "@babel/plugin-transform-duplicate-keys" "^7.8.3"
     "@babel/plugin-transform-exponentiation-operator" "^7.8.3"
@@ -683,7 +684,7 @@
     "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
     "@babel/plugin-transform-new-target" "^7.8.3"
     "@babel/plugin-transform-object-super" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.8.7"
+    "@babel/plugin-transform-parameters" "^7.9.5"
     "@babel/plugin-transform-property-literals" "^7.8.3"
     "@babel/plugin-transform-regenerator" "^7.8.7"
     "@babel/plugin-transform-reserved-words" "^7.8.3"
@@ -694,7 +695,7 @@
     "@babel/plugin-transform-typeof-symbol" "^7.8.4"
     "@babel/plugin-transform-unicode-regex" "^7.8.3"
     "@babel/preset-modules" "^0.1.3"
-    "@babel/types" "^7.9.0"
+    "@babel/types" "^7.9.5"
     browserslist "^4.9.1"
     core-js-compat "^3.6.2"
     invariant "^2.2.2"
@@ -729,26 +730,26 @@
     "@babel/types" "^7.8.6"
 
 "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.6", "@babel/traverse@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.0.tgz#d3882c2830e513f4fe4cec9fe76ea1cc78747892"
-  integrity sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.5.tgz#6e7c56b44e2ac7011a948c21e283ddd9d9db97a2"
+  integrity sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==
   dependencies:
     "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.9.0"
-    "@babel/helper-function-name" "^7.8.3"
+    "@babel/generator" "^7.9.5"
+    "@babel/helper-function-name" "^7.9.5"
     "@babel/helper-split-export-declaration" "^7.8.3"
     "@babel/parser" "^7.9.0"
-    "@babel/types" "^7.9.0"
+    "@babel/types" "^7.9.5"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.4.4", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.0.tgz#00b064c3df83ad32b2dbf5ff07312b15c7f1efb5"
-  integrity sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==
+"@babel/types@^7.4.4", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0", "@babel/types@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.5.tgz#89231f82915a8a566a703b3b20133f73da6b9444"
+  integrity sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.9.0"
+    "@babel/helper-validator-identifier" "^7.9.5"
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
@@ -792,9 +793,9 @@
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
 "@types/node@*":
-  version "13.9.8"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.9.8.tgz#09976420fc80a7a00bf40680c63815ed8c7616f4"
-  integrity sha512-1WgO8hsyHynlx7nhP1kr0OFzsgKz5XDQL+Lfc3b1Q3qIln/n8cKD4m09NJ0+P1Rq7Zgnc7N0+SsMnoD1rEb0kA==
+  version "13.11.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.11.1.tgz#49a2a83df9d26daacead30d0ccc8762b128d53c7"
+  integrity sha512-eWQGP3qtxwL8FGneRrC5DwrJLGN4/dH1clNTuLfN81HCrxVtxRjygDTUoZJ5ASlDEeo0ppYFQjQIlXhtXpOn6g==
 
 "@types/q@^1.5.1":
   version "1.5.2"
@@ -802,9 +803,9 @@
   integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==
 
 "@vue/component-compiler-utils@^3.1.0":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.1.1.tgz#d4ef8f80292674044ad6211e336a302e4d2a6575"
-  integrity sha512-+lN3nsfJJDGMNz7fCpcoYIORrXo0K3OTsdr8jCM7FuqdI4+70TY6gxY6viJ2Xi1clqyPg7LpeOWwjF31vSMmUw==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.1.2.tgz#8213a5ff3202f9f2137fe55370f9e8b9656081c3"
+  integrity sha512-QLq9z8m79mCinpaEeSURhnNCN6djxpHw0lpP/bodMlt5kALfONpryMthvnrQOlTcIKoF+VoPi+lPHUYeDFPXug==
   dependencies:
     consolidate "^0.15.1"
     hash-sum "^1.0.2"
@@ -812,9 +813,10 @@
     merge-source-map "^1.1.0"
     postcss "^7.0.14"
     postcss-selector-parser "^6.0.2"
-    prettier "^1.18.2"
     source-map "~0.6.1"
     vue-template-es2015-compiler "^1.9.0"
+  optionalDependencies:
+    prettier "^1.18.2"
 
 "@webassemblyjs/ast@1.9.0":
   version "1.9.0"
@@ -1184,12 +1186,12 @@ atob@^2.1.2:
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
 autoprefixer@^9.4.2:
-  version "9.7.5"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.5.tgz#8df10b9ff9b5814a8d411a5cfbab9c793c392376"
-  integrity sha512-URo6Zvt7VYifomeAfJlMFnYDhow1rk2bufwkbamPEAtQFcL11moLk4PnR7n9vlu7M+BkXAZkHFA0mIcY7tjQFg==
+  version "9.7.6"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.6.tgz#63ac5bbc0ce7934e6997207d5bb00d68fa8293a4"
+  integrity sha512-F7cYpbN7uVVhACZTeeIeealwdGM6wMtfWARVLTy5xmKtgVdBNJvbDRoCK3YO1orcs7gv/KwYlb3iXwu9Ug9BkQ==
   dependencies:
-    browserslist "^4.11.0"
-    caniuse-lite "^1.0.30001036"
+    browserslist "^4.11.1"
+    caniuse-lite "^1.0.30001039"
     chalk "^2.4.2"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
@@ -1421,7 +1423,7 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.0.0, browserslist@^4.11.0, browserslist@^4.8.3, browserslist@^4.9.1:
+browserslist@^4.0.0, browserslist@^4.11.1, browserslist@^4.8.3, browserslist@^4.9.1:
   version "4.11.1"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.11.1.tgz#92f855ee88d6e050e7e7311d987992014f1a1f1b"
   integrity sha512-DCTr3kDrKEYNw6Jb9HFxVLQNaue8z+0ZfRBRjmCunKDEXEBajKDj2Y+Uelg+Pi29OnvaSGwjOsnRyNEkXzHg5g==
@@ -1577,10 +1579,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001036, caniuse-lite@^1.0.30001038:
-  version "1.0.30001038"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001038.tgz#44da3cbca2ab6cb6aa83d1be5d324e17f141caff"
-  integrity sha512-zii9quPo96XfOiRD4TrfYGs+QsGZpb2cGiMAzPjtf/hpFgB6zCPZgJb7I1+EATeMw/o+lG8FyRAnI+CWStHcaQ==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001038, caniuse-lite@^1.0.30001039:
+  version "1.0.30001040"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001040.tgz#103fc8e6eb1d7397e95134cd0e996743353d58ea"
+  integrity sha512-Ep0tEPeI5wCvmJNrXjE3etgfI+lkl1fTDU6Y3ZH1mhrjkPlVI9W4pcKbMo+BQLpEWKVYYp2EmYaRsqpPC3k7lQ==
 
 chalk@2.4.2, chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
@@ -2395,9 +2397,9 @@ ee-first@1.1.1:
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
 electron-to-chromium@^1.3.390:
-  version "1.3.393"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.393.tgz#d13fa4cbf5065e18451c84465d22aef6aca9a911"
-  integrity sha512-Ko3/VdhZAaMaJBLBFqEJ+M1qMiBI8sJfPY/hSJvDrkB3Do8LJsL9tmXy4w7o9nPXif/jFaZGSlXTQWU8XVsYtg==
+  version "1.3.402"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.402.tgz#9ad93c0c8ea2e571431739e0d76bd6bc9788a846"
+  integrity sha512-gaCDfX7IUH0s3JmBiHCDPrvVcdnTTP1r4WLJc2dHkYYbLmXZ2XHiJCcGQ9Balf91aKTvuCKCyu2JjJYRykoI1w==
 
 elliptic@^6.0.0:
   version "6.5.2"
@@ -3777,9 +3779,9 @@ isobject@^3.0.0, isobject@^3.0.1:
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
 jest-worker@^25.1.0:
-  version "25.2.1"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.2.1.tgz#209617015c768652646aa33a7828cc2ab472a18a"
-  integrity sha512-IHnpekk8H/hCUbBlfeaPZzU6v75bqwJp3n4dUrQuQOAgOneI4tx3jV2o8pvlXnDfcRsfkFIUD//HWXpCmR+evQ==
+  version "25.2.6"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.2.6.tgz#d1292625326794ce187c38f51109faced3846c58"
+  integrity sha512-FJn9XDUSxcOR4cwDzRfL1z56rUofNTFs539FGASpd50RHdb6EVkhxQqktodW2mI49l+W3H+tFJDotCHUQF6dmA==
   dependencies:
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
@@ -3840,9 +3842,9 @@ json5@^1.0.1:
     minimist "^1.2.0"
 
 json5@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.2.tgz#43ef1f0af9835dd624751a6b7fa48874fb2d608e"
-  integrity sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ==
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
+  integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
   dependencies:
     minimist "^1.2.5"
 
@@ -4316,9 +4318,9 @@ mixin-deep@^1.2.0:
     is-extendable "^1.0.1"
 
 mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1:
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.4.tgz#fd01504a6797ec5c9be81ff43d204961ed64a512"
-  integrity sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
+  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
   dependencies:
     minimist "^1.2.5"
 
@@ -4385,9 +4387,9 @@ nanomatch@^1.2.9:
     to-regex "^3.0.1"
 
 needle@^2.2.1:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.3.tgz#a041ad1d04a871b0ebb666f40baaf1fb47867117"
-  integrity sha512-EkY0GeSq87rWp1hoq/sH/wnTWgFVhYlnIkbJ0YJFfRgEFlz2RraCjBpFQ+vrEgEdp0ThfyHADmkChEhcb7PKyw==
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.1.tgz#14af48732463d7475696f937626b1b993247a56a"
+  integrity sha512-x/gi6ijr4B7fwl6WYL9FwlCvRQKGlUNvnceho8wxkwXqN8jvVmmmATTmZPRRG7b/yC1eode26C2HO9jl78Du9g==
   dependencies:
     debug "^3.2.6"
     iconv-lite "^0.4.4"
@@ -4745,9 +4747,9 @@ p-limit@^1.1.0:
     p-try "^1.0.0"
 
 p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e"
-  integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
   dependencies:
     p-try "^2.0.0"
 
@@ -6014,9 +6016,9 @@ spdy-transport@^3.0.0:
     wbuf "^1.7.3"
 
 spdy@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.1.tgz#6f12ed1c5db7ea4f24ebb8b89ba58c87c08257f2"
-  integrity sha512-HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA==
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b"
+  integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==
   dependencies:
     debug "^4.1.0"
     handle-thing "^2.0.0"
@@ -6133,9 +6135,9 @@ string-width@^3.0.0, string-width@^3.1.0:
     strip-ansi "^5.1.0"
 
 string.prototype.trimend@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.0.tgz#ee497fd29768646d84be2c9b819e292439614373"
-  integrity sha512-EEJnGqa/xNfIg05SxiPSqRS7S9qwDhYts1TSLR1BQfYUfPe1stofgGKvwERK9+9yf+PpfBMlpBaCHucXGPQfUA==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913"
+  integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==
   dependencies:
     define-properties "^1.1.3"
     es-abstract "^1.17.5"
@@ -6159,9 +6161,9 @@ string.prototype.trimright@^2.1.1:
     string.prototype.trimend "^1.0.0"
 
 string.prototype.trimstart@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.0.tgz#afe596a7ce9de905496919406c9734845f01a2f2"
-  integrity sha512-iCP8g01NFYiiBOnwG1Xc3WZLyoo+RuBymwIlWncShXDDJYWN6DbnM3odslBJdgCdRlq94B5s63NWAZlcn2CS4w==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"
+  integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==
   dependencies:
     define-properties "^1.1.3"
     es-abstract "^1.17.5"
@@ -6331,9 +6333,9 @@ terser@^3.11.0:
     source-map-support "~0.5.10"
 
 terser@^4.1.2, terser@^4.4.3:
-  version "4.6.10"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.10.tgz#90f5bd069ff456ddbc9503b18e52f9c493d3b7c2"
-  integrity sha512-qbF/3UOo11Hggsbsqm2hPa6+L4w7bkr+09FNseEe8xrcVD3APGLFqE+Oz1ZKAxjYnFsj80rLOfgAtJ0LNJjtTA==
+  version "4.6.11"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.11.tgz#12ff99fdd62a26de2a82f508515407eb6ccd8a9f"
+  integrity sha512-76Ynm7OXUG5xhOpblhytE7X58oeNSmC8xnNhjWVo8CksHit0U0kO4hfNbPrrYwowLWFgM2n9L176VNx2QaHmtA==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"
@@ -6441,9 +6443,9 @@ uglify-js@3.4.x:
     source-map "~0.6.1"
 
 uiv@^0.34:
-  version "0.34.3"
-  resolved "https://registry.yarnpkg.com/uiv/-/uiv-0.34.3.tgz#c7607744da434682bdb4b62590e8eb48a702aa77"
-  integrity sha512-QX/CoqBXSoIzln2B8TSUpQin+eU+tVCtv3KWwWwGt7/cNnjC3UhHJm/HJSA48kI/XoOWAxh37Cb730xOk5ECbA==
+  version "0.34.4"
+  resolved "https://registry.yarnpkg.com/uiv/-/uiv-0.34.4.tgz#ae3cb2ad6fe01266fdf1933538c1bafe02021c56"
+  integrity sha512-J3Y53f/PcySbMpSEqkYwp2vtIIb+z3PQqvEqWdzD8RWrabFRxd1sd6iiRHx3cX5gzQtv79HtxR1tAk/xC4cSnw==
   dependencies:
     vue-functional-data-merge "^2.0.3"